summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Karlsson <peterk@debian.org>2007-10-08 11:44:54 +0100
committerPeter Karlsson <peterk@debian.org>2007-10-08 11:44:54 +0100
commit21231056c2f4fb82730c0ac7e7f90456668cae38 (patch)
tree1f9ca6a27065dce5014adea7095596ec6a8cb744
parent28b68bf4207be80d4549579f34262f1248a2e528 (diff)
parent24401c09f0a826ec0074f46dfe70efe3aaf79f25 (diff)
Merge upstream.
-rw-r--r--README.arch2
-rw-r--r--apt-inst/contrib/extracttar.cc2
-rw-r--r--apt-inst/deb/debfile.cc10
-rw-r--r--apt-inst/filelist.h2
-rw-r--r--apt-pkg/acquire-item.cc148
-rw-r--r--apt-pkg/acquire-item.h76
-rw-r--r--apt-pkg/acquire-method.cc9
-rw-r--r--apt-pkg/acquire-method.h1
-rw-r--r--apt-pkg/acquire-worker.cc19
-rw-r--r--apt-pkg/acquire.cc2
-rw-r--r--apt-pkg/algorithms.cc2
-rw-r--r--apt-pkg/cdrom.cc4
-rw-r--r--apt-pkg/contrib/error.cc4
-rw-r--r--apt-pkg/contrib/fileutl.cc2
-rw-r--r--apt-pkg/contrib/hashes.cc84
-rw-r--r--apt-pkg/contrib/hashes.h31
-rw-r--r--apt-pkg/contrib/md5.cc1
-rw-r--r--apt-pkg/contrib/md5.h1
-rw-r--r--apt-pkg/contrib/mmap.cc6
-rw-r--r--apt-pkg/contrib/progress.cc1
-rw-r--r--apt-pkg/contrib/sha1.h1
-rw-r--r--apt-pkg/contrib/sha256.h1
-rw-r--r--apt-pkg/deb/deblistparser.cc2
-rw-r--r--apt-pkg/deb/debmetaindex.cc4
-rw-r--r--apt-pkg/deb/debrecords.cc8
-rw-r--r--apt-pkg/deb/debrecords.h1
-rw-r--r--apt-pkg/deb/debsrcrecords.cc2
-rw-r--r--apt-pkg/deb/dpkgpm.cc440
-rw-r--r--apt-pkg/deb/dpkgpm.h36
-rw-r--r--apt-pkg/depcache.cc37
-rw-r--r--apt-pkg/indexcopy.cc13
-rw-r--r--apt-pkg/indexfile.cc5
-rw-r--r--apt-pkg/indexrecords.cc48
-rw-r--r--apt-pkg/indexrecords.h3
-rw-r--r--apt-pkg/init.cc12
-rw-r--r--apt-pkg/init.h4
-rw-r--r--apt-pkg/makefile4
-rw-r--r--apt-pkg/packagemanager.cc22
-rw-r--r--apt-pkg/packagemanager.h13
-rw-r--r--apt-pkg/pkgcache.cc6
-rw-r--r--apt-pkg/pkgcache.h3
-rw-r--r--apt-pkg/pkgcachegen.cc4
-rw-r--r--apt-pkg/pkgrecords.h1
-rw-r--r--apt-pkg/pkgsystem.cc1
-rw-r--r--apt-pkg/tagfile.h4
-rw-r--r--buildlib/archtable33
-rw-r--r--buildlib/config.h.in7
-rw-r--r--buildlib/environment.mak.in2
-rw-r--r--buildlib/ostable21
-rw-r--r--buildlib/systemtable11
-rw-r--r--cmdline/apt-cache.cc4
-rw-r--r--cmdline/apt-cdrom.cc4
-rw-r--r--cmdline/apt-config.cc4
-rw-r--r--cmdline/apt-extracttemplates.cc6
-rw-r--r--cmdline/apt-get.cc25
-rwxr-xr-xcmdline/apt-key8
-rwxr-xr-xcmdline/apt-mark4
-rw-r--r--cmdline/apt-sortpkgs.cc4
-rw-r--r--cmdline/makefile2
-rw-r--r--configure.in22
-rw-r--r--debian/apt.cron.daily12
-rw-r--r--debian/apt.dirs2
-rw-r--r--debian/apt.logrotate8
-rw-r--r--debian/changelog148
-rw-r--r--debian/control4
-rwxr-xr-xdebian/rules1
-rw-r--r--doc/apt-key.8.xml22
-rw-r--r--doc/cache.sgml2
-rw-r--r--doc/examples/configure-index7
-rw-r--r--ftparchive/apt-ftparchive.cc4
-rw-r--r--ftparchive/writer.cc1
-rw-r--r--methods/copy.cc5
-rw-r--r--methods/ftp.cc2
-rw-r--r--methods/gpgv.cc6
-rw-r--r--methods/https.cc53
-rw-r--r--methods/makefile13
-rw-r--r--po/ChangeLog25
-rw-r--r--po/apt-all.pot193
-rw-r--r--po/bg.po198
-rw-r--r--po/bs.po193
-rw-r--r--po/ca.po198
-rw-r--r--po/cs.po198
-rw-r--r--po/cy.po196
-rw-r--r--po/da.po281
-rw-r--r--po/de.po198
-rw-r--r--po/el.po198
-rw-r--r--po/en_GB.po198
-rw-r--r--po/es.po200
-rw-r--r--po/eu.po202
-rw-r--r--po/fi.po198
-rw-r--r--po/fr.po1238
-rw-r--r--po/gl.po200
-rw-r--r--po/he.po195
-rw-r--r--po/hu.po198
-rw-r--r--po/it.po198
-rw-r--r--po/ja.po198
-rw-r--r--po/ko.po198
-rw-r--r--po/ku.po195
-rw-r--r--po/nb.po198
-rw-r--r--po/nl.po198
-rw-r--r--po/nn.po198
-rw-r--r--po/pl.po198
-rw-r--r--po/pt.po198
-rw-r--r--po/pt_BR.po198
-rw-r--r--po/ro.po198
-rw-r--r--po/ru.po198
-rw-r--r--po/sk.po198
-rw-r--r--po/sl.po198
-rw-r--r--po/sv.po229
-rw-r--r--po/th.po2821
-rw-r--r--po/tl.po198
-rw-r--r--po/uk.po198
-rw-r--r--po/vi.po224
-rw-r--r--po/zh_CN.po198
-rw-r--r--po/zh_TW.po198
-rw-r--r--test/fake-status16
-rw-r--r--test/local-repo/Packages11
-rw-r--r--test/local-repo/Packages.gzbin0 -> 269 bytes
-rw-r--r--test/local-repo/Packages.gz.savebin0 -> 603 bytes
-rw-r--r--test/local-repo/Release13
-rw-r--r--test/local-repo/Release.gpg7
-rw-r--r--test/local-repo/gdebi-test4.debbin0 -> 2306 bytes
-rwxr-xr-xtest/pre-upload-check.py170
-rw-r--r--test/testkeys/mvo.key1182
-rw-r--r--test/testsources.list/sources.list.all-gpg-broken2
-rw-r--r--test/testsources.list/sources.list.all-gpg-ok2
-rw-r--r--test/testsources.list/sources.list.all-release-broken1
-rw-r--r--test/testsources.list/sources.list.all-release-ok1
-rw-r--r--test/testsources.list/sources.list.md5-package-broken2
-rw-r--r--test/testsources.list/sources.list.md5-package-ok2
-rw-r--r--test/testsources.list/sources.list.md5-release-broken1
-rw-r--r--test/testsources.list/sources.list.md5-release-ok1
-rw-r--r--test/testsources.list/sources.list.sha1-release-broken1
-rw-r--r--test/testsources.list/sources.list.sha1-release-ok1
-rw-r--r--test/testsources.list/sources.list.sha256-package-broken2
-rw-r--r--test/testsources.list/sources.list.sha256-package-ok2
-rw-r--r--test/testsources.list/sources.list.sha256-release-broken1
-rw-r--r--test/testsources.list/sources.list.sha256-release-ok1
138 files changed, 9798 insertions, 4492 deletions
diff --git a/README.arch b/README.arch
index 92870d614..364e940a4 100644
--- a/README.arch
+++ b/README.arch
@@ -1,7 +1,7 @@
You can build apt from arch, but this needs the following additional
packages (in addtion to the usual build-depends):
-xmlto perlsgml sgml2x sgmlspl docbook
+autoconf automake xmlto perlsgml sgml2x sgmlspl docbook
then run:
diff --git a/apt-inst/contrib/extracttar.cc b/apt-inst/contrib/extracttar.cc
index 8a535967f..68c871a5d 100644
--- a/apt-inst/contrib/extracttar.cc
+++ b/apt-inst/contrib/extracttar.cc
@@ -332,7 +332,7 @@ bool ExtractTar::Go(pkgDirStream &Stream)
}
// And finish up
- if (Itm.Size != 0 && BadRecord == false)
+ if (Itm.Size >= 0 && BadRecord == false)
if (Stream.FinishedFile(Itm,Fd) == false)
return false;
diff --git a/apt-inst/deb/debfile.cc b/apt-inst/deb/debfile.cc
index 9d83120f8..cd7a88808 100644
--- a/apt-inst/deb/debfile.cc
+++ b/apt-inst/deb/debfile.cc
@@ -44,8 +44,10 @@ debDebFile::debDebFile(FileFd &File) : File(File), AR(File)
return;
}
- if (!CheckMember("data.tar.gz") && !CheckMember("data.tar.bz2")) {
- _error->Error(_("This is not a valid DEB archive, it has no '%s' or '%s' member"), "data.tar.gz", "data.tar.bz2");
+ if (!CheckMember("data.tar.gz") &&
+ !CheckMember("data.tar.bz2") &&
+ !CheckMember("data.tar.lzma")) {
+ _error->Error(_("This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"), "data.tar.gz", "data.tar.bz2", "data.tar.lzma");
return;
}
}
@@ -130,6 +132,10 @@ bool debDebFile::ExtractArchive(pkgDirStream &Stream)
Member = AR.FindMember("data.tar.bz2");
Compressor = "bzip2";
}
+ if (Member == 0) {
+ Member = AR.FindMember("data.tar.lzma");
+ Compressor = "lzma";
+ }
if (Member == 0)
return _error->Error(_("Internal error, could not locate member"));
if (File.Seek(Member->Start) == false)
diff --git a/apt-inst/filelist.h b/apt-inst/filelist.h
index 86766254f..c74a310e4 100644
--- a/apt-inst/filelist.h
+++ b/apt-inst/filelist.h
@@ -29,7 +29,7 @@
#define PKGLIB_FILELIST_H
-
+#include <cstring>
#include <apt-pkg/mmap.h>
class pkgFLCache
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 6d71b6ea3..c8ac84f56 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -95,7 +95,7 @@ void pkgAcquire::Item::Start(string /*Message*/,unsigned long Size)
// Acquire::Item::Done - Item downloaded OK /*{{{*/
// ---------------------------------------------------------------------
/* */
-void pkgAcquire::Item::Done(string Message,unsigned long Size,string,
+void pkgAcquire::Item::Done(string Message,unsigned long Size,string Hash,
pkgAcquire::MethodConfig *Cnf)
{
// We just downloaded something..
@@ -142,8 +142,9 @@ void pkgAcquire::Item::Rename(string From,string To)
*/
pkgAcqDiffIndex::pkgAcqDiffIndex(pkgAcquire *Owner,
string URI,string URIDesc,string ShortDesc,
- string ExpectedMD5)
- : Item(Owner), RealURI(URI), ExpectedMD5(ExpectedMD5), Description(URIDesc)
+ HashString ExpectedHash)
+ : Item(Owner), RealURI(URI), ExpectedHash(ExpectedHash),
+ Description(URIDesc)
{
Debug = _config->FindB("Debug::pkgAcquire::Diffs",false);
@@ -271,11 +272,11 @@ bool pkgAcqDiffIndex::ParseDiffIndex(string IndexDiffFile)
if(found)
{
// queue the diffs
- unsigned int last_space = Description.rfind(" ");
+ string::size_type last_space = Description.rfind(" ");
if(last_space != string::npos)
Description.erase(last_space, Description.size()-last_space);
new pkgAcqIndexDiffs(Owner, RealURI, Description, Desc.ShortDesc,
- ExpectedMD5, available_patches);
+ ExpectedHash, available_patches);
Complete = false;
Status = StatDone;
Dequeue();
@@ -298,7 +299,7 @@ void pkgAcqDiffIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
<< "Falling back to normal index file aquire" << std::endl;
new pkgAcqIndex(Owner, RealURI, Description, Desc.ShortDesc,
- ExpectedMD5);
+ ExpectedHash);
Complete = false;
Status = StatDone;
@@ -344,8 +345,9 @@ void pkgAcqDiffIndex::Done(string Message,unsigned long Size,string Md5Hash,
*/
pkgAcqIndexDiffs::pkgAcqIndexDiffs(pkgAcquire *Owner,
string URI,string URIDesc,string ShortDesc,
- string ExpectedMD5, vector<DiffInfo> diffs)
- : Item(Owner), RealURI(URI), ExpectedMD5(ExpectedMD5),
+ HashString ExpectedHash,
+ vector<DiffInfo> diffs)
+ : Item(Owner), RealURI(URI), ExpectedHash(ExpectedHash),
available_patches(diffs)
{
@@ -378,7 +380,7 @@ void pkgAcqIndexDiffs::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
std::clog << "pkgAcqIndexDiffs failed: " << Desc.URI << std::endl
<< "Falling back to normal index file aquire" << std::endl;
new pkgAcqIndex(Owner, RealURI, Description,Desc.ShortDesc,
- ExpectedMD5);
+ ExpectedHash);
Finish();
}
@@ -393,14 +395,7 @@ void pkgAcqIndexDiffs::Finish(bool allDone)
DestFile = _config->FindDir("Dir::State::lists");
DestFile += URItoFileName(RealURI);
- // do the final md5sum checking
- MD5Summation sum;
- FileFd Fd(DestFile, FileFd::ReadOnly);
- sum.AddFD(Fd.Fd(), Fd.Size());
- Fd.Close();
- string MD5 = (string)sum.Result();
-
- if (!ExpectedMD5.empty() && MD5 != ExpectedMD5)
+ if(!ExpectedHash.empty() && !ExpectedHash.VerifyFile(DestFile))
{
Status = StatAuthError;
ErrorText = _("MD5Sum mismatch");
@@ -542,7 +537,7 @@ void pkgAcqIndexDiffs::Done(string Message,unsigned long Size,string Md5Hash,
// see if there is more to download
if(available_patches.size() > 0) {
new pkgAcqIndexDiffs(Owner, RealURI, Description, Desc.ShortDesc,
- ExpectedMD5, available_patches);
+ ExpectedHash, available_patches);
return Finish();
} else
return Finish(true);
@@ -556,8 +551,8 @@ void pkgAcqIndexDiffs::Done(string Message,unsigned long Size,string Md5Hash,
instantiated to fetch the revision file */
pkgAcqIndex::pkgAcqIndex(pkgAcquire *Owner,
string URI,string URIDesc,string ShortDesc,
- string ExpectedMD5, string comprExt)
- : Item(Owner), RealURI(URI), ExpectedMD5(ExpectedMD5)
+ HashString ExpectedHash, string comprExt)
+ : Item(Owner), RealURI(URI), ExpectedHash(ExpectedHash)
{
Decompression = false;
Erase = false;
@@ -608,7 +603,7 @@ void pkgAcqIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
// retry with a gzip one
new pkgAcqIndex(Owner, RealURI, Desc.Description,Desc.ShortDesc,
- ExpectedMD5, string(".gz"));
+ ExpectedHash, string(".gz"));
Status = StatDone;
Complete = false;
Dequeue();
@@ -633,32 +628,23 @@ void pkgAcqIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
to the uncompressed version of the file. If this is so the file
is copied into the partial directory. In all other cases the file
is decompressed with a gzip uri. */
-void pkgAcqIndex::Done(string Message,unsigned long Size,string MD5,
+void pkgAcqIndex::Done(string Message,unsigned long Size,string Hash,
pkgAcquire::MethodConfig *Cfg)
{
- Item::Done(Message,Size,MD5,Cfg);
+ Item::Done(Message,Size,Hash,Cfg);
if (Decompression == true)
{
if (_config->FindB("Debug::pkgAcquire::Auth", false))
{
- std::cerr << std::endl << RealURI << ": Computed MD5: " << MD5;
- std::cerr << " Expected MD5: " << ExpectedMD5 << std::endl;
- }
-
- if (MD5.empty())
- {
- MD5Summation sum;
- FileFd Fd(DestFile, FileFd::ReadOnly);
- sum.AddFD(Fd.Fd(), Fd.Size());
- Fd.Close();
- MD5 = (string)sum.Result();
+ std::cerr << std::endl << RealURI << ": Computed Hash: " << Hash;
+ std::cerr << " Expected Hash: " << ExpectedHash.toStr() << std::endl;
}
- if (!ExpectedMD5.empty() && MD5 != ExpectedMD5)
+ if (!ExpectedHash.empty() && ExpectedHash.toStr() != Hash)
{
Status = StatAuthError;
- ErrorText = _("MD5Sum mismatch");
+ ErrorText = _("Hash Sum mismatch");
Rename(DestFile,DestFile + ".FAILED");
return;
}
@@ -689,7 +675,6 @@ void pkgAcqIndex::Done(string Message,unsigned long Size,string MD5,
// The files timestamp matches
if (StringToBool(LookupTag(Message,"Alt-IMS-Hit"),false) == true)
return;
-
Decompression = true;
Local = true;
DestFile += ".decomp";
@@ -716,7 +701,7 @@ void pkgAcqIndex::Done(string Message,unsigned long Size,string MD5,
Local = true;
string compExt = Desc.URI.substr(Desc.URI.size()-3);
- char *decompProg;
+ const char *decompProg;
if(compExt == "bz2")
decompProg = "bzip2";
else if(compExt == ".gz")
@@ -737,8 +722,8 @@ void pkgAcqIndex::Done(string Message,unsigned long Size,string MD5,
// ---------------------------------------------------------------------
/* The Translation file is added to the queue */
pkgAcqIndexTrans::pkgAcqIndexTrans(pkgAcquire *Owner,
- string URI,string URIDesc,string ShortDesc) :
- pkgAcqIndex(Owner, URI, URIDesc, ShortDesc, "", "")
+ string URI,string URIDesc,string ShortDesc)
+ : pkgAcqIndex(Owner, URI, URIDesc, ShortDesc, HashString(), "")
{
}
@@ -915,10 +900,10 @@ string pkgAcqMetaIndex::Custom600Headers()
return "\nIndex-File: true\nLast-Modified: " + TimeRFC1123(Buf.st_mtime);
}
-void pkgAcqMetaIndex::Done(string Message,unsigned long Size,string MD5,
+void pkgAcqMetaIndex::Done(string Message,unsigned long Size,string Hash,
pkgAcquire::MethodConfig *Cfg)
{
- Item::Done(Message,Size,MD5,Cfg);
+ Item::Done(Message,Size,Hash,Cfg);
// MetaIndexes are done in two passes: one to download the
// metaindex with an appropriate method, and a second to verify it
@@ -980,18 +965,18 @@ void pkgAcqMetaIndex::RetrievalDone(string Message)
// see if the download was a IMSHit
IMSHit = StringToBool(LookupTag(Message,"IMS-Hit"),false);
-
Complete = true;
string FinalFile = _config->FindDir("Dir::State::lists");
FinalFile += URItoFileName(RealURI);
- // The files timestamp matches
- if (StringToBool(LookupTag(Message,"IMS-Hit"),false) == false)
- {
- // Move it into position
+ // If we get a IMS hit we can remove the empty file in partial
+ // othersie we move the file in place
+ if (IMSHit)
+ unlink(DestFile.c_str());
+ else
Rename(DestFile,FinalFile);
- }
+
chmod(FinalFile.c_str(),0644);
DestFile = FinalFile;
}
@@ -1036,7 +1021,7 @@ void pkgAcqMetaIndex::QueueIndexes(bool verify)
Target != IndexTargets->end();
Target++)
{
- string ExpectedIndexMD5;
+ HashString ExpectedIndexHash;
if (verify)
{
const indexRecords::checkSum *Record = MetaIndexParser->Lookup((*Target)->MetaKey);
@@ -1047,16 +1032,16 @@ void pkgAcqMetaIndex::QueueIndexes(bool verify)
+ (*Target)->MetaKey + " in Meta-index file (malformed Release file?)";
return;
}
- ExpectedIndexMD5 = Record->MD5Hash;
+ ExpectedIndexHash = Record->Hash;
if (_config->FindB("Debug::pkgAcquire::Auth", false))
{
std::cerr << "Queueing: " << (*Target)->URI << std::endl;
- std::cerr << "Expected MD5: " << ExpectedIndexMD5 << std::endl;
+ std::cerr << "Expected Hash: " << ExpectedIndexHash.toStr() << std::endl;
}
- if (ExpectedIndexMD5.empty())
+ if (ExpectedIndexHash.empty())
{
Status = StatAuthError;
- ErrorText = "Unable to find MD5 sum for "
+ ErrorText = "Unable to find hash sum for "
+ (*Target)->MetaKey + " in Meta-index file";
return;
}
@@ -1066,10 +1051,10 @@ void pkgAcqMetaIndex::QueueIndexes(bool verify)
// on the users option)
if(_config->FindB("Acquire::PDiffs",true) == true)
new pkgAcqDiffIndex(Owner, (*Target)->URI, (*Target)->Description,
- (*Target)->ShortDesc, ExpectedIndexMD5);
+ (*Target)->ShortDesc, ExpectedIndexHash);
else
new pkgAcqIndex(Owner, (*Target)->URI, (*Target)->Description,
- (*Target)->ShortDesc, ExpectedIndexMD5);
+ (*Target)->ShortDesc, ExpectedIndexHash);
}
}
@@ -1309,7 +1294,12 @@ bool pkgAcqArchive::QueueNext()
return false;
string PkgFile = Parse.FileName();
- MD5 = Parse.MD5Hash();
+ if(Parse.SHA256Hash() != "")
+ ExpectedHash = HashString("SHA256", Parse.SHA256Hash());
+ else if (Parse.SHA1Hash() != "")
+ ExpectedHash = HashString("SHA1", Parse.SHA1Hash());
+ else
+ ExpectedHash = HashString("MD5Sum", Parse.MD5Hash());
if (PkgFile.empty() == true)
return _error->Error(_("The package index files are corrupted. No Filename: "
"field for package %s."),
@@ -1389,10 +1379,10 @@ bool pkgAcqArchive::QueueNext()
// AcqArchive::Done - Finished fetching /*{{{*/
// ---------------------------------------------------------------------
/* */
-void pkgAcqArchive::Done(string Message,unsigned long Size,string Md5Hash,
+void pkgAcqArchive::Done(string Message,unsigned long Size,string CalcHash,
pkgAcquire::MethodConfig *Cfg)
{
- Item::Done(Message,Size,Md5Hash,Cfg);
+ Item::Done(Message,Size,CalcHash,Cfg);
// Check the size
if (Size != Version->Size)
@@ -1402,17 +1392,14 @@ void pkgAcqArchive::Done(string Message,unsigned long Size,string Md5Hash,
return;
}
- // Check the md5
- if (Md5Hash.empty() == false && MD5.empty() == false)
+ // Check the hash
+ if(ExpectedHash.toStr() != CalcHash)
{
- if (Md5Hash != MD5)
- {
- Status = StatError;
- ErrorText = _("MD5Sum mismatch");
- if(FileExists(DestFile))
- Rename(DestFile,DestFile + ".FAILED");
- return;
- }
+ Status = StatError;
+ ErrorText = _("Hash Sum mismatch");
+ if(FileExists(DestFile))
+ Rename(DestFile,DestFile + ".FAILED");
+ return;
}
// Grab the output filename
@@ -1504,10 +1491,10 @@ void pkgAcqArchive::Finished()
// AcqFile::pkgAcqFile - Constructor /*{{{*/
// ---------------------------------------------------------------------
/* The file is added to the queue */
-pkgAcqFile::pkgAcqFile(pkgAcquire *Owner,string URI,string MD5,
+pkgAcqFile::pkgAcqFile(pkgAcquire *Owner,string URI,string Hash,
unsigned long Size,string Dsc,string ShortDesc,
const string &DestDir, const string &DestFilename) :
- Item(Owner), Md5Hash(MD5)
+ Item(Owner), ExpectedHash(Hash)
{
Retries = _config->FindI("Acquire::Retries",0);
@@ -1544,23 +1531,20 @@ pkgAcqFile::pkgAcqFile(pkgAcquire *Owner,string URI,string MD5,
// AcqFile::Done - Item downloaded OK /*{{{*/
// ---------------------------------------------------------------------
/* */
-void pkgAcqFile::Done(string Message,unsigned long Size,string MD5,
+void pkgAcqFile::Done(string Message,unsigned long Size,string CalcHash,
pkgAcquire::MethodConfig *Cnf)
{
- // Check the md5
- if (Md5Hash.empty() == false && MD5.empty() == false)
+ Item::Done(Message,Size,CalcHash,Cnf);
+
+ // Check the hash
+ if(!ExpectedHash.empty() && ExpectedHash.toStr() != CalcHash)
{
- if (Md5Hash != MD5)
- {
- Status = StatError;
- ErrorText = "MD5Sum mismatch";
- Rename(DestFile,DestFile + ".FAILED");
- return;
- }
+ Status = StatError;
+ ErrorText = "Hash Sum mismatch";
+ Rename(DestFile,DestFile + ".FAILED");
+ return;
}
- Item::Done(Message,Size,MD5,Cnf);
-
string FileName = LookupTag(Message,"Filename");
if (FileName.empty() == true)
{
diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h
index f5272ed86..edd910230 100644
--- a/apt-pkg/acquire-item.h
+++ b/apt-pkg/acquire-item.h
@@ -12,7 +12,7 @@
Three item classes are provided to provide functionality for
downloading of Index, Translation and Packages files.
- A Archive class is provided for downloading .deb files. It does Md5
+ A Archive class is provided for downloading .deb files. It does Hash
checking and source location as well as a retry algorithm.
##################################################################### */
@@ -26,7 +26,7 @@
#include <apt-pkg/sourcelist.h>
#include <apt-pkg/pkgrecords.h>
#include <apt-pkg/indexrecords.h>
-
+#include <apt-pkg/hashes.h>
/** \addtogroup acquire
* @{
@@ -187,12 +187,12 @@ class pkgAcquire::Item
* \param Message Data from the acquire method. Use LookupTag()
* to parse it.
* \param Size The size of the object that was fetched.
- * \param Md5Hash The MD5Sum of the object that was fetched.
+ * \param Hash The HashSum of the object that was fetched.
* \param Cnf The method via which the object was fetched.
*
* \sa pkgAcqMethod
*/
- virtual void Done(string Message,unsigned long Size,string Md5Hash,
+ virtual void Done(string Message,unsigned long Size,string Hash,
pkgAcquire::MethodConfig *Cnf);
/** \brief Invoked when the worker starts to fetch this object.
@@ -230,12 +230,12 @@ class pkgAcquire::Item
/** \brief Invoked by the worker when the download is completely done. */
virtual void Finished() {};
- /** \brief MD5Sum.
+ /** \brief HashSum
*
- * \return the MD5Sum of this object, if applicable; otherwise, an
+ * \return the HashSum of this object, if applicable; otherwise, an
* empty string.
*/
- virtual string MD5Sum() {return string();};
+ virtual string HashSum() {return string();};
/** \return the acquire process with which this item is associated. */
pkgAcquire *GetOwner() {return Owner;};
@@ -297,10 +297,10 @@ class pkgAcqDiffIndex : public pkgAcquire::Item
*/
string RealURI;
- /** \brief The MD5Sum that the real index file should have after
+ /** \brief The Hash that the real index file should have after
* all patches have been applied.
*/
- string ExpectedMD5;
+ HashString ExpectedHash;
/** \brief The index file which will be patched to generate the new
* file.
@@ -343,10 +343,10 @@ class pkgAcqDiffIndex : public pkgAcquire::Item
*
* \param ShortDesc A short description of the list file to download.
*
- * \param ExpectedMD5 The list file's MD5 signature.
+ * \param ExpectedHash The list file's MD5 signature.
*/
pkgAcqDiffIndex(pkgAcquire *Owner,string URI,string URIDesc,
- string ShortDesc, string ExpectedMD5);
+ string ShortDesc, HashString ExpectedHash);
};
/** \brief An item that is responsible for fetching all the patches
@@ -379,7 +379,7 @@ class pkgAcqIndexDiffs : public pkgAcquire::Item
* finishes downloading.
*
* Dequeues the item and checks the resulting file's md5sum
- * against ExpectedMD5 after the last patch was applied.
+ * against ExpectedHash after the last patch was applied.
* There is no need to check the md5/sha1 after a "normal"
* patch because QueueNextDiff() will check the sha1 later.
*
@@ -405,10 +405,10 @@ class pkgAcqIndexDiffs : public pkgAcquire::Item
*/
string RealURI;
- /** \brief The MD5Sum of the package index file that is being
+ /** \brief The HashSum of the package index file that is being
* reconstructed.
*/
- string ExpectedMD5;
+ HashString ExpectedHash;
/** A description of the file being downloaded. */
string Description;
@@ -465,7 +465,7 @@ class pkgAcqIndexDiffs : public pkgAcquire::Item
*
* \param ShortDesc A brief description of this item.
*
- * \param ExpectedMD5 The expected md5sum of the completely
+ * \param ExpectedHash The expected md5sum of the completely
* reconstructed package index file; the index file will be tested
* against this value when it is entirely reconstructed.
*
@@ -474,7 +474,7 @@ class pkgAcqIndexDiffs : public pkgAcquire::Item
* that depends on it.
*/
pkgAcqIndexDiffs(pkgAcquire *Owner,string URI,string URIDesc,
- string ShortDesc, string ExpectedMD5,
+ string ShortDesc, HashString ExpectedHash,
vector<DiffInfo> diffs=vector<DiffInfo>());
};
@@ -507,8 +507,8 @@ class pkgAcqIndex : public pkgAcquire::Item
*/
string RealURI;
- /** \brief The expected md5sum of the decompressed index file. */
- string ExpectedMD5;
+ /** \brief The expected hashsum of the decompressed index file. */
+ HashString ExpectedHash;
/** \brief The compression-related file extension that is being
* added to the downloaded file (e.g., ".gz" or ".bz2").
@@ -523,6 +523,7 @@ class pkgAcqIndex : public pkgAcquire::Item
pkgAcquire::MethodConfig *Cnf);
virtual string Custom600Headers();
virtual string DescURI() {return RealURI + CompressionExtension;};
+ virtual string HashSum() {return ExpectedHash.toStr(); };
/** \brief Create a pkgAcqIndex.
*
@@ -535,14 +536,14 @@ class pkgAcqIndex : public pkgAcquire::Item
*
* \param ShortDesc A brief description of this index file.
*
- * \param ExpectedMD5 The expected md5sum of this index file.
+ * \param ExpectedHash The expected hashsum of this index file.
*
* \param compressExt The compression-related extension with which
* this index file should be downloaded, or "" to autodetect
* (".bz2" is used if bzip2 is installed, ".gz" otherwise).
*/
pkgAcqIndex(pkgAcquire *Owner,string URI,string URIDesc,
- string ShortDesc, string ExpectedMD5, string compressExt="");
+ string ShortDesc, HashString ExpectedHash, string compressExt="");
};
/** \brief An acquire item that is responsible for fetching a
@@ -569,7 +570,7 @@ class pkgAcqIndexTrans : public pkgAcqIndex
*
* \param ShortDesc A brief description of this index file.
*
- * \param ExpectedMD5 The expected md5sum of this index file.
+ * \param ExpectedHash The expected hashsum of this index file.
*
* \param compressExt The compression-related extension with which
* this index file should be downloaded, or "" to autodetect
@@ -661,9 +662,9 @@ class pkgAcqMetaSig : public pkgAcquire::Item
*
* Once the download and verification are complete, the downloads of
* the individual index files are queued up using pkgAcqDiffIndex.
- * If the meta-index file had a valid signature, the expected md5sums
+ * If the meta-index file had a valid signature, the expected hashsums
* of the index files will be the md5sums listed in the meta-index;
- * otherwise, the expected md5sums will be "" (causing the
+ * otherwise, the expected hashsums will be "" (causing the
* authentication of the index files to be bypassed).
*/
class pkgAcqMetaIndex : public pkgAcquire::Item
@@ -727,11 +728,11 @@ class pkgAcqMetaIndex : public pkgAcquire::Item
/** \brief Starts downloading the individual index files.
*
- * \param verify If \b true, only indices whose expected md5sum
+ * \param verify If \b true, only indices whose expected hashsum
* can be determined from the meta-index will be downloaded, and
- * the md5sums of indices will be checked (reporting
+ * the hashsums of indices will be checked (reporting
* #StatAuthError if there is a mismatch). If verify is \b false,
- * no md5sum checking will be performed.
+ * no hashsum checking will be performed.
*/
void QueueIndexes(bool verify);
@@ -739,7 +740,7 @@ class pkgAcqMetaIndex : public pkgAcquire::Item
// Specialized action members
virtual void Failed(string Message,pkgAcquire::MethodConfig *Cnf);
- virtual void Done(string Message,unsigned long Size,string Md5Hash,
+ virtual void Done(string Message,unsigned long Size, string Hash,
pkgAcquire::MethodConfig *Cnf);
virtual string Custom600Headers();
virtual string DescURI() {return RealURI; };
@@ -776,8 +777,8 @@ class pkgAcqArchive : public pkgAcquire::Item
*/
pkgRecords *Recs;
- /** \brief The md5sum of this package. */
- string MD5;
+ /** \brief The hashsum of this package. */
+ HashString ExpectedHash;
/** \brief A location in which the actual filename of the package
* should be stored.
@@ -805,13 +806,12 @@ class pkgAcqArchive : public pkgAcquire::Item
public:
virtual void Failed(string Message,pkgAcquire::MethodConfig *Cnf);
- virtual void Done(string Message,unsigned long Size,string Md5Hash,
+ virtual void Done(string Message,unsigned long Size,string Hash,
pkgAcquire::MethodConfig *Cnf);
- virtual string MD5Sum() {return MD5;};
virtual string DescURI() {return Desc.URI;};
virtual string ShortDesc() {return Desc.ShortDesc;};
virtual void Finished();
-
+ virtual string HashSum() {return ExpectedHash.toStr(); };
virtual bool IsTrusted();
/** \brief Create a new pkgAcqArchive.
@@ -848,8 +848,8 @@ class pkgAcqFile : public pkgAcquire::Item
/** \brief The currently active download process. */
pkgAcquire::ItemDesc Desc;
- /** \brief The md5sum of the file to download, if it is known. */
- string Md5Hash;
+ /** \brief The hashsum of the file to download, if it is known. */
+ HashString ExpectedHash;
/** \brief How many times to retry the download, set from
* Acquire::Retries.
@@ -860,10 +860,10 @@ class pkgAcqFile : public pkgAcquire::Item
// Specialized action members
virtual void Failed(string Message,pkgAcquire::MethodConfig *Cnf);
- virtual void Done(string Message,unsigned long Size,string Md5Hash,
+ virtual void Done(string Message,unsigned long Size,string CalcHash,
pkgAcquire::MethodConfig *Cnf);
- virtual string MD5Sum() {return Md5Hash;};
virtual string DescURI() {return Desc.URI;};
+ virtual string HashSum() {return ExpectedHash.toStr(); };
/** \brief Create a new pkgAcqFile object.
*
@@ -872,7 +872,7 @@ class pkgAcqFile : public pkgAcquire::Item
*
* \param URI The URI to download.
*
- * \param MD5 The md5sum of the file to download, if it is known;
+ * \param Hash The hashsum of the file to download, if it is known;
* otherwise "".
*
* \param Size The size of the file to download, if it is known;
@@ -894,7 +894,7 @@ class pkgAcqFile : public pkgAcquire::Item
* is the absolute name to which the file should be downloaded.
*/
- pkgAcqFile(pkgAcquire *Owner, string URI, string MD5, unsigned long Size,
+ pkgAcqFile(pkgAcquire *Owner, string URI, string Hash, unsigned long Size,
string Desc, string ShortDesc,
const string &DestDir="", const string &DestFilename="");
};
diff --git a/apt-pkg/acquire-method.cc b/apt-pkg/acquire-method.cc
index 3360a8eae..bc29417f7 100644
--- a/apt-pkg/acquire-method.cc
+++ b/apt-pkg/acquire-method.cc
@@ -176,9 +176,14 @@ void pkgAcqMethod::URIDone(FetchResult &Res, FetchResult *Alt)
TimeRFC1123(Res.LastModified).c_str());
if (Res.MD5Sum.empty() == false)
+ {
End += snprintf(End,sizeof(S)-50 - (End - S),"MD5-Hash: %s\n",Res.MD5Sum.c_str());
+ End += snprintf(End,sizeof(S)-50 - (End - S),"MD5Sum-Hash: %s\n",Res.MD5Sum.c_str());
+ }
if (Res.SHA1Sum.empty() == false)
End += snprintf(End,sizeof(S)-50 - (End - S),"SHA1-Hash: %s\n",Res.SHA1Sum.c_str());
+ if (Res.SHA256Sum.empty() == false)
+ End += snprintf(End,sizeof(S)-50 - (End - S),"SHA256-Hash: %s\n",Res.SHA256Sum.c_str());
if (Res.GPGVOutput.size() > 0)
End += snprintf(End,sizeof(S)-50 - (End - S),"GPGVOutput:\n");
for (vector<string>::iterator I = Res.GPGVOutput.begin();
@@ -211,6 +216,9 @@ void pkgAcqMethod::URIDone(FetchResult &Res, FetchResult *Alt)
if (Alt->SHA1Sum.empty() == false)
End += snprintf(End,sizeof(S)-50 - (End - S),"Alt-SHA1-Hash: %s\n",
Alt->SHA1Sum.c_str());
+ if (Alt->SHA256Sum.empty() == false)
+ End += snprintf(End,sizeof(S)-50 - (End - S),"Alt-SHA256-Hash: %s\n",
+ Alt->SHA256Sum.c_str());
if (Alt->IMSHit == true)
strcat(End,"Alt-IMS-Hit: true\n");
@@ -455,5 +463,6 @@ void pkgAcqMethod::FetchResult::TakeHashes(Hashes &Hash)
{
MD5Sum = Hash.MD5.Result();
SHA1Sum = Hash.SHA1.Result();
+ SHA256Sum = Hash.SHA256.Result();
}
/*}}}*/
diff --git a/apt-pkg/acquire-method.h b/apt-pkg/acquire-method.h
index 0fd846f54..e02eab018 100644
--- a/apt-pkg/acquire-method.h
+++ b/apt-pkg/acquire-method.h
@@ -43,6 +43,7 @@ class pkgAcqMethod
{
string MD5Sum;
string SHA1Sum;
+ string SHA256Sum;
vector<string> GPGVOutput;
time_t LastModified;
bool IMSHit;
diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc
index 25d40ef54..739c9e32c 100644
--- a/apt-pkg/acquire-worker.cc
+++ b/apt-pkg/acquire-worker.cc
@@ -267,8 +267,25 @@ bool pkgAcquire::Worker::RunMessages()
_error->Warning("Bizarre Error - File size is not what the server reported %s %lu",
LookupTag(Message,"Size","0").c_str(),TotalSize);
+ // see if there is a hash to verify
+ string RecivedHash;
+ HashString expectedHash(Owner->HashSum());
+ if(!expectedHash.empty())
+ {
+ string hashTag = expectedHash.HashType()+"-Hash";
+ string hashSum = LookupTag(Message, hashTag.c_str());
+ if(!hashSum.empty())
+ RecivedHash = expectedHash.HashType() + ":" + hashSum;
+ if(_config->FindB("Debug::pkgAcquire::Auth", false) == true)
+ {
+ clog << "201 URI Done: " << Owner->DescURI() << endl
+ << "RecivedHash: " << RecivedHash << endl
+ << "ExpectedHash: " << expectedHash.toStr()
+ << endl << endl;
+ }
+ }
Owner->Done(Message,atoi(LookupTag(Message,"Size","0").c_str()),
- LookupTag(Message,"MD5-Hash"),Config);
+ RecivedHash.c_str(), Config);
ItemDone();
// Log that we are done
diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc
index cbd67055d..6840ae120 100644
--- a/apt-pkg/acquire.cc
+++ b/apt-pkg/acquire.cc
@@ -619,7 +619,7 @@ bool pkgAcquire::Queue::Startup()
added other source retry to have cycle maintain a pipeline depth
on its own. */
if (Cnf->Pipeline == true)
- MaxPipeDepth = 10;
+ MaxPipeDepth = 1000;
else
MaxPipeDepth = 1;
}
diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index b21fcbb2f..62727a852 100644
--- a/apt-pkg/algorithms.cc
+++ b/apt-pkg/algorithms.cc
@@ -257,6 +257,8 @@ bool pkgApplyStatus(pkgDepCache &Cache)
re-unpacked (probably) */
case pkgCache::State::UnPacked:
case pkgCache::State::HalfConfigured:
+ case pkgCache::State::TriggersAwaited:
+ case pkgCache::State::TriggersPending:
if ((I->CurrentVer != 0 && I.CurrentVer().Downloadable() == true) ||
I.State() != pkgCache::PkgIterator::NeedsUnpack)
Cache.MarkKeep(I, false, false);
diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc
index 4a688a5e1..b8f94e5b0 100644
--- a/apt-pkg/cdrom.cc
+++ b/apt-pkg/cdrom.cc
@@ -668,8 +668,8 @@ bool pkgCdrom::Add(pkgCdromStatus *log)
DropRepeats(TransList,"");
if(log) {
msg.str("");
- ioprintf(msg, _("Found %i package indexes, %i source indexes, "
- "%i translation indexes and %i signatures\n"),
+ ioprintf(msg, _("Found %u package indexes, %u source indexes, "
+ "%u translation indexes and %u signatures\n"),
List.size(), SourceList.size(), TransList.size(),
SigList.size());
log->Update(msg.str(), STEP_SCAN);
diff --git a/apt-pkg/contrib/error.cc b/apt-pkg/contrib/error.cc
index 8c2d6cb19..db8c53c36 100644
--- a/apt-pkg/contrib/error.cc
+++ b/apt-pkg/contrib/error.cc
@@ -19,10 +19,12 @@
#include <iostream>
#include <errno.h>
#include <stdio.h>
-#include <string>
#include <stdarg.h>
#include <unistd.h>
+#include <string>
+#include <cstring>
+
#include "config.h"
/*}}}*/
diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index d19a92e62..9e13b4f60 100644
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -22,6 +22,8 @@
#include <apti18n.h>
#include <cstdlib>
+#include <cstring>
+
#include <iostream>
#include <unistd.h>
#include <fcntl.h>
diff --git a/apt-pkg/contrib/hashes.cc b/apt-pkg/contrib/hashes.cc
index b725e9418..fcc2f887c 100644
--- a/apt-pkg/contrib/hashes.cc
+++ b/apt-pkg/contrib/hashes.cc
@@ -12,11 +12,95 @@
/*}}}*/
// Include Files /*{{{*/
#include <apt-pkg/hashes.h>
+#include <apt-pkg/fileutl.h>
+#include <apt-pkg/configuration.h>
#include <unistd.h>
#include <system.h>
+#include <string>
+#include <iostream>
/*}}}*/
+const char* HashString::_SupportedHashes[] =
+{
+ "SHA256", "SHA1", "MD5Sum", NULL
+};
+
+HashString::HashString()
+{
+}
+
+HashString::HashString(string Type, string Hash) : Type(Type), Hash(Hash)
+{
+}
+
+HashString::HashString(string StringedHash)
+{
+ // legacy: md5sum without "MD5Sum:" prefix
+ if (StringedHash.find(":") == string::npos && StringedHash.size() == 32)
+ {
+ Type = "MD5Sum";
+ Hash = StringedHash;
+ return;
+ }
+ string::size_type pos = StringedHash.find(":");
+ Type = StringedHash.substr(0,pos);
+ Hash = StringedHash.substr(pos+1, StringedHash.size() - pos);
+
+ if(_config->FindB("Debug::Hashes",false) == true)
+ std::clog << "HashString(string): " << Type << " : " << Hash << std::endl;
+}
+
+
+bool HashString::VerifyFile(string filename) const
+{
+ FileFd fd;
+ MD5Summation MD5;
+ SHA1Summation SHA1;
+ SHA256Summation SHA256;
+ string fileHash;
+
+ FileFd Fd(filename, FileFd::ReadOnly);
+ if(Type == "MD5Sum")
+ {
+ MD5.AddFD(Fd.Fd(), Fd.Size());
+ fileHash = (string)MD5.Result();
+ }
+ else if (Type == "SHA1")
+ {
+ SHA1.AddFD(Fd.Fd(), Fd.Size());
+ fileHash = (string)SHA1.Result();
+ }
+ else if (Type == "SHA256")
+ {
+ SHA256.AddFD(Fd.Fd(), Fd.Size());
+ fileHash = (string)SHA256.Result();
+ }
+ Fd.Close();
+
+ if(_config->FindB("Debug::Hashes",false) == true)
+ std::clog << "HashString::VerifyFile: got: " << fileHash << " expected: " << toStr() << std::endl;
+
+ return (fileHash == Hash);
+}
+
+const char** HashString::SupportedHashes()
+{
+ return _SupportedHashes;
+}
+
+bool HashString::empty() const
+{
+ return (Type.empty() || Hash.empty());
+}
+
+
+string HashString::toStr() const
+{
+ return Type+string(":")+Hash;
+}
+
+
// Hashes::AddFD - Add the contents of the FD /*{{{*/
// ---------------------------------------------------------------------
/* */
diff --git a/apt-pkg/contrib/hashes.h b/apt-pkg/contrib/hashes.h
index b09ea9f6b..264f7fe90 100644
--- a/apt-pkg/contrib/hashes.h
+++ b/apt-pkg/contrib/hashes.h
@@ -19,8 +19,39 @@
#include <apt-pkg/sha256.h>
#include <algorithm>
+#include <vector>
+#include <cstring>
using std::min;
+using std::vector;
+
+// helper class that contains hash function name
+// and hash
+class HashString
+{
+ protected:
+ string Type;
+ string Hash;
+ static const char * _SupportedHashes[10];
+
+ public:
+ HashString(string Type, string Hash);
+ HashString(string StringedHashString); // init from str as "type:hash"
+ HashString();
+
+ // get hash type used
+ string HashType() { return Type; };
+
+ // verify the given filename against the currently loaded hash
+ bool VerifyFile(string filename) const;
+
+ // helper
+ string toStr() const; // convert to str as "type:hash"
+ bool empty() const;
+
+ // return the list of hashes we support
+ static const char** SupportedHashes();
+};
class Hashes
{
diff --git a/apt-pkg/contrib/md5.cc b/apt-pkg/contrib/md5.cc
index 44242371a..a095f8f0f 100644
--- a/apt-pkg/contrib/md5.cc
+++ b/apt-pkg/contrib/md5.cc
@@ -44,6 +44,7 @@
#include <inttypes.h>
#include <config.h>
#include <system.h>
+
/*}}}*/
// byteSwap - Swap bytes in a buffer /*{{{*/
diff --git a/apt-pkg/contrib/md5.h b/apt-pkg/contrib/md5.h
index 247b3fab9..96c8975b4 100644
--- a/apt-pkg/contrib/md5.h
+++ b/apt-pkg/contrib/md5.h
@@ -25,6 +25,7 @@
#include <string>
+#include <cstring>
#include <algorithm>
#include <stdint.h>
diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc
index 88e71e8e3..abcae46fe 100644
--- a/apt-pkg/contrib/mmap.cc
+++ b/apt-pkg/contrib/mmap.cc
@@ -31,6 +31,8 @@
#include <sys/stat.h>
#include <unistd.h>
#include <fcntl.h>
+
+#include <cstring>
/*}}}*/
// MMap::MMap - Constructor /*{{{*/
@@ -115,7 +117,7 @@ bool MMap::Sync()
#ifdef _POSIX_SYNCHRONIZED_IO
if ((Flags & ReadOnly) != ReadOnly)
- if (msync((char *)Base,iSize,MS_SYNC) != 0)
+ if (msync((char *)Base,iSize,MS_SYNC) < 0)
return _error->Errno("msync","Unable to write mmap");
#endif
return true;
@@ -132,7 +134,7 @@ bool MMap::Sync(unsigned long Start,unsigned long Stop)
#ifdef _POSIX_SYNCHRONIZED_IO
unsigned long PSize = sysconf(_SC_PAGESIZE);
if ((Flags & ReadOnly) != ReadOnly)
- if (msync((char *)Base+(int)(Start/PSize)*PSize,Stop - Start,MS_SYNC) != 0)
+ if (msync((char *)Base+(int)(Start/PSize)*PSize,Stop - Start,MS_SYNC) < 0)
return _error->Errno("msync","Unable to write mmap");
#endif
return true;
diff --git a/apt-pkg/contrib/progress.cc b/apt-pkg/contrib/progress.cc
index 6ce6e950a..cffdddc4f 100644
--- a/apt-pkg/contrib/progress.cc
+++ b/apt-pkg/contrib/progress.cc
@@ -16,6 +16,7 @@
#include <iostream>
#include <stdio.h>
+#include <cstring>
/*}}}*/
using namespace std;
diff --git a/apt-pkg/contrib/sha1.h b/apt-pkg/contrib/sha1.h
index 010ef802e..8ddd889f1 100644
--- a/apt-pkg/contrib/sha1.h
+++ b/apt-pkg/contrib/sha1.h
@@ -15,6 +15,7 @@
#define APTPKG_SHA1_H
#include <string>
+#include <cstring>
#include <algorithm>
using std::string;
diff --git a/apt-pkg/contrib/sha256.h b/apt-pkg/contrib/sha256.h
index c490bfa4d..1951f053b 100644
--- a/apt-pkg/contrib/sha256.h
+++ b/apt-pkg/contrib/sha256.h
@@ -15,6 +15,7 @@
#define APTPKG_SHA256_H
#include <string>
+#include <cstring>
#include <algorithm>
using std::string;
diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc
index 074abea6d..896d4d6d8 100644
--- a/apt-pkg/deb/deblistparser.cc
+++ b/apt-pkg/deb/deblistparser.cc
@@ -293,6 +293,8 @@ bool debListParser::ParseStatus(pkgCache::PkgIterator Pkg,
{"installed",pkgCache::State::Installed},
{"half-installed",pkgCache::State::HalfInstalled},
{"config-files",pkgCache::State::ConfigFiles},
+ {"triggers-awaited",pkgCache::State::TriggersAwaited},
+ {"triggers-pending",pkgCache::State::TriggersPending},
{"post-inst-failed",pkgCache::State::HalfConfigured},
{"removal-failed",pkgCache::State::HalfInstalled},
{}};
diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc
index 73b2dda49..9ac659f78 100644
--- a/apt-pkg/deb/debmetaindex.cc
+++ b/apt-pkg/deb/debmetaindex.cc
@@ -144,7 +144,7 @@ bool debReleaseIndex::GetIndexes(pkgAcquire *Owner, bool GetAll) const
vector <struct IndexTarget *> *targets = ComputeIndexTargets();
for (vector <struct IndexTarget*>::const_iterator Target = targets->begin(); Target != targets->end(); Target++) {
new pkgAcqIndex(Owner, (*Target)->URI, (*Target)->Description,
- (*Target)->ShortDesc, "");
+ (*Target)->ShortDesc, HashString());
}
}
new pkgAcqMetaSig(Owner, MetaIndexURI("Release.gpg"),
@@ -224,7 +224,7 @@ class debSLTypeDebian : public pkgSourceList::Type
// This check insures that there will be only one Release file
// queued for all the Packages files and Sources files it
// corresponds to.
- if ((*I)->GetType() == "deb")
+ if (strcmp((*I)->GetType(), "deb") == 0)
{
debReleaseIndex *Deb = (debReleaseIndex *) (*I);
// This check insures that there will be only one Release file
diff --git a/apt-pkg/deb/debrecords.cc b/apt-pkg/deb/debrecords.cc
index 8a5b6e215..3d3d7de0a 100644
--- a/apt-pkg/deb/debrecords.cc
+++ b/apt-pkg/deb/debrecords.cc
@@ -67,6 +67,14 @@ string debRecordParser::SHA1Hash()
return Section.FindS("SHA1");
}
/*}}}*/
+// RecordParser::SHA1Hash - Return the archive hash /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+string debRecordParser::SHA256Hash()
+{
+ return Section.FindS("SHA256");
+}
+ /*}}}*/
// RecordParser::Maintainer - Return the maintainer email /*{{{*/
// ---------------------------------------------------------------------
/* */
diff --git a/apt-pkg/deb/debrecords.h b/apt-pkg/deb/debrecords.h
index df21931a8..ab244b6dd 100644
--- a/apt-pkg/deb/debrecords.h
+++ b/apt-pkg/deb/debrecords.h
@@ -35,6 +35,7 @@ class debRecordParser : public pkgRecords::Parser
virtual string FileName();
virtual string MD5Hash();
virtual string SHA1Hash();
+ virtual string SHA256Hash();
virtual string SourcePkg();
virtual string SourceVer();
diff --git a/apt-pkg/deb/debsrcrecords.cc b/apt-pkg/deb/debsrcrecords.cc
index fcd9bb901..ace4e00b5 100644
--- a/apt-pkg/deb/debsrcrecords.cc
+++ b/apt-pkg/deb/debsrcrecords.cc
@@ -137,7 +137,7 @@ bool debSrcRecordParser::Files(vector<pkgSrcRecords::File> &List)
break;
F.Type = string(F.Path,Tmp+1,Pos-Tmp);
- if (F.Type == "gz" || F.Type == "bz2")
+ if (F.Type == "gz" || F.Type == "bz2" || F.Type == "lzma")
{
Pos = Tmp-1;
continue;
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index a63c4e412..4323b5fd2 100644
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -13,10 +13,12 @@
#include <apt-pkg/configuration.h>
#include <apt-pkg/depcache.h>
#include <apt-pkg/strutl.h>
+#include <apti18n.h>
#include <unistd.h>
#include <stdlib.h>
#include <fcntl.h>
+#include <sys/select.h>
#include <sys/types.h>
#include <sys/wait.h>
#include <signal.h>
@@ -25,16 +27,25 @@
#include <sstream>
#include <map>
+#include <termios.h>
+#include <unistd.h>
+#include <sys/ioctl.h>
+#include <pty.h>
+
#include <config.h>
#include <apti18n.h>
/*}}}*/
using namespace std;
+
+
// DPkgPM::pkgDPkgPM - Constructor /*{{{*/
// ---------------------------------------------------------------------
/* */
-pkgDPkgPM::pkgDPkgPM(pkgDepCache *Cache) : pkgPackageManager(Cache)
+pkgDPkgPM::pkgDPkgPM(pkgDepCache *Cache)
+ : pkgPackageManager(Cache), dpkgbuf_pos(0),
+ term_out(NULL), PackagesDone(0), PackagesTotal(0)
{
}
/*}}}*/
@@ -323,7 +334,208 @@ bool pkgDPkgPM::RunScriptsWithPkgs(const char *Cnf)
return true;
}
+
+ /*}}}*/
+// DPkgPM::DoStdin - Read stdin and pass to slave pty /*{{{*/
+// ---------------------------------------------------------------------
+/*
+*/
+void pkgDPkgPM::DoStdin(int master)
+{
+ char input_buf[256] = {0,};
+ int len = read(0, input_buf, sizeof(input_buf));
+ write(master, input_buf, len);
+}
+ /*}}}*/
+// DPkgPM::DoTerminalPty - Read the terminal pty and write log /*{{{*/
+// ---------------------------------------------------------------------
+/*
+ * read the terminal pty and write log
+ */
+void pkgDPkgPM::DoTerminalPty(int master)
+{
+ char term_buf[1024] = {0,};
+
+ int len=read(master, term_buf, sizeof(term_buf));
+ if(len <= 0)
+ return;
+ write(1, term_buf, len);
+ if(term_out)
+ fwrite(term_buf, len, sizeof(char), term_out);
+}
+ /*}}}*/
+// DPkgPM::ProcessDpkgStatusBuf /*{{{*/
+// ---------------------------------------------------------------------
+/*
+ */
+void pkgDPkgPM::ProcessDpkgStatusLine(int OutStatusFd, char *line)
+{
+ // the status we output
+ ostringstream status;
+
+ if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true)
+ std::clog << "got from dpkg '" << line << "'" << std::endl;
+
+
+ /* dpkg sends strings like this:
+ 'status: <pkg>: <pkg qstate>'
+ errors look like this:
+ 'status: /var/cache/apt/archives/krecipes_0.8.1-0ubuntu1_i386.deb : error : trying to overwrite `/usr/share/doc/kde/HTML/en/krecipes/krectip.png', which is also in package krecipes-data
+ and conffile-prompt like this
+ 'status: conffile-prompt: conffile : 'current-conffile' 'new-conffile' useredited distedited
+
+ */
+ char* list[5];
+ // dpkg sends multiline error messages sometimes (see
+ // #374195 for a example. we should support this by
+ // either patching dpkg to not send multiline over the
+ // statusfd or by rewriting the code here to deal with
+ // it. for now we just ignore it and not crash
+ TokSplitString(':', line, list, sizeof(list)/sizeof(list[0]));
+ if( list[0] == NULL || list[1] == NULL || list[2] == NULL)
+ {
+ if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true)
+ std::clog << "ignoring line: not enough ':'" << std::endl;
+ return;
+ }
+ char *pkg = list[1];
+ char *action = _strstrip(list[2]);
+
+ if(strncmp(action,"error",strlen("error")) == 0)
+ {
+ status << "pmerror:" << list[1]
+ << ":" << (PackagesDone/float(PackagesTotal)*100.0)
+ << ":" << list[3]
+ << endl;
+ if(OutStatusFd > 0)
+ write(OutStatusFd, status.str().c_str(), status.str().size());
+ if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true)
+ std::clog << "send: '" << status.str() << "'" << endl;
+ return;
+ }
+ if(strncmp(action,"conffile",strlen("conffile")) == 0)
+ {
+ status << "pmconffile:" << list[1]
+ << ":" << (PackagesDone/float(PackagesTotal)*100.0)
+ << ":" << list[3]
+ << endl;
+ if(OutStatusFd > 0)
+ write(OutStatusFd, status.str().c_str(), status.str().size());
+ if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true)
+ std::clog << "send: '" << status.str() << "'" << endl;
+ return;
+ }
+
+ vector<struct DpkgState> &states = PackageOps[pkg];
+ const char *next_action = NULL;
+ if(PackageOpsDone[pkg] < states.size())
+ next_action = states[PackageOpsDone[pkg]].state;
+ // check if the package moved to the next dpkg state
+ if(next_action && (strcmp(action, next_action) == 0))
+ {
+ // only read the translation if there is actually a next
+ // action
+ const char *translation = _(states[PackageOpsDone[pkg]].str);
+ char s[200];
+ snprintf(s, sizeof(s), translation, pkg);
+
+ // we moved from one dpkg state to a new one, report that
+ PackageOpsDone[pkg]++;
+ PackagesDone++;
+ // build the status str
+ status << "pmstatus:" << pkg
+ << ":" << (PackagesDone/float(PackagesTotal)*100.0)
+ << ":" << s
+ << endl;
+ if(OutStatusFd > 0)
+ write(OutStatusFd, status.str().c_str(), status.str().size());
+ if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true)
+ std::clog << "send: '" << status.str() << "'" << endl;
+ }
+ if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true)
+ std::clog << "(parsed from dpkg) pkg: " << pkg
+ << " action: " << action << endl;
+}
+
+// DPkgPM::DoDpkgStatusFd /*{{{*/
+// ---------------------------------------------------------------------
+/*
+ */
+void pkgDPkgPM::DoDpkgStatusFd(int statusfd, int OutStatusFd)
+{
+ char *p, *q;
+ int len;
+
+ len=read(statusfd, &dpkgbuf[dpkgbuf_pos], sizeof(dpkgbuf)-dpkgbuf_pos);
+ dpkgbuf_pos += len;
+ if(len <= 0)
+ return;
+
+ // process line by line if we have a buffer
+ p = q = dpkgbuf;
+ while((q=(char*)memchr(p, '\n', dpkgbuf+dpkgbuf_pos-p)) != NULL)
+ {
+ *q = 0;
+ ProcessDpkgStatusLine(OutStatusFd, p);
+ p=q+1; // continue with next line
+ }
+
+ // now move the unprocessed bits (after the final \n that is now a 0x0)
+ // to the start and update dpkgbuf_pos
+ p = (char*)memrchr(dpkgbuf, 0, dpkgbuf_pos);
+ if(p == NULL)
+ return;
+
+ // we are interessted in the first char *after* 0x0
+ p++;
+
+ // move the unprocessed tail to the start and update pos
+ memmove(dpkgbuf, p, p-dpkgbuf);
+ dpkgbuf_pos = dpkgbuf+dpkgbuf_pos-p;
+}
/*}}}*/
+
+bool pkgDPkgPM::OpenLog()
+{
+ string logdir = _config->FindDir("Dir::Log");
+ if(not FileExists(logdir))
+ return _error->Error(_("Directory '%s' missing"), logdir.c_str());
+ string logfile_name = flCombine(logdir,
+ _config->Find("Dir::Log::Terminal"));
+ if (!logfile_name.empty())
+ {
+ term_out = fopen(logfile_name.c_str(),"a");
+ chmod(logfile_name.c_str(), 0600);
+ // output current time
+ char outstr[200];
+ time_t t = time(NULL);
+ struct tm *tmp = localtime(&t);
+ strftime(outstr, sizeof(outstr), "%F %T", tmp);
+ fprintf(term_out, "\nLog started: ");
+ fprintf(term_out, outstr);
+ fprintf(term_out, "\n");
+ }
+ return true;
+}
+
+bool pkgDPkgPM::CloseLog()
+{
+ if(term_out)
+ {
+ char outstr[200];
+ time_t t = time(NULL);
+ struct tm *tmp = localtime(&t);
+ strftime(outstr, sizeof(outstr), "%F %T", tmp);
+ fprintf(term_out, "Log ended: ");
+ fprintf(term_out, outstr);
+ fprintf(term_out, "\n");
+ fclose(term_out);
+ }
+ term_out = NULL;
+ return true;
+}
+
+
// DPkgPM::Go - Run the sequence /*{{{*/
// ---------------------------------------------------------------------
/* This globs the operations and calls dpkg
@@ -344,12 +556,9 @@ bool pkgDPkgPM::Go(int OutStatusFd)
if (RunScriptsWithPkgs("DPkg::Pre-Install-Pkgs") == false)
return false;
- // prepare the progress reporting
- int Done = 0;
- int Total = 0;
// map the dpkg states to the operations that are performed
// (this is sorted in the same way as Item::Ops)
- static const struct DpkgState DpkgStatesOpMap[][5] = {
+ static const struct DpkgState DpkgStatesOpMap[][7] = {
// Install operation
{
{"half-installed", N_("Preparing %s")},
@@ -360,12 +569,20 @@ bool pkgDPkgPM::Go(int OutStatusFd)
{
{"unpacked",N_("Preparing to configure %s") },
{"half-configured", N_("Configuring %s") },
+#if 0
+ {"triggers-awaited", N_("Processing triggers for %s") },
+ {"triggers-pending", N_("Processing triggers for %s") },
+#endif
{ "installed", N_("Installed %s")},
{NULL, NULL}
},
// Remove operation
{
{"half-configured", N_("Preparing for removal of %s")},
+#if 0
+ {"triggers-awaited", N_("Preparing for removal of %s")},
+ {"triggers-pending", N_("Preparing for removal of %s")},
+#endif
{"half-installed", N_("Removing %s")},
{"config-files", N_("Removed %s")},
{NULL, NULL}
@@ -378,15 +595,6 @@ bool pkgDPkgPM::Go(int OutStatusFd)
},
};
- // the dpkg states that the pkg will run through, the string is
- // the package, the vector contains the dpkg states that the package
- // will go through
- map<string,vector<struct DpkgState> > PackageOps;
- // the dpkg states that are already done; the string is the package
- // the int is the state that is already done (e.g. a package that is
- // going to be install is already in state "half-installed")
- map<string,unsigned int> PackageOpsDone;
-
// init the PackageOps map, go over the list of packages that
// that will be [installed|configured|removed|purged] and add
// them to the PackageOps map (the dpkg states it goes through)
@@ -398,10 +606,13 @@ bool pkgDPkgPM::Go(int OutStatusFd)
for(int i=0; (DpkgStatesOpMap[(*I).Op][i]).state != NULL; i++)
{
PackageOps[name].push_back(DpkgStatesOpMap[(*I).Op][i]);
- Total++;
+ PackagesTotal++;
}
}
+ // create log
+ OpenLog();
+
// this loop is runs once per operation
for (vector<Item>::iterator I = List.begin(); I != List.end();)
{
@@ -516,7 +727,30 @@ bool pkgDPkgPM::Go(int OutStatusFd)
it doesn't die but we do! So we must also ignore it */
sighandler_t old_SIGQUIT = signal(SIGQUIT,SIG_IGN);
sighandler_t old_SIGINT = signal(SIGINT,SIG_IGN);
-
+
+ struct termios tt;
+ struct winsize win;
+ int master;
+ int slave;
+
+ // FIXME: setup sensible signal handling (*ick*)
+ tcgetattr(0, &tt);
+ ioctl(0, TIOCGWINSZ, (char *)&win);
+ if (openpty(&master, &slave, NULL, &tt, &win) < 0)
+ {
+ const char *s = _("Can not write log, openpty() "
+ "failed (/dev/pts not mounted?)\n");
+ fprintf(stderr, "%s",s);
+ fprintf(term_out, "%s",s);
+ master = slave = -1;
+ } else {
+ struct termios rtt;
+ rtt = tt;
+ cfmakeraw(&rtt);
+ rtt.c_lflag &= ~ECHO;
+ tcsetattr(0, TCSAFLUSH, &rtt);
+ }
+
// Fork dpkg
pid_t Child;
_config->Set("APT::Keep-Fds::",fd[1]);
@@ -525,8 +759,18 @@ bool pkgDPkgPM::Go(int OutStatusFd)
// This is the child
if (Child == 0)
{
+ if(slave >= 0 && master >= 0)
+ {
+ setsid();
+ ioctl(slave, TIOCSCTTY, 0);
+ close(master);
+ dup2(slave, 0);
+ dup2(slave, 1);
+ dup2(slave, 2);
+ close(slave);
+ }
close(fd[0]); // close the read end of the pipe
-
+
if (chdir(_config->FindDir("DPkg::Run-Directory","/").c_str()) != 0)
_exit(100);
@@ -545,10 +789,11 @@ bool pkgDPkgPM::Go(int OutStatusFd)
if (fcntl(STDIN_FILENO,F_SETFL,Flags & (~(long)O_NONBLOCK)) < 0)
_exit(100);
}
-
+
+
/* No Job Control Stop Env is a magic dpkg var that prevents it
from using sigstop */
- putenv("DPKG_NO_TSTP=yes");
+ putenv((char *)"DPKG_NO_TSTP=yes");
execvp(Args[0],(char **)Args);
cerr << "Could not exec dpkg!" << endl;
_exit(100);
@@ -562,16 +807,17 @@ bool pkgDPkgPM::Go(int OutStatusFd)
// we read from dpkg here
int _dpkgin = fd[0];
- fcntl(_dpkgin, F_SETFL, O_NONBLOCK);
close(fd[1]); // close the write end of the pipe
- // the read buffers for the communication with dpkg
- char line[1024] = {0,};
- char buf[2] = {0,0};
-
// the result of the waitpid call
int res;
+ if(slave > 0)
+ close(slave);
+ // setups fds
+ fd_set rfds;
+ struct timeval tv;
+ int select_ret;
while ((res=waitpid(Child,&Status, WNOHANG)) != Child) {
if(res < 0) {
// FIXME: move this to a function or something, looks ugly here
@@ -585,127 +831,41 @@ bool pkgDPkgPM::Go(int OutStatusFd)
signal(SIGINT,old_SIGINT);
return _error->Errno("waitpid","Couldn't wait for subprocess");
}
-
- // read a single char, make sure that the read can't block
- // (otherwise we may leave zombies)
- int len = read(_dpkgin, buf, 1);
- // nothing to read, wait a bit for more
- if(len <= 0)
- {
- usleep(1000);
- continue;
- }
-
- // sanity check (should never happen)
- if(strlen(line) >= sizeof(line)-10)
+ // wait for input or output here
+ FD_ZERO(&rfds);
+ FD_SET(0, &rfds);
+ FD_SET(_dpkgin, &rfds);
+ if(master >= 0)
+ FD_SET(master, &rfds);
+ tv.tv_sec = 1;
+ tv.tv_usec = 0;
+ select_ret = select(max(master, _dpkgin)+1, &rfds, NULL, NULL, &tv);
+ if (select_ret == 0)
+ continue;
+ else if (select_ret < 0 && errno == EINTR)
+ continue;
+ else if (select_ret < 0)
{
- _error->Error("got a overlong line from dpkg: '%s'",line);
- line[0]=0;
- }
- // append to line, check if we got a complete line
- strcat(line, buf);
- if(buf[0] != '\n')
- continue;
-
- if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true)
- std::clog << "got from dpkg '" << line << "'" << std::endl;
-
- // the status we output
- ostringstream status;
-
- /* dpkg sends strings like this:
- 'status: <pkg>: <pkg qstate>'
- errors look like this:
- 'status: /var/cache/apt/archives/krecipes_0.8.1-0ubuntu1_i386.deb : error : trying to overwrite `/usr/share/doc/kde/HTML/en/krecipes/krectip.png', which is also in package krecipes-data
- and conffile-prompt like this
- 'status: conffile-prompt: conffile : 'current-conffile' 'new-conffile' useredited distedited
-
- */
- char* list[5];
- // dpkg sends multiline error messages sometimes (see
- // #374195 for a example. we should support this by
- // either patching dpkg to not send multiline over the
- // statusfd or by rewriting the code here to deal with
- // it. for now we just ignore it and not crash
- TokSplitString(':', line, list, sizeof(list)/sizeof(list[0]));
- char *pkg = list[1];
- char *action = _strstrip(list[2]);
- if( pkg == NULL || action == NULL)
- {
- if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true)
- std::clog << "ignoring line: not enough ':'" << std::endl;
- // reset the line buffer
- line[0]=0;
- continue;
- }
-
- if(strncmp(action,"error",strlen("error")) == 0)
- {
- status << "pmerror:" << list[1]
- << ":" << (Done/float(Total)*100.0)
- << ":" << list[3]
- << endl;
- if(OutStatusFd > 0)
- write(OutStatusFd, status.str().c_str(), status.str().size());
- line[0]=0;
- if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true)
- std::clog << "send: '" << status.str() << "'" << endl;
- continue;
- }
- if(strncmp(action,"conffile",strlen("conffile")) == 0)
- {
- status << "pmconffile:" << list[1]
- << ":" << (Done/float(Total)*100.0)
- << ":" << list[3]
- << endl;
- if(OutStatusFd > 0)
- write(OutStatusFd, status.str().c_str(), status.str().size());
- line[0]=0;
- if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true)
- std::clog << "send: '" << status.str() << "'" << endl;
- continue;
- }
-
- vector<struct DpkgState> &states = PackageOps[pkg];
- const char *next_action = NULL;
- if(PackageOpsDone[pkg] < states.size())
- next_action = states[PackageOpsDone[pkg]].state;
- // check if the package moved to the next dpkg state
- if(next_action && (strcmp(action, next_action) == 0))
- {
- // only read the translation if there is actually a next
- // action
- const char *translation = _(states[PackageOpsDone[pkg]].str);
- char s[200];
- snprintf(s, sizeof(s), translation, pkg);
-
- // we moved from one dpkg state to a new one, report that
- PackageOpsDone[pkg]++;
- Done++;
- // build the status str
- status << "pmstatus:" << pkg
- << ":" << (Done/float(Total)*100.0)
- << ":" << s
- << endl;
- if(OutStatusFd > 0)
- write(OutStatusFd, status.str().c_str(), status.str().size());
- if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true)
- std::clog << "send: '" << status.str() << "'" << endl;
-
- }
- if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true)
- std::clog << "(parsed from dpkg) pkg: " << pkg
- << " action: " << action << endl;
-
- // reset the line buffer
- line[0]=0;
+ perror("select() returned error");
+ continue;
+ }
+
+ if(master >= 0 && FD_ISSET(master, &rfds))
+ DoTerminalPty(master);
+ if(master >= 0 && FD_ISSET(0, &rfds))
+ DoStdin(master);
+ if(FD_ISSET(_dpkgin, &rfds))
+ DoDpkgStatusFd(_dpkgin, OutStatusFd);
}
close(_dpkgin);
// Restore sig int/quit
signal(SIGQUIT,old_SIGQUIT);
signal(SIGINT,old_SIGINT);
+
+ if(master >= 0 && slave >= 0)
+ tcsetattr(0, TCSAFLUSH, &tt);
// Check for an error code.
if (WIFEXITED(Status) == 0 || WEXITSTATUS(Status) != 0)
@@ -725,10 +885,14 @@ bool pkgDPkgPM::Go(int OutStatusFd)
else
_error->Error("Sub-process %s exited unexpectedly",Args[0]);
- if(stopOnError)
+ if(stopOnError)
+ {
+ CloseLog();
return false;
+ }
}
}
+ CloseLog();
if (RunScripts("DPkg::Post-Invoke") == false)
return false;
diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h
index 7da729904..b7f45b978 100644
--- a/apt-pkg/deb/dpkgpm.h
+++ b/apt-pkg/deb/dpkgpm.h
@@ -12,21 +12,43 @@
#include <apt-pkg/packagemanager.h>
#include <vector>
+#include <map>
#include <stdio.h>
using std::vector;
+using std::map;
+
class pkgDPkgPM : public pkgPackageManager
{
+ private:
+
+ // the buffer we use for the dpkg status-fd reading
+ char dpkgbuf[1024];
+ int dpkgbuf_pos;
+ FILE *term_out;
+
protected:
- // used for progress reporting
+ // progress reporting
struct DpkgState
{
const char *state; // the dpkg state (e.g. "unpack")
const char *str; // the human readable translation of the state
};
-
+
+ // the dpkg states that the pkg will run through, the string is
+ // the package, the vector contains the dpkg states that the package
+ // will go through
+ map<string,vector<struct DpkgState> > PackageOps;
+ // the dpkg states that are already done; the string is the package
+ // the int is the state that is already done (e.g. a package that is
+ // going to be install is already in state "half-installed")
+ map<string,unsigned int> PackageOpsDone;
+ // progress reporting
+ unsigned int PackagesDone;
+ unsigned int PackagesTotal;
+
struct Item
{
enum Ops {Install, Configure, Remove, Purge} Op;
@@ -44,6 +66,16 @@ class pkgDPkgPM : public pkgPackageManager
bool RunScriptsWithPkgs(const char *Cnf);
bool SendV2Pkgs(FILE *F);
+ // dpkg log
+ bool OpenLog();
+ bool CloseLog();
+
+ // input processing
+ void DoStdin(int master);
+ void DoTerminalPty(int master);
+ void DoDpkgStatusFd(int statusfd, int OutStatusFd);
+ void ProcessDpkgStatusLine(int OutStatusFd, char *line);
+
// The Actuall installation implementation
virtual bool Install(PkgIterator Pkg,string File);
virtual bool Configure(PkgIterator Pkg);
diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc
index 7f5719454..c21872449 100644
--- a/apt-pkg/depcache.cc
+++ b/apt-pkg/depcache.cc
@@ -27,6 +27,27 @@
#include <apti18n.h>
+// helper for Install-Recommends-Sections and Never-MarkAuto-Sections
+static bool
+ConfigValueInSubTree(const char* SubTree, const char *needle)
+{
+ Configuration::Item const *Opts;
+ Opts = _config->Tree(SubTree);
+ if (Opts != 0 && Opts->Child != 0)
+ {
+ Opts = Opts->Child;
+ for (; Opts != 0; Opts = Opts->Next)
+ {
+ if (Opts->Value.empty() == true)
+ continue;
+ if (strcmp(needle, Opts->Value.c_str()) == 0)
+ return true;
+ }
+ }
+ return false;
+}
+
+
pkgDepCache::ActionGroup::ActionGroup(pkgDepCache &cache) :
cache(cache), released(false)
{
@@ -954,11 +975,10 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst,
<< " as dep of " << Pkg.Name()
<< std::endl;
// now check if we should consider it a automatic dependency or not
- string sec = _config->Find("APT::Never-MarkAuto-Section","");
- if(Pkg.Section() && (string(Pkg.Section()) == sec))
+ if(Pkg.Section() && ConfigValueInSubTree("APT::Never-MarkAuto-Sections", Pkg.Section()))
{
if(_config->FindB("Debug::pkgDepCache::AutoInstall",false) == true)
- std::clog << "Setting NOT as auto-installed because its a direct dep of a package in section " << sec << std::endl;
+ std::clog << "Setting NOT as auto-installed (direct dep of pkg in APT::Never-MarkAuto-Section)" << std::endl;
MarkInstall(InstPkg,true,Depth + 1, true);
}
else
@@ -1131,6 +1151,7 @@ pkgCache::VerIterator pkgDepCache::Policy::GetCandidateVer(PkgIterator Pkg)
return Last;
}
/*}}}*/
+
// Policy::IsImportantDep - True if the dependency is important /*{{{*/
// ---------------------------------------------------------------------
/* */
@@ -1146,13 +1167,9 @@ bool pkgDepCache::Policy::IsImportantDep(DepIterator Dep)
// sections
// FIXME: this is a meant as a temporarly solution until the
// recommends are cleaned up
- string s = _config->Find("APT::Install-Recommends-Section","");
- if(s.size() > 0)
- {
- const char *sec = Dep.ParentVer().Section();
- if (sec && strcmp(sec, s.c_str()) == 0)
- return true;
- }
+ const char *sec = Dep.ParentVer().Section();
+ if (sec && ConfigValueInSubTree("APT::Install-Recommends-Sections", sec))
+ return true;
}
else if(Dep->Type == pkgCache::Dep::Suggests)
return _config->FindB("APT::Install-Suggests", false);
diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc
index c9dded134..b30777d8d 100644
--- a/apt-pkg/indexcopy.cc
+++ b/apt-pkg/indexcopy.cc
@@ -528,23 +528,16 @@ bool SigVerify::Verify(string prefix, string file, indexRecords *MetaIndex)
return false;
}
- MD5Summation sum;
- FileFd Fd(prefix+file, FileFd::ReadOnly);
- sum.AddFD(Fd.Fd(), Fd.Size());
- Fd.Close();
- string MD5 = (string)sum.Result();
-
- if (Record->MD5Hash != MD5)
+ if (!Record->Hash.VerifyFile(prefix+file))
{
- _error->Warning("MD5 mismatch for: %s",file.c_str());
+ _error->Warning("Hash mismatch for: %s",file.c_str());
return false;
}
if(_config->FindB("Debug::aptcdrom",false))
{
cout << "File: " << prefix+file << endl;
- cout << "Expected MD5sum: " << Record->MD5Hash << endl;
- cout << "got: " << MD5 << endl << endl;
+ cout << "Expected Hash " << Record->Hash.toStr() << endl;
}
return true;
diff --git a/apt-pkg/indexfile.cc b/apt-pkg/indexfile.cc
index ca11fc111..b38596143 100644
--- a/apt-pkg/indexfile.cc
+++ b/apt-pkg/indexfile.cc
@@ -13,6 +13,7 @@
#include <apt-pkg/error.h>
#include <clocale>
+#include <cstring>
/*}}}*/
// Global list of Item supported
@@ -112,8 +113,8 @@ string pkgIndexFile::LanguageCode()
// we have a mapping of the language codes that contains all the language
// codes that need the country code as well
// (like pt_BR, pt_PT, sv_SE, zh_*, en_*)
- char *need_full_langcode[] = { "pt","sv","zh","en", NULL };
- for(char **s = need_full_langcode;*s != NULL; s++)
+ const char *need_full_langcode[] = { "pt","sv","zh","en", NULL };
+ for(const char **s = need_full_langcode;*s != NULL; s++)
if(lang.find(*s) == 0)
return lang.substr(0,5);
diff --git a/apt-pkg/indexrecords.cc b/apt-pkg/indexrecords.cc
index 396e1591f..502f454a8 100644
--- a/apt-pkg/indexrecords.cc
+++ b/apt-pkg/indexrecords.cc
@@ -50,32 +50,38 @@ bool indexRecords::Load(const string Filename)
const char *Start, *End;
Section.Get (Start, End, 0);
+
Suite = Section.FindS("Suite");
Dist = Section.FindS("Codename");
-// if (Dist.empty())
-// {
-// ErrorText = _(("No Codename entry in Release file " + Filename).c_str());
-// return false;
-// }
- if (!Section.Find("MD5Sum", Start, End))
+
+ int i;
+ for (i=0;HashString::SupportedHashes()[i] != NULL; i++)
{
- ErrorText = _(("No MD5Sum entry in Release file " + Filename).c_str());
- return false;
+ if (!Section.Find(HashString::SupportedHashes()[i], Start, End))
+ continue;
+
+ string Name;
+ string Hash;
+ size_t Size;
+ while (Start < End)
+ {
+ if (!parseSumData(Start, End, Name, Hash, Size))
+ return false;
+ indexRecords::checkSum *Sum = new indexRecords::checkSum;
+ Sum->MetaKeyFilename = Name;
+ Sum->Hash = HashString(HashString::SupportedHashes()[i],Hash);
+ Sum->Size = Size;
+ Entries[Name] = Sum;
+ }
+ break;
}
- string Name;
- string MD5Hash;
- size_t Size;
- while (Start < End)
+
+ if(HashString::SupportedHashes()[i] == NULL)
{
- if (!parseSumData(Start, End, Name, MD5Hash, Size))
- return false;
- indexRecords::checkSum *Sum = new indexRecords::checkSum;
- Sum->MetaKeyFilename = Name;
- Sum->MD5Hash = MD5Hash;
- Sum->Size = Size;
- Entries[Name] = Sum;
- }
-
+ ErrorText = _(("No Hash entry in Release file " + Filename).c_str());
+ return false;
+ }
+
string Strdate = Section.FindS("Date"); // FIXME: verify this somehow?
return true;
}
diff --git a/apt-pkg/indexrecords.h b/apt-pkg/indexrecords.h
index ac0df470c..468d2bd0f 100644
--- a/apt-pkg/indexrecords.h
+++ b/apt-pkg/indexrecords.h
@@ -8,6 +8,7 @@
#include <apt-pkg/pkgcache.h>
#include <apt-pkg/fileutl.h>
+#include <apt-pkg/hashes.h>
#include <map>
#include <vector>
@@ -45,7 +46,7 @@ class indexRecords
struct indexRecords::checkSum
{
string MetaKeyFilename;
- string MD5Hash;
+ HashString Hash;
size_t Size;
};
diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc
index 2f15486d9..676b66d38 100644
--- a/apt-pkg/init.cc
+++ b/apt-pkg/init.cc
@@ -24,8 +24,6 @@ const char *pkgVersion = VERSION;
const char *pkgLibVersion = Stringfy(APT_PKG_MAJOR) "."
Stringfy(APT_PKG_MINOR) "."
Stringfy(APT_PKG_RELEASE);
-const char *pkgCPU = COMMON_CPU;
-const char *pkgOS = COMMON_OS;
// pkgInitConfig - Initialize the configuration class /*{{{*/
// ---------------------------------------------------------------------
@@ -35,11 +33,7 @@ const char *pkgOS = COMMON_OS;
bool pkgInitConfig(Configuration &Cnf)
{
// General APT things
- if (strcmp(COMMON_OS,"linux") == 0 ||
- strcmp(COMMON_OS,"unknown") == 0)
- Cnf.Set("APT::Architecture",COMMON_CPU);
- else
- Cnf.Set("APT::Architecture",COMMON_OS "-" COMMON_CPU);
+ Cnf.Set("APT::Architecture", COMMON_ARCH);
Cnf.Set("APT::Build-Essential::", "build-essential");
Cnf.Set("APT::Install-Recommends", false);
Cnf.Set("APT::Install-Suggests", false);
@@ -74,6 +68,10 @@ bool pkgInitConfig(Configuration &Cnf)
Cnf.Set("Dir::Etc::parts","apt.conf.d");
Cnf.Set("Dir::Etc::preferences","preferences");
Cnf.Set("Dir::Bin::methods","/usr/lib/apt/methods");
+
+ // State
+ Cnf.Set("Dir::Log","var/log/apt");
+ Cnf.Set("Dir::Log::Terminal","term.log");
bool Res = true;
diff --git a/apt-pkg/init.h b/apt-pkg/init.h
index bc0e55036..23e951eff 100644
--- a/apt-pkg/init.h
+++ b/apt-pkg/init.h
@@ -18,13 +18,11 @@
// See the makefile
#define APT_PKG_MAJOR 4
-#define APT_PKG_MINOR 4
+#define APT_PKG_MINOR 5
#define APT_PKG_RELEASE 0
extern const char *pkgVersion;
extern const char *pkgLibVersion;
-extern const char *pkgOS;
-extern const char *pkgCPU;
bool pkgInitConfig(Configuration &Cnf);
bool pkgInitSystem(Configuration &Cnf,pkgSystem *&Sys);
diff --git a/apt-pkg/makefile b/apt-pkg/makefile
index df9954f67..b327dbf64 100644
--- a/apt-pkg/makefile
+++ b/apt-pkg/makefile
@@ -13,9 +13,9 @@ include ../buildlib/defaults.mak
# methods/makefile - FIXME
LIBRARY=apt-pkg
LIBEXT=$(GLIBC_VER)$(LIBSTDCPP_VER)
-MAJOR=4.4
+MAJOR=4.5
MINOR=0
-SLIBS=$(PTHREADLIB) $(INTLLIBS)
+SLIBS=$(PTHREADLIB) $(INTLLIBS) -lutil
APT_DOMAIN:=libapt-pkg$(MAJOR)
# Source code for the contributed non-core things
diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index 10e2858ed..d6172c6c4 100644
--- a/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@ -25,7 +25,7 @@
#include <apti18n.h>
#include <iostream>
- /*}}}*/
+#include <fcntl.h>
using namespace std;
@@ -624,6 +624,26 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall()
return Completed;
}
/*}}}*/
+// PM::DoInstallPostFork - Does install part that happens after the fork /*{{{*/
+// ---------------------------------------------------------------------
+pkgPackageManager::OrderResult
+pkgPackageManager::DoInstallPostFork(int statusFd)
+{
+ if(statusFd > 0)
+ // FIXME: use SetCloseExec here once it taught about throwing
+ // exceptions instead of doing _exit(100) on failure
+ fcntl(statusFd,F_SETFD,FD_CLOEXEC);
+ bool goResult = Go(statusFd);
+ if(goResult == false)
+ return Failed;
+
+ // if all was fine update the state file
+ if(Res == Completed) {
+ Cache.writeStateFile(NULL);
+ }
+ return Res;
+};
+
// PM::DoInstall - Does the installation /*{{{*/
// ---------------------------------------------------------------------
/* This uses the filenames in FileNames and the information in the
diff --git a/apt-pkg/packagemanager.h b/apt-pkg/packagemanager.h
index 53600fb61..53cd4c96f 100644
--- a/apt-pkg/packagemanager.h
+++ b/apt-pkg/packagemanager.h
@@ -90,18 +90,7 @@ class pkgPackageManager : protected pkgCache::Namespace
};
// stuff that needs to be done after the fork
- OrderResult DoInstallPostFork(int statusFd=-1) {
- bool goResult = Go(statusFd);
- if(goResult == false)
- return Failed;
-
- // if all was fine update the state file
- if(Res == Completed) {
- Cache.writeStateFile(NULL);
- }
- return Res;
- };
-
+ OrderResult DoInstallPostFork(int statusFd=-1);
bool FixMissing();
pkgPackageManager(pkgDepCache *Cache);
diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc
index 7e3b9d78c..133899a27 100644
--- a/apt-pkg/pkgcache.cc
+++ b/apt-pkg/pkgcache.cc
@@ -49,7 +49,7 @@ pkgCache::Header::Header()
/* Whenever the structures change the major version should be bumped,
whenever the generator changes the minor version should be bumped. */
- MajorVersion = 6;
+ MajorVersion = 7;
MinorVersion = 0;
Dirty = false;
@@ -274,7 +274,9 @@ pkgCache::PkgIterator::OkState pkgCache::PkgIterator::State() const
return NeedsUnpack;
if (Pkg->CurrentState == pkgCache::State::UnPacked ||
- Pkg->CurrentState == pkgCache::State::HalfConfigured)
+ Pkg->CurrentState == pkgCache::State::HalfConfigured ||
+ Pkg->CurrentState == pkgCache::State::TriggersPending ||
+ Pkg->CurrentState == pkgCache::State::TriggersAwaited)
return NeedsConfigure;
if (Pkg->CurrentState == pkgCache::State::HalfInstalled ||
diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h
index 83b7548a3..59d5003bb 100644
--- a/apt-pkg/pkgcache.h
+++ b/apt-pkg/pkgcache.h
@@ -81,7 +81,8 @@ class pkgCache
enum PkgSelectedState {Unknown=0,Install=1,Hold=2,DeInstall=3,Purge=4};
enum PkgInstState {Ok=0,ReInstReq=1,HoldInst=2,HoldReInstReq=3};
enum PkgCurrentState {NotInstalled=0,UnPacked=1,HalfConfigured=2,
- HalfInstalled=4,ConfigFiles=5,Installed=6};
+ HalfInstalled=4,ConfigFiles=5,Installed=6,
+ TriggersAwaited=7,TriggersPending=8};
};
struct Flag
diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc
index 4e186f466..d00cd4e64 100644
--- a/apt-pkg/pkgcachegen.cc
+++ b/apt-pkg/pkgcachegen.cc
@@ -781,7 +781,7 @@ static bool BuildCache(pkgCacheGenerator &Gen,
bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress,
MMap **OutMap,bool AllowMem)
{
- unsigned long MapSize = _config->FindI("APT::Cache-Limit",16*1024*1024);
+ unsigned long MapSize = _config->FindI("APT::Cache-Limit",24*1024*1024);
vector<pkgIndexFile *> Files;
for (vector<metaIndex *>::const_iterator i = List.begin();
@@ -928,7 +928,7 @@ bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress,
/* */
bool pkgMakeOnlyStatusCache(OpProgress &Progress,DynamicMMap **OutMap)
{
- unsigned long MapSize = _config->FindI("APT::Cache-Limit",12*1024*1024);
+ unsigned long MapSize = _config->FindI("APT::Cache-Limit",20*1024*1024);
vector<pkgIndexFile *> Files;
unsigned long EndOfSource = Files.size();
if (_system->AddStatusFiles(Files) == false)
diff --git a/apt-pkg/pkgrecords.h b/apt-pkg/pkgrecords.h
index 7b9f51a50..f3bf7b6a1 100644
--- a/apt-pkg/pkgrecords.h
+++ b/apt-pkg/pkgrecords.h
@@ -57,6 +57,7 @@ class pkgRecords::Parser
virtual string FileName() {return string();};
virtual string MD5Hash() {return string();};
virtual string SHA1Hash() {return string();};
+ virtual string SHA256Hash() {return string();};
virtual string SourcePkg() {return string();};
virtual string SourceVer() {return string();};
diff --git a/apt-pkg/pkgsystem.cc b/apt-pkg/pkgsystem.cc
index eee19e35c..6dd2d3ee4 100644
--- a/apt-pkg/pkgsystem.cc
+++ b/apt-pkg/pkgsystem.cc
@@ -13,6 +13,7 @@
#include <apt-pkg/pkgsystem.h>
#include <apt-pkg/policy.h>
#include <cassert>
+#include <cstring>
/*}}}*/
pkgSystem *_system = 0;
diff --git a/apt-pkg/tagfile.h b/apt-pkg/tagfile.h
index 05c6aa701..6536932dd 100644
--- a/apt-pkg/tagfile.h
+++ b/apt-pkg/tagfile.h
@@ -30,8 +30,8 @@ class pkgTagSection
const char *Stop;
// We have a limit of 256 tags per section.
- unsigned short Indexes[256];
- unsigned short AlphaIndexes[0x100];
+ unsigned int Indexes[256];
+ unsigned int AlphaIndexes[0x100];
unsigned int TagCount;
diff --git a/buildlib/archtable b/buildlib/archtable
deleted file mode 100644
index eacc9889f..000000000
--- a/buildlib/archtable
+++ /dev/null
@@ -1,33 +0,0 @@
-# This file contains a table of known architecture strings, with
-# things to map them to. `configure' will take the output of the
-# autoconf cannon macros and look in here. This only deals with architecture
-# (CPU) names.
-
-# The left side is a regex for awk
-
-i.86 i386
-pentium i386
-sparc sparc
-sparc64 sparc
-alpha.* alpha
-m68k m68k
-arm.*b armeb
-arm.* arm
-powerpc powerpc
-ppc powerpc
-powerpc64 ppc64
-mipsel mipsel
-mipseb mips
-mips mips
-sheb sheb
-shel sh
-sh sh
-sh3 sh3
-sh4 sh4
-m32r m32r
-hppa.* hppa
-ia64 ia64
-s390 s390
-s390x s390x
-x86_64 amd64
-# lipa has gnulp-linux-i.86 (see dpkg archtable and ostable)
diff --git a/buildlib/config.h.in b/buildlib/config.h.in
index 8a65a229a..eddb16246 100644
--- a/buildlib/config.h.in
+++ b/buildlib/config.h.in
@@ -32,11 +32,8 @@
/* If there is no socklen_t, define this for the netdb shim */
#undef NEED_SOCKLEN_T_DEFINE
-/* Define the cpu name string */
-#undef COMMON_CPU
-
-/* Define the on name string */
-#undef COMMON_OS
+/* Define the arch name string */
+#undef COMMON_ARCH
/* The version number string */
#undef VERSION
diff --git a/buildlib/environment.mak.in b/buildlib/environment.mak.in
index 2d28e1c67..4e47692f5 100644
--- a/buildlib/environment.mak.in
+++ b/buildlib/environment.mak.in
@@ -64,7 +64,7 @@ NEED_SOCKLEN_T_DEFINE = @NEED_SOCKLEN_T_DEFINE@
# Shared library things
HOST_OS = @host_os@
-ifneq ($(words $(filter linux-gnu gnu% %gnu,$(HOST_OS))),0)
+ifneq ($(words $(filter gnu% linux-gnu% kfreebsd-gnu% %-gnu,$(HOST_OS))),0)
SONAME_MAGIC=-Wl,-soname -Wl,
LFLAGS_SO=
else
diff --git a/buildlib/ostable b/buildlib/ostable
deleted file mode 100644
index ead7d771c..000000000
--- a/buildlib/ostable
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file contains a table of known vendor-os strings, with
-# things to map them to. `configure' will take the output of the
-# autoconf cannon macros and look in here. This only deals with
-# OS names. The right should be a common name like the arch table
-# generates
-# The final bit to build the Debian Architecture is done in init.cc
-# The left side is a regex for awk, and the first match is used.
-
-# These are used by Debian
-[^-]*-linux-.* linux
-[^-]*-kfreebsd.*-gnu kfreebsd
-[^-]*-knetbsd.*-gnu knetbsd
-[^-]*-gnu[^-]* hurd
-
-# These are samples.
-hp-hpux[^-]* hp-ux
-sun-solaris[^-]* solaris
-[^-]*-openbsd[^-]* openbsd
-
-# Catch all
-.* unknown
diff --git a/buildlib/systemtable b/buildlib/systemtable
deleted file mode 100644
index 64c176b50..000000000
--- a/buildlib/systemtable
+++ /dev/null
@@ -1,11 +0,0 @@
-# This file contains a table of known canonical system strings, with
-# things to map them to. `configure' will take the output of the
-# autoconf cannon macros and look in here. It will check for
-# the full canonical system name (required for e.g. lpia) and if that
-# fails it will configure.in will fallback to just checking for the CPU
-# in buildlib/archtable
-
-# The left side is a regex for awk against the canonical system name
-
-# config.guess reports lpia as i386-unknown-linux-gnulp
-i.86-.*-linux-gnulp lpia
diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc
index cc4c1559e..c0655da40 100644
--- a/cmdline/apt-cache.cc
+++ b/cmdline/apt-cache.cc
@@ -1711,8 +1711,8 @@ bool GenCaches(CommandLine &Cmd)
/* */
bool ShowHelp(CommandLine &Cmd)
{
- ioprintf(cout,_("%s %s for %s %s compiled on %s %s\n"),PACKAGE,VERSION,
- COMMON_OS,COMMON_CPU,__DATE__,__TIME__);
+ ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,VERSION,
+ COMMON_ARCH,__DATE__,__TIME__);
if (_config->FindB("version") == true)
return true;
diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc
index 7434a7225..379a433ea 100644
--- a/cmdline/apt-cdrom.cc
+++ b/cmdline/apt-cdrom.cc
@@ -135,8 +135,8 @@ bool DoIdent(CommandLine &)
/* */
int ShowHelp()
{
- ioprintf(cout,_("%s %s for %s %s compiled on %s %s\n"),PACKAGE,VERSION,
- COMMON_OS,COMMON_CPU,__DATE__,__TIME__);
+ ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,VERSION,
+ COMMON_ARCH,__DATE__,__TIME__);
if (_config->FindB("version") == true)
return 0;
diff --git a/cmdline/apt-config.cc b/cmdline/apt-config.cc
index 34365dc2e..63fa0867c 100644
--- a/cmdline/apt-config.cc
+++ b/cmdline/apt-config.cc
@@ -67,8 +67,8 @@ bool DoDump(CommandLine &CmdL)
/* */
int ShowHelp()
{
- ioprintf(cout,_("%s %s for %s %s compiled on %s %s\n"),PACKAGE,VERSION,
- COMMON_OS,COMMON_CPU,__DATE__,__TIME__);
+ ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,VERSION,
+ COMMON_ARCH,__DATE__,__TIME__);
if (_config->FindB("version") == true)
return 0;
diff --git a/cmdline/apt-extracttemplates.cc b/cmdline/apt-extracttemplates.cc
index c87b436ba..de22386b9 100644
--- a/cmdline/apt-extracttemplates.cc
+++ b/cmdline/apt-extracttemplates.cc
@@ -222,8 +222,8 @@ bool DebFile::ParseInfo()
/* */
int ShowHelp(void)
{
- ioprintf(cout,_("%s %s for %s %s compiled on %s %s\n"),PACKAGE,VERSION,
- COMMON_OS,COMMON_CPU,__DATE__,__TIME__);
+ ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,VERSION,
+ COMMON_ARCH,__DATE__,__TIME__);
if (_config->FindB("version") == true)
return 0;
@@ -249,7 +249,7 @@ string WriteFile(const char *package, const char *prefix, const char *data)
{
char fn[512];
static int i;
- char *tempdir = NULL;
+ const char *tempdir = NULL;
tempdir = getenv("TMPDIR");
if (tempdir == NULL)
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 95600ff6d..efb618cb0 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -918,7 +918,7 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true,
pkgAcquire::UriIterator I = Fetcher.UriBegin();
for (; I != Fetcher.UriEnd(); I++)
cout << '\'' << I->URI << "' " << flNotDir(I->Owner->DestFile) << ' ' <<
- I->Owner->FileSize << ' ' << I->Owner->MD5Sum() << endl;
+ I->Owner->FileSize << ' ' << I->Owner->HashSum() << endl;
return true;
}
@@ -1359,7 +1359,7 @@ bool DoUpdate(CommandLine &CmdL)
pkgAcquire::UriIterator I = Fetcher.UriBegin();
for (; I != Fetcher.UriEnd(); I++)
cout << '\'' << I->URI << "' " << flNotDir(I->Owner->DestFile) << ' ' <<
- I->Owner->FileSize << ' ' << I->Owner->MD5Sum() << endl;
+ I->Owner->FileSize << ' ' << I->Owner->HashSum() << endl;
return true;
}
@@ -1507,7 +1507,8 @@ bool DoUpgrade(CommandLine &CmdL)
bool TryInstallTask(pkgDepCache &Cache, pkgProblemResolver &Fix,
bool BrokenFix,
unsigned int& ExpectedInst,
- const char *taskname)
+ const char *taskname,
+ bool Remove)
{
const char *start, *end;
pkgCache::PkgIterator Pkg;
@@ -1536,7 +1537,7 @@ bool TryInstallTask(pkgDepCache &Cache, pkgProblemResolver &Fix,
buf[end-start] = 0x0;
if (regexec(&Pattern,buf,0,0,0) != 0)
continue;
- res &= TryToInstall(Pkg,Cache,Fix,false,true,ExpectedInst);
+ res &= TryToInstall(Pkg,Cache,Fix,Remove,true,ExpectedInst);
found = true;
}
@@ -1604,7 +1605,7 @@ bool DoInstall(CommandLine &CmdL)
// tasks must always be confirmed
ExpectedInst += 1000;
// see if we can install it
- TryInstallTask(Cache, Fix, BrokenFix, ExpectedInst, S);
+ TryInstallTask(Cache, Fix, BrokenFix, ExpectedInst, S, Remove);
continue;
}
@@ -1707,7 +1708,8 @@ bool DoInstall(CommandLine &CmdL)
// where foo is marked automatic
if(!Remove &&
Cache[Pkg].Install() == false &&
- (Cache[Pkg].Flags & pkgCache::Flag::Auto))
+ (Cache[Pkg].Flags & pkgCache::Flag::Auto) &&
+ _config->FindB("APT::Get::ReInstall",false) == false)
{
ioprintf(c1out,_("%s set to manual installed.\n"),
Pkg.Name());
@@ -2210,7 +2212,7 @@ bool DoSource(CommandLine &CmdL)
pkgAcquire::UriIterator I = Fetcher.UriBegin();
for (; I != Fetcher.UriEnd(); I++)
cout << '\'' << I->URI << "' " << flNotDir(I->Owner->DestFile) << ' ' <<
- I->Owner->FileSize << ' ' << I->Owner->MD5Sum() << endl;
+ I->Owner->FileSize << ' ' << I->Owner->HashSum() << endl;
return true;
}
@@ -2470,6 +2472,7 @@ bool DoBuildDep(CommandLine &CmdL)
break;
}
if (CV.end() == true)
+ {
if (hasAlternatives)
{
continue;
@@ -2482,6 +2485,7 @@ bool DoBuildDep(CommandLine &CmdL)
Last->BuildDepType((*D).Type),Src.c_str(),
(*D).Package.c_str());
}
+ }
}
else
{
@@ -2581,8 +2585,8 @@ bool DoMoo(CommandLine &CmdL)
/* */
bool ShowHelp(CommandLine &CmdL)
{
- ioprintf(cout,_("%s %s for %s %s compiled on %s %s\n"),PACKAGE,VERSION,
- COMMON_OS,COMMON_CPU,__DATE__,__TIME__);
+ ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,VERSION,
+ COMMON_ARCH,__DATE__,__TIME__);
if (_config->FindB("version") == true)
{
@@ -2640,6 +2644,7 @@ bool ShowHelp(CommandLine &CmdL)
" upgrade - Perform an upgrade\n"
" install - Install new packages (pkg is libc6 not libc6.deb)\n"
" remove - Remove packages\n"
+ " autoremove - Remove all automatic unused packages\n"
" purge - Remove and purge packages\n"
" source - Download source archives\n"
" build-dep - Configure build-dependencies for source packages\n"
@@ -2750,7 +2755,9 @@ int main(int argc,const char *argv[])
{"upgrade",&DoUpgrade},
{"install",&DoInstall},
{"remove",&DoInstall},
+ {"purge",&DoInstall},
{"autoremove",&DoInstall},
+ {"purge",&DoInstall},
{"dist-upgrade",&DoDistUpgrade},
{"dselect-upgrade",&DoDSelectUpgrade},
{"build-dep",&DoBuildDep},
diff --git a/cmdline/apt-key b/cmdline/apt-key
index 90ecae2cf..3bd1a92d9 100755
--- a/cmdline/apt-key
+++ b/cmdline/apt-key
@@ -39,6 +39,8 @@ usage() {
echo
echo " apt-key add <file> - add the key contained in <file> ('-' for stdin)"
echo " apt-key del <keyid> - remove the key <keyid>"
+ echo " apt-key export <keyid> - output the key <keyid>"
+ echo " apt-key exportall - output all trusted keys"
echo " apt-key update - update keys using the keyring package"
echo " apt-key list - list keys"
echo
@@ -75,6 +77,12 @@ case "$command" in
finger*)
$GPG --batch --fingerprint
;;
+ export)
+ $GPG --armor --export "$1"
+ ;;
+ exportall)
+ $GPG --armor --export
+ ;;
adv*)
echo "Executing: $GPG $*"
$GPG $*
diff --git a/cmdline/apt-mark b/cmdline/apt-mark
index fdc3e1856..f6e749eb5 100755
--- a/cmdline/apt-mark
+++ b/cmdline/apt-mark
@@ -40,7 +40,7 @@ if __name__ == "__main__":
if not options.filename:
STATE_FILE = apt_pkg.Config.FindDir("Dir::State") + "extended_states"
else:
- STATE_FILE=options.state_file
+ STATE_FILE=options.filename
# open the statefile
if os.path.exists(STATE_FILE):
@@ -62,4 +62,4 @@ if __name__ == "__main__":
# all done, rename the tmpfile
os.chmod(outfile.name, 0644)
os.rename(outfile.name, STATE_FILE)
- os.chmod(outfile.name, 0644)
+ os.chmod(STATE_FILE, 0644)
diff --git a/cmdline/apt-sortpkgs.cc b/cmdline/apt-sortpkgs.cc
index 8909c3826..7b2a74aed 100644
--- a/cmdline/apt-sortpkgs.cc
+++ b/cmdline/apt-sortpkgs.cc
@@ -141,8 +141,8 @@ bool DoIt(string InFile)
/* */
int ShowHelp()
{
- ioprintf(cout,_("%s %s for %s %s compiled on %s %s\n"),PACKAGE,VERSION,
- COMMON_OS,COMMON_CPU,__DATE__,__TIME__);
+ ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,VERSION,
+ COMMON_ARCH,__DATE__,__TIME__);
if (_config->FindB("version") == true)
return 0;
diff --git a/cmdline/makefile b/cmdline/makefile
index 49035be44..5820c2e0f 100644
--- a/cmdline/makefile
+++ b/cmdline/makefile
@@ -14,7 +14,7 @@ include $(PROGRAM_H)
# The apt-get program
PROGRAM=apt-get
-SLIBS = -lapt-pkg
+SLIBS = -lapt-pkg -lutil
LIB_MAKES = apt-pkg/makefile
SOURCE = apt-get.cc acqprogress.cc
include $(PROGRAM_H)
diff --git a/configure.in b/configure.in
index 9bb1a8baf..de2d698b6 100644
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib)
AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
dnl -- SET THIS TO THE RELEASE VERSION --
-AC_DEFINE_UNQUOTED(VERSION,"0.7.4")
+AC_DEFINE_UNQUOTED(VERSION,"0.7.7")
PACKAGE="apt"
AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
AC_SUBST(PACKAGE)
@@ -80,23 +80,13 @@ dnl Converts the ARCH to be something singular for this general CPU family
dnl This is often the dpkg architecture string.
dnl First check against the full canonical canoncial-system-type in $target
dnl and if that fails, just look for the cpu
-AC_MSG_CHECKING(system architecture)
-archset="`awk \" ! /^#|^\\\$/ { if(match(\\\"$target\\\",\\\"^\\\"\\\$1\\\"\\\$\\\")) {print \\\$2; exit}}\" $srcdir/buildlib/systemtable`"
+AC_MSG_CHECKING(debian architecture)
+archset="`dpkg-architecture -qDEB_HOST_ARCH`"
if test "x$archset" = "x"; then
- archset="`awk \" ! /^#|^\\\$/ { if(match(\\\"$target_cpu\\\",\\\"^\\\"\\\$1\\\"\\\$\\\")) {print \\\$2; exit}}\" $srcdir/buildlib/archtable`"
- if test "x$archset" = "x"; then
- AC_MSG_ERROR(failed: use --host= or check buildlib/archtable)
- fi
+ AC_MSG_ERROR([failed: use --host= or output from dpkg-architecture])
fi
AC_MSG_RESULT($archset)
-AC_DEFINE_UNQUOTED(COMMON_CPU,"$archset")
-
-dnl Get a common name for the host OS - this is primarily only for HURD and is
-dnl non fatal if it fails
-AC_MSG_CHECKING(system OS)
-osset="`awk \" ! /^#|^\\\$/ {if (match(\\\"$target_vendor-$target_os\\\",\\\$1)) {print \\\$2; exit}}\" $srcdir/buildlib/ostable`"
-AC_MSG_RESULT($osset)
-AC_DEFINE_UNQUOTED(COMMON_OS,"$osset")
+AC_DEFINE_UNQUOTED(COMMON_ARCH,"$archset")
dnl We use C99 types if at all possible
AC_CACHE_CHECK([for C99 integer types],c9x_ints,[
@@ -206,7 +196,7 @@ ah_GCC3DEP
dnl It used to be that the user could select translations and that could get
dnl passed to the makefiles, but now that can only work if you use special
dnl gettext approved makefiles, so this feature is unsupported by this.
-ALL_LINGUAS="bg bs ca cs cy da de dz el en_GB es eu fi fr gl hu it ja ko ku nb nl nn pl pt_BR pt ro ru sk sl sv tl uk vi zn_CN zh_TW"
+ALL_LINGUAS="bg bs ca cs cy da de dz el en_GB es eu fi fr gl hu it ja ko ku nb nl nn pl pt_BR pt ro ru sk sl sv th tl uk vi zn_CN zh_TW"
AM_GNU_GETTEXT(external)
if test x"$USE_NLS" = "xyes"; then
AC_DEFINE(USE_NLS)
diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily
index 778e3cefe..34d6b164f 100644
--- a/debian/apt.cron.daily
+++ b/debian/apt.cron.daily
@@ -186,17 +186,17 @@ if check_stamp $DOWNLOAD_UPGRADEABLE_STAMP $DownloadUpgradeableInterval; then
update_stamp $DOWNLOAD_UPGRADEABLE_STAMP
fi
-AUTOCLEAN_STAMP=/var/lib/apt/periodic/autoclean-stamp
-if check_stamp $AUTOCLEAN_STAMP $AutocleanInterval; then
- apt-get -qq autoclean
- update_stamp $AUTOCLEAN_STAMP
-fi
-
UPGRADE_STAMP=/var/lib/apt/periodic/upgrade-stamp
if check_stamp $UPGRADE_STAMP $UnattendedUpgradeInterval; then
unattended-upgrade
update_stamp $UPGRADE_STAMP
fi
+AUTOCLEAN_STAMP=/var/lib/apt/periodic/autoclean-stamp
+if check_stamp $AUTOCLEAN_STAMP $AutocleanInterval; then
+ apt-get -qq autoclean
+ update_stamp $AUTOCLEAN_STAMP
+fi
+
# check cache size
check_size_constraints
diff --git a/debian/apt.dirs b/debian/apt.dirs
index 1543e8bb1..8ce9b175a 100644
--- a/debian/apt.dirs
+++ b/debian/apt.dirs
@@ -4,7 +4,9 @@ usr/lib/dpkg/methods/apt
etc/apt
etc/apt/apt.conf.d
etc/apt/sources.list.d
+etc/logrotate.d
var/cache/apt/archives/partial
var/lib/apt/lists/partial
var/lib/apt/periodic
+var/log/apt
usr/share/bug/apt
diff --git a/debian/apt.logrotate b/debian/apt.logrotate
new file mode 100644
index 000000000..3e924d383
--- /dev/null
+++ b/debian/apt.logrotate
@@ -0,0 +1,8 @@
+/var/log/apt/term.log {
+ rotate 6
+ monthly
+ compress
+ missingok
+ notifempty
+}
+
diff --git a/debian/changelog b/debian/changelog
index f618b84df..a3f0ec238 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,132 @@
-apt (0.7.4) UNRELEASED; urgency=low
+apt (0.7.7) UNRELEASED; urgency=low
- [Michael Vogt]
+ [ Michael Vogt ]
+ * apt-inst/contrib/extracttar.cc:
+ - fix fd leak for zero size files (thanks to Bill Broadley for
+ reporting this bug)
+ * apt-pkg/acquire-item.cc:
+ - remove zero size files on I-M-S hit
+ * methods/https.cc:
+ - only send LastModified if we actually have a file
+ - send range request with if-range
+ - delete failed downloads
+ - delete zero size I-M-S hits
+ * apt-pkg/deb/dpkgpm.{cc,h}:
+ - merged dpkg-log branch, this lets you specify a
+ Dir::Log::Terminal file to log dpkg output to
+ (ABI break)
+ - fix parse error when dpkg sends unexpected data
+ * merged apt--sha256 branch to fully support the new
+ sha256 checksums in the Packages and Release files
+ (ABI break)
+ * apt-pkg/pkgcachegen.cc:
+ - increase default mmap size
+ * tests/local-repo:
+ - added local repository testcase
+ * apt-pkg/acquire.cc:
+ - increase MaxPipeDepth for the internal worker<->method
+ communication to 1000 for the debtorrent backend
+ * make apt build with g++ 4.3
+ * fix missing SetExecClose() call when the status-fd is used
+ * debian/apt.cron.daily:
+ - move unattended-upgrade before apt-get autoclean
+ * fix "purge" commandline argument, closes: #133421
+ (thanks to Julien Danjou for the patch)
+ * cmdline/apt-get.cc:
+ - do not change the auto-installed information if a package
+ is reinstalled
+ * apt-pkg/acquire-item.cc:
+ - fix crash in diff acquire code
+ * cmdline/apt-mark:
+ - Fix chmoding after have renamed the extended-states file (LP: #140019)
+ (thanks to Laurent Bigonville)
+
+ [ Program translations ]
+ - French updated
+ - Basque updated. Closes: #436425
+ - Fix the zh_CN translator's name in debian/changelog for 0.7.2
+ Closes: #423272
+ - Vietnamese updated. Closes: #440611
+ - Danish updated. Closes: #441102
+ - Thai added. Closes: #442833
+
+ [ Otavio Salvador ]
+ * Add hash support to copy method. Thanks Anders Kaseorg by the patch
+ (closes: #436055)
+ * Reset curl options and timestamp between downloaded files. Thanks to
+ Ryan Murray <rmurray@debian.org> for the patch (closes: #437150)
+ * Add support to apt-key to export keys to stdout. Thanks to "Dwayne
+ C. Litzenberger" <dlitz@dlitz.net> for the patch (closes: #441942)
+ * Fix compilation warnings:
+ - apt-pkg/indexfile.cc: conversion from string constant to 'char*';
+ - apt-pkg/acquire-item.cc: likewise;
+ - apt-pkg/cdrom.cc: '%lu' expects 'long unsigned int', but argument
+ has type 'size_t';
+ - apt-pkg/deb/dpkgpm.cc: initialization order and conversion from
+ string constant to 'char*';
+ - methods/gpgv.cc: conversion from string constant to 'char*';
+ - methods/ftp.cc: likewise;
+ - cmdline/apt-extracttemplates.cc: likewise;
+ - apt-pkg/deb/debmetaindex.cc: comparison with string literal results
+ in unspecified behaviour;
+ * cmdline/apt-get.cc: adds 'autoremove' as a valid comment to usage
+ statement of apt-get (closes: #445468).
+ * cmdline/apt-get.cc: really applies Julien Danjou <acid@debian.org>
+ patch to add 'purge' command line argument (closes: #133421).
+
+ [ Ian Jackson ]
+ * dpkg-triggers: Deal properly with new package states.
+
+ [ Colin Watson ]
+ * apt-pkg/contrib/mmap.cc:
+ - don't fail if msync() returns > 0
+
+ -- Otavio Salvador <otavio@debian.org> Sat, 06 Oct 2007 18:23:42 -0300
+
+apt (0.7.6) unstable; urgency=low
+
+ * Applied patch from Aurelien Jarno <aurel32@debian.org> to fix wrong
+ directory downloading on non-linux architectures (closes: #435597)
+
+ -- Otavio Salvador <otavio@debian.org> Wed, 01 Aug 2007 19:49:51 -0300
+
+apt (0.7.6) unstable; urgency=low
+
+ * Applied patch from Aurelien Jarno <aurel32@debian.org> to fix wrong
+ directory downloading on non-linux architectures (closes: #435597)
+
+ -- Otavio Salvador <otavio@debian.org> Wed, 01 Aug 2007 19:49:51 -0300
+
+apt (0.7.5) unstable; urgency=low
+
+ [ Otavio Salvador ]
+ * Applied patch from Guillem Jover <guillem@debian.org> to use
+ dpkg-architecture to get the host architecture (closes: #407187)
+ * Applied patch from Guillem Jover <guillem@debian.org> to add
+ support to add lzma support (closes: #408201)
+
+ [ Michael Vogt ]
+ * apt-pkg/depcache.cc:
+ - support a list of sections for:
+ APT::Install-Recommends-Sections
+ APT::Never-MarkAuto-Sections
+ * methods/makefile:
+ - install lzma symlink method (for full lzma support)
+ * debian/control:
+ - suggest "lzma"
+
+ -- Otavio Salvador <otavio@ossystems.com.br> Wed, 25 Jul 2007 20:16:46 -0300
+
+apt (0.7.4) unstable; urgency=low
+
+ [ Michael Vogt ]
* cmdline/apt-get.cc:
- fix in the task-install code regexp (thanks to Adam Conrad and
Colin Watson)
+ - support task removal too: apt-get remove taskname^
+ (thanks to Matt Zimmerman reporting this problem)
- [Otavio Salvador]
+ [ Otavio Salvador ]
* Fix a typo on 0.7.3 changelog entry about g++ (7.3 to 4.3)
* Fix compilation warnings:
- apt-pkg/contrib/configuration.cc: wrong argument type;
@@ -23,7 +144,15 @@ apt (0.7.4) UNRELEASED; urgency=low
configure-index example file. Thanks to Peter Eisentraut
<peter_e@gmx.net> by the patch (closes: #432223)
- -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 11 Jul 2007 23:20:15 +0100
+ [ Christian Perrier ]
+ * Basque translation update. Closes: ##423766
+ * Unfuzzy formerly complete translations
+ * French translation update
+ * Re-generate PO(T) files
+ * Spanish translation update
+ * Swedish translation update
+
+ -- Otavio Salvador <otavio@debian.org> Tue, 24 Jul 2007 09:55:50 -0300
apt (0.7.3) unstable; urgency=low
@@ -37,9 +166,9 @@ apt (0.7.3) unstable; urgency=low
- fix InstallTask code when a pkgRecord ends
with a single '\n' (thanks to Soren Hansen for reporting)
* merged from Christian Perrier:
- * vi.po: completed to 532t, again. Closes: #429899
- * gl.po: completed to 532t. Closes: #429506
- * vi.po: completed to 532t. Closes: #428672
+ * vi.po: completed to 532t, again. Closes: #429899
+ * gl.po: completed to 532t. Closes: #429506
+ * vi.po: completed to 532t. Closes: #428672
* Update all PO and the POT. Gives 514t14f4u for formerly
complete translations
* fr.po: completed to 532t
@@ -62,7 +191,7 @@ apt (0.7.2) unstable; urgency=low
into the debian/sid branch
* merged from Christian Perrier:
* mr.po: New Marathi translation Closes: #416806
- * zh_CN.po: Updated by Eric Pareja Closes: #416822
+ * zh_CN.po: Updated by Kov Chai Closes: #416822
* tl.po: Updated by Eric Pareja Closes: #416638
* gl.po: Updated by Jacobo Tarrio
Closes: #412828
@@ -354,7 +483,7 @@ apt (0.6.45) unstable; urgency=low
* apt-pkg/tagfile.cc:
- support not-mmapable files again
- -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 25 Jul 2006 11:55:22 +0200
+ -- Michael Vogt <mvo@debian.org> Thu, 27 Jul 2006 00:52:05 +0200
apt (0.6.44.2exp1) experimental; urgency=low
@@ -2562,4 +2691,3 @@ apt (0.0.1) unstable; urgency=low
* Initial Release.
-- Scott K. Ellis <scott@debian.org> Tue, 31 Mar 1998 12:49:28 -0500
-
diff --git a/debian/control b/debian/control
index 7939e1bca..742e8ca5c 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: apt
Section: admin
Priority: important
Maintainer: APT Development Team <deity@lists.debian.org>
-Uploaders: Jason Gunthorpe <jgg@debian.org>, Adam Heath <doogie@debian.org>, Matt Zimmerman <mdz@debian.org>, Michael Vogt <mvo@debian.org>
+Uploaders: Jason Gunthorpe <jgg@debian.org>, Adam Heath <doogie@debian.org>, Matt Zimmerman <mdz@debian.org>, Michael Vogt <mvo@debian.org>, Otavio Salvador <otavio@debian.org>
Standards-Version: 3.7.2.2
Build-Depends: debhelper (>= 5.0), libdb4.4-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5)
Build-Depends-Indep: debiandoc-sgml, docbook-utils (>= 0.6.12-1)
@@ -14,7 +14,7 @@ Depends: ${shlibs:Depends}, debian-archive-keyring
Priority: important
Replaces: libapt-pkg-doc (<< 0.3.7), libapt-pkg-dev (<< 0.3.7)
Provides: ${libapt-pkg:provides}
-Suggests: aptitude | synaptic | gnome-apt | wajig, dpkg-dev, apt-doc, bzip2
+Suggests: aptitude | synaptic | gnome-apt | wajig, dpkg-dev, apt-doc, bzip2, lzma
Section: admin
Description: Advanced front-end for dpkg
This is Debian's next generation front-end for the dpkg package manager.
diff --git a/debian/rules b/debian/rules
index 473821f16..b3222f3b4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -209,6 +209,7 @@ apt: build debian/shlibs.local
cp -r $(BLD)/locale debian/$@/usr/share/
cp debian/bugscript debian/$@/usr/share/bug/apt/script
+ cp debian/apt.logrotate debian/$@/etc/logrotate.d/apt
cp share/debian-archive.gpg debian/$@/usr/share/$@
cp debian/apt.conf.autoremove debian/$@/etc/apt/apt.conf.d/01autoremove
diff --git a/doc/apt-key.8.xml b/doc/apt-key.8.xml
index eac61307d..981fa208c 100644
--- a/doc/apt-key.8.xml
+++ b/doc/apt-key.8.xml
@@ -63,6 +63,28 @@
</listitem>
</varlistentry>
+ <varlistentry><term>export <replaceable>keyid</replaceable></term>
+ <listitem>
+ <para>
+
+ Output the key <replaceable>keyid</replaceable> to standard output.
+
+ </para>
+
+ </listitem>
+ </varlistentry>
+
+ <varlistentry><term>exportall</term>
+ <listitem>
+ <para>
+
+ Output all trusted keys to standard output.
+
+ </para>
+
+ </listitem>
+ </varlistentry>
+
<varlistentry><term>list</term>
<listitem>
<para>
diff --git a/doc/cache.sgml b/doc/cache.sgml
index e257dcd81..aea5a45c3 100644
--- a/doc/cache.sgml
+++ b/doc/cache.sgml
@@ -721,6 +721,8 @@ or'd with the current package.
#define pkgSTATE_HalfInstalled 4
#define pkgSTATE_ConfigFiles 5
#define pkgSTATE_Installed 6
+#define pkgSTATE_TriggersAwaited 7
+#define pkgSTATE_TriggersPending 8
</example>
</sect1>
diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index bf086e9c1..ba3ed3892 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -101,7 +101,7 @@ APT
Install-Suggests "false";
// consider dependencies of packages in this section manual
- Never-MarkAuto-Section "metapackages";
+ Never-MarkAuto-Sections {"metapackages"; "universe/metapackages"; };
// Write progress messages on this fd (for stuff like base-config)
Status-Fd "-1";
@@ -227,6 +227,11 @@ Dir "/"
apt-get "/usr/bin/apt-get";
apt-cache "/usr/bin/apt-cache";
};
+
+ // Location of the logfile
+ Log "var/log/apt" {
+ Terminal "term.log";
+ };
};
// Things that effect the APT dselect method
diff --git a/ftparchive/apt-ftparchive.cc b/ftparchive/apt-ftparchive.cc
index 290326ec3..3b1e80631 100644
--- a/ftparchive/apt-ftparchive.cc
+++ b/ftparchive/apt-ftparchive.cc
@@ -544,8 +544,8 @@ void LoadBinDir(vector<PackageMap> &PkgList,Configuration &Setup)
/* */
bool ShowHelp(CommandLine &CmdL)
{
- ioprintf(cout,_("%s %s for %s %s compiled on %s %s\n"),PACKAGE,VERSION,
- COMMON_OS,COMMON_CPU,__DATE__,__TIME__);
+ ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,VERSION,
+ COMMON_ARCH,__DATE__,__TIME__);
if (_config->FindB("version") == true)
return true;
diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc
index 59107e02b..9d248ab86 100644
--- a/ftparchive/writer.cc
+++ b/ftparchive/writer.cc
@@ -28,6 +28,7 @@
#include <ftw.h>
#include <fnmatch.h>
#include <iostream>
+#include <memory>
#include "cachedb.h"
#include "apt-ftparchive.h"
diff --git a/methods/copy.cc b/methods/copy.cc
index d737e3c33..72896b4c0 100644
--- a/methods/copy.cc
+++ b/methods/copy.cc
@@ -12,6 +12,7 @@
#include <apt-pkg/fileutl.h>
#include <apt-pkg/acquire-method.h>
#include <apt-pkg/error.h>
+#include <apt-pkg/hashes.h>
#include <sys/stat.h>
#include <utime.h>
@@ -79,6 +80,10 @@ bool CopyMethod::Fetch(FetchItem *Itm)
return _error->Errno("utime",_("Failed to set modification time"));
}
+ Hashes Hash;
+ FileFd Fd(Res.Filename, FileFd::ReadOnly);
+ Hash.AddFD(Fd.Fd(), Fd.Size());
+ Res.TakeHashes(Hash);
URIDone(Res);
return true;
}
diff --git a/methods/ftp.cc b/methods/ftp.cc
index 0c2aa00a7..554a24cf5 100644
--- a/methods/ftp.cc
+++ b/methods/ftp.cc
@@ -1101,7 +1101,7 @@ int main(int argc,const char *argv[])
char S[300];
snprintf(S,sizeof(S),"http_proxy=%s",getenv("ftp_proxy"));
putenv(S);
- putenv("no_proxy=");
+ putenv((char *)"no_proxy=");
// Run the http method
string Path = flNotFile(argv[0]) + "http";
diff --git a/methods/gpgv.cc b/methods/gpgv.cc
index 227e08d63..2b1fa5169 100644
--- a/methods/gpgv.cc
+++ b/methods/gpgv.cc
@@ -121,9 +121,9 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
// Redirect the pipe to the status fd (3)
dup2(fd[1], 3);
- putenv("LANG=");
- putenv("LC_ALL=");
- putenv("LC_MESSAGES=");
+ putenv((char *)"LANG=");
+ putenv((char *)"LC_ALL=");
+ putenv((char *)"LC_MESSAGES=");
execvp(gpgvpath.c_str(), (char **)Args);
exit(111);
diff --git a/methods/https.cc b/methods/https.cc
index d48ac97fb..b2bbbddb1 100644
--- a/methods/https.cc
+++ b/methods/https.cc
@@ -107,6 +107,7 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
struct stat SBuf;
struct curl_slist *headers=NULL;
char curl_errorstr[CURL_ERROR_SIZE];
+ long curl_responsecode;
// TODO:
// - http::Timeout
@@ -114,6 +115,7 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
// - error checking/reporting
// - more debug options? (CURLOPT_DEBUGFUNCTION?)
+ curl_easy_reset(curl);
SetupProxy();
// callbacks
@@ -124,6 +126,7 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
curl_easy_setopt(curl, CURLOPT_PROGRESSDATA, this);
curl_easy_setopt(curl, CURLOPT_NOPROGRESS, false);
curl_easy_setopt(curl, CURLOPT_FAILONERROR, true);
+ curl_easy_setopt(curl, CURLOPT_FILETIME, true);
// FIXME: https: offer various options of verification
bool peer_verify = _config->FindB("Acquire::https::Verify-Peer", false);
@@ -158,10 +161,6 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
}
curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers);
- // set time values
- curl_easy_setopt(curl, CURLOPT_TIMECONDITION, CURL_TIMECOND_IFMODSINCE);
- curl_easy_setopt(curl, CURLOPT_TIMEVALUE, Itm->LastModified);
-
// speed limit
int dlLimit = _config->FindI("Acquire::http::Dl-Limit",0)*1024;
if (dlLimit > 0)
@@ -177,44 +176,71 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
// error handling
curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, curl_errorstr);
- // In this case we send an if-range query with a range header
- if (stat(Itm->DestFile.c_str(),&SBuf) >= 0 && SBuf.st_size > 0)
- curl_easy_setopt(curl, CURLOPT_RESUME_FROM, (long)SBuf.st_size);
+ // if we have the file send an if-range query with a range header
+ if (stat(Itm->DestFile.c_str(),&SBuf) >= 0 && SBuf.st_size > 0)
+ {
+ char Buf[1000];
+ sprintf(Buf,"Range: bytes=%li-\r\nIf-Range: %s\r\n",
+ (long)SBuf.st_size - 1,
+ TimeRFC1123(SBuf.st_mtime).c_str());
+ headers = curl_slist_append(headers, Buf);
+ }
+ else if(Itm->LastModified > 0)
+ {
+ curl_easy_setopt(curl, CURLOPT_TIMECONDITION, CURL_TIMECOND_IFMODSINCE);
+ curl_easy_setopt(curl, CURLOPT_TIMEVALUE, Itm->LastModified);
+ }
// go for it - if the file exists, append on it
File = new FileFd(Itm->DestFile, FileFd::WriteAny);
- File->Seek(File->Size());
+ if (File->Size() > 0)
+ File->Seek(File->Size() - 1);
// keep apt updated
Res.Filename = Itm->DestFile;
// get it!
CURLcode success = curl_easy_perform(curl);
+ curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &curl_responsecode);
+ long curl_servdate;
+ curl_easy_getinfo(curl, CURLINFO_FILETIME, &curl_servdate);
// cleanup
- if(success != 0) {
+ if(success != 0)
+ {
+ unlink(File->Name().c_str());
_error->Error(curl_errorstr);
Fail();
return true;
}
+ File->Close();
- if (Res.Size == 0)
- Res.Size = File->Size();
+ // Timestamp
+ struct utimbuf UBuf;
+ if (curl_servdate != -1) {
+ UBuf.actime = curl_servdate;
+ UBuf.modtime = curl_servdate;
+ utime(File->Name().c_str(),&UBuf);
+ }
// check the downloaded result
struct stat Buf;
if (stat(File->Name().c_str(),&Buf) == 0)
{
- Res.Size = Buf.st_size;
Res.Filename = File->Name();
Res.LastModified = Buf.st_mtime;
Res.IMSHit = false;
- if (Itm->LastModified != 0 && Buf.st_mtime >= Itm->LastModified)
+ if (curl_responsecode == 304)
{
+ unlink(File->Name().c_str());
Res.IMSHit = true;
Res.LastModified = Itm->LastModified;
+ Res.Size = 0;
+ URIDone(Res);
+ return true;
}
+ Res.Size = Buf.st_size;
}
// take hashes
@@ -227,7 +253,6 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
URIDone(Res);
// cleanup
- File->Close();
Res.Size = 0;
delete File;
curl_slist_free_all(headers);
diff --git a/methods/makefile b/methods/makefile
index f178cbbea..e47539dbb 100644
--- a/methods/makefile
+++ b/methods/makefile
@@ -7,7 +7,7 @@ include ../buildlib/defaults.mak
BIN := $(BIN)/methods
# FIXME..
-LIB_APT_PKG_MAJOR = 4.4
+LIB_APT_PKG_MAJOR = 4.5
APT_DOMAIN := libapt-pkg$(LIB_APT_PKG_MAJOR)
# The file method
@@ -80,9 +80,9 @@ LIB_MAKES = apt-pkg/makefile
SOURCE = rsh.cc
include $(PROGRAM_H)
-# SSH and vzip2 method symlink
-binary: $(BIN)/ssh $(BIN)/bzip2
-veryclean: clean-$(BIN)/ssh clean-$(BIN)/bzip2
+# SSH and bzip2 method symlink
+binary: $(BIN)/ssh $(BIN)/bzip2 $(BIN)/lzma
+veryclean: clean-$(BIN)/ssh clean-$(BIN)/bzip2 clean-$(BIN)/lzma
$(BIN)/ssh:
echo "Installing ssh method link"
ln -fs rsh $(BIN)/ssh
@@ -92,5 +92,10 @@ clean-$(BIN)/ssh:
$(BIN)/bzip2:
echo "Installing bzip2 method link"
ln -fs gzip $(BIN)/bzip2
+$(BIN)/lzma:
+ echo "Installing lzma method link"
+ ln -fs gzip $(BIN)/lzma
clean-$(BIN)/bzip2:
-rm $(BIN)/bzip2
+clean-$(BIN)/lzma:
+ -rm $(BIN)/lzma
diff --git a/po/ChangeLog b/po/ChangeLog
index 3916b5550..54fd2e055 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,28 @@
+2007-09-17 Theppitak Karoonboonyanan <thep@linux.thai.net>
+
+ * th.po: added with 535t. Closes: #442833
+
+2007-09-07 Claus Hindsgaul <claus.hindsgaul@gmail.com>
+
+ * da.po: completed to 532t3f. Closes: #441102
+
+2007-09-03 Clytie Siddall <clytie@riverland.net.au>
+
+ * vi.po: completed to 535t. Closes: #440611
+
+2007-08-07 Piarres Beobide <pi@beobide.net>
+
+ * eu.po: completed to 535t. Closes: #436425
+
+2007-08-04 Christian Perrier <bubulle@debian.org>
+
+ * fr.po: completed to 535t.
+
+2007-08-04 Christian Perrier <bubulle@debian.org>
+
+ * Update all PO and the POT. Gives 529t6f for formerly
+ complete translations
+
2007-07-11 Piarres Beobide <pi@beobide.net>
* eu.po: completed to 532t. Closes: #423766
diff --git a/po/apt-all.pot b/po/apt-all.pot
index 9c5de47a0..5cac99172 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-06 07:19+0200\n"
+"POT-Creation-Date: 2007-08-04 12:41+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -156,9 +156,9 @@ msgstr ""
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2584 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2585 cmdline/apt-sortpkgs.cc:144
#, c-format
-msgid "%s %s for %s %s compiled on %s %s\n"
+msgid "%s %s for %s compiled on %s %s\n"
msgstr ""
#: cmdline/apt-cache.cc:1721
@@ -554,7 +554,7 @@ msgstr ""
msgid "Y"
msgstr ""
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1673
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
@@ -713,11 +713,11 @@ msgstr ""
msgid "Internal error, Ordering didn't finish"
msgstr ""
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2011 cmdline/apt-get.cc:2044
msgid "Unable to lock the download directory"
msgstr ""
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2092 cmdline/apt-get.cc:2333
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr ""
@@ -746,7 +746,7 @@ msgstr ""
msgid "After unpacking %sB disk space will be freed.\n"
msgstr ""
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2186
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2187
#, c-format
msgid "Couldn't determine free space in %s"
msgstr ""
@@ -780,7 +780,7 @@ msgstr ""
msgid "Do you want to continue [Y/n]? "
msgstr ""
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2229
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2230
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr ""
@@ -789,7 +789,7 @@ msgstr ""
msgid "Some files failed to download"
msgstr ""
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2238
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2239
msgid "Download complete and in download only mode"
msgstr ""
@@ -915,7 +915,7 @@ msgid ""
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1754
msgid "The following information may help to resolve the situation:"
msgstr ""
@@ -927,37 +927,37 @@ msgstr ""
msgid "Internal error, AllUpgrade broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1544
+#: cmdline/apt-get.cc:1545
#, c-format
msgid "Couldn't find task %s"
msgstr ""
-#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
+#: cmdline/apt-get.cc:1660 cmdline/apt-get.cc:1696
#, c-format
msgid "Couldn't find package %s"
msgstr ""
-#: cmdline/apt-get.cc:1682
+#: cmdline/apt-get.cc:1683
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:1712
+#: cmdline/apt-get.cc:1713
#, c-format
msgid "%s set to manual installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:1725
+#: cmdline/apt-get.cc:1726
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1729
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
msgstr ""
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1741
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -965,159 +965,159 @@ msgid ""
"or been moved out of Incoming."
msgstr ""
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1749
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
"that package should be filed."
msgstr ""
-#: cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1757
msgid "Broken packages"
msgstr ""
-#: cmdline/apt-get.cc:1785
+#: cmdline/apt-get.cc:1786
msgid "The following extra packages will be installed:"
msgstr ""
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Suggested packages:"
msgstr ""
-#: cmdline/apt-get.cc:1875
+#: cmdline/apt-get.cc:1876
msgid "Recommended packages:"
msgstr ""
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1904
msgid "Calculating upgrade... "
msgstr ""
-#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1907 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr ""
-#: cmdline/apt-get.cc:1911
+#: cmdline/apt-get.cc:1912
msgid "Done"
msgstr ""
-#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
+#: cmdline/apt-get.cc:1979 cmdline/apt-get.cc:1987
msgid "Internal error, problem resolver broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:2086
+#: cmdline/apt-get.cc:2087
msgid "Must specify at least one package to fetch source for"
msgstr ""
-#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2350
+#: cmdline/apt-get.cc:2117 cmdline/apt-get.cc:2351
#, c-format
msgid "Unable to find a source package for %s"
msgstr ""
-#: cmdline/apt-get.cc:2165
+#: cmdline/apt-get.cc:2166
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:2189
+#: cmdline/apt-get.cc:2190
#, c-format
msgid "You don't have enough free space in %s"
msgstr ""
-#: cmdline/apt-get.cc:2194
+#: cmdline/apt-get.cc:2195
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2198
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:2203
+#: cmdline/apt-get.cc:2204
#, c-format
msgid "Fetch source %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2234
+#: cmdline/apt-get.cc:2235
msgid "Failed to fetch some archives."
msgstr ""
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2263
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2275
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2275
+#: cmdline/apt-get.cc:2276
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2293
#, c-format
msgid "Build command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:2312
msgid "Child process failed"
msgstr ""
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2328
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-#: cmdline/apt-get.cc:2355
+#: cmdline/apt-get.cc:2356
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
-#: cmdline/apt-get.cc:2375
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:2427
+#: cmdline/apt-get.cc:2428
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-#: cmdline/apt-get.cc:2479
+#: cmdline/apt-get.cc:2480
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
"package %s can satisfy version requirements"
msgstr ""
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2515
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-#: cmdline/apt-get.cc:2539
+#: cmdline/apt-get.cc:2540
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr ""
-#: cmdline/apt-get.cc:2553
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
-#: cmdline/apt-get.cc:2557
+#: cmdline/apt-get.cc:2558
msgid "Failed to process build dependencies"
msgstr ""
-#: cmdline/apt-get.cc:2589
+#: cmdline/apt-get.cc:2590
msgid "Supported modules:"
msgstr ""
-#: cmdline/apt-get.cc:2630
+#: cmdline/apt-get.cc:2631
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1483,25 +1483,25 @@ msgstr ""
msgid "This is not a valid DEB archive, missing '%s' member"
msgstr ""
-#: apt-inst/deb/debfile.cc:48
+#: apt-inst/deb/debfile.cc:50
#, c-format
-msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
+msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
msgstr ""
-#: apt-inst/deb/debfile.cc:108
+#: apt-inst/deb/debfile.cc:110
#, c-format
msgid "Couldn't change to %s"
msgstr ""
-#: apt-inst/deb/debfile.cc:134
+#: apt-inst/deb/debfile.cc:140
msgid "Internal error, could not locate member"
msgstr ""
-#: apt-inst/deb/debfile.cc:167
+#: apt-inst/deb/debfile.cc:173
msgid "Failed to locate a valid control file"
msgstr ""
-#: apt-inst/deb/debfile.cc:252
+#: apt-inst/deb/debfile.cc:258
msgid "Unparsable control file"
msgstr ""
@@ -1857,15 +1857,15 @@ msgstr ""
msgid "Error reading from server"
msgstr ""
-#: methods/http.cc:1108
+#: methods/http.cc:1104
msgid "Bad header data"
msgstr ""
-#: methods/http.cc:1125
+#: methods/http.cc:1121 methods/http.cc:1176
msgid "Connection failed"
msgstr ""
-#: methods/http.cc:1216
+#: methods/http.cc:1228
msgid "Internal error"
msgstr ""
@@ -1895,7 +1895,7 @@ msgstr ""
#: apt-pkg/contrib/configuration.cc:510
#, c-format
-msgid "Line %d too long (max %lu)"
+msgid "Line %d too long (max %u)"
msgstr ""
#: apt-pkg/contrib/configuration.cc:606
@@ -2148,28 +2148,28 @@ msgstr ""
msgid "extra"
msgstr ""
-#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129
+#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
msgid "Building dependency tree"
msgstr ""
-#: apt-pkg/depcache.cc:101
+#: apt-pkg/depcache.cc:122
msgid "Candidate versions"
msgstr ""
-#: apt-pkg/depcache.cc:130
+#: apt-pkg/depcache.cc:151
msgid "Dependency generation"
msgstr ""
-#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174
+#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
msgid "Reading state information"
msgstr ""
-#: apt-pkg/depcache.cc:198
+#: apt-pkg/depcache.cc:219
#, c-format
msgid "Failed to open StateFile %s"
msgstr ""
-#: apt-pkg/depcache.cc:204
+#: apt-pkg/depcache.cc:225
#, c-format
msgid "Failed to write temporary StateFile %s"
msgstr ""
@@ -2295,17 +2295,17 @@ msgstr ""
msgid "Method %s did not start correctly"
msgstr ""
-#: apt-pkg/acquire-worker.cc:381
+#: apt-pkg/acquire-worker.cc:396
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
-#: apt-pkg/init.cc:126
+#: apt-pkg/init.cc:124
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr ""
-#: apt-pkg/init.cc:142
+#: apt-pkg/init.cc:140
msgid "Unable to determine a suitable packaging system type"
msgstr ""
@@ -2437,36 +2437,39 @@ msgstr ""
msgid "rename failed, %s (%s -> %s)."
msgstr ""
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:401
msgid "MD5Sum mismatch"
msgstr ""
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1405
+msgid "Hash Sum mismatch"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1097
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:1219
+#: apt-pkg/acquire-item.cc:1210
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package. (due to missing arch)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1278
+#: apt-pkg/acquire-item.cc:1269
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"manually fix this package."
msgstr ""
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1310
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1397
msgid "Size mismatch"
msgstr ""
@@ -2552,76 +2555,86 @@ msgstr ""
msgid "Unmounting CD-ROM...\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
#, c-format
msgid "Wrote %i records.\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:522
#, c-format
msgid "Preparing %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:523
#, c-format
msgid "Unpacking %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:528
#, c-format
msgid "Preparing to configure %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:529
#, c-format
msgid "Configuring %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:530
#, c-format
msgid "Installed %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:535
#, c-format
msgid "Preparing for removal of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:536
#, c-format
msgid "Removing %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:537
#, c-format
msgid "Removed %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:542
#, c-format
msgid "Preparing to completely remove %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:543
#, c-format
msgid "Completely removed %s"
msgstr ""
+#: apt-pkg/deb/dpkgpm.cc:566
+#, c-format
+msgid "Directory '%s' missing"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:709
+#, c-format
+msgid "openpty failed\n"
+msgstr ""
+
#: methods/rred.cc:219
msgid "Could not patch file"
msgstr ""
diff --git a/po/bg.po b/po/bg.po
index d435e59fc..88fcdeace 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.6\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-06 06:51+0200\n"
+"POT-Creation-Date: 2007-08-04 09:09+0200\n"
"PO-Revision-Date: 2006-10-12 20:14+0300\n"
"Last-Translator: Yavor Doganov <yavor@doganov.org>\n"
"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -160,9 +160,9 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2584 cmdline/apt-sortpkgs.cc:144
-#, c-format
-msgid "%s %s for %s %s compiled on %s %s\n"
+#: cmdline/apt-get.cc:2585 cmdline/apt-sortpkgs.cc:144
+#, fuzzy, c-format
+msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s за %s %s, компилиран на %s %s\n"
#: cmdline/apt-cache.cc:1721
@@ -664,7 +664,7 @@ msgstr "Неуспех при преименуването на %s на %s"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1673
#, c-format
msgid "Regex compilation error - %s"
msgstr "Грешка при компилирането на регулярния израз - %s"
@@ -827,11 +827,11 @@ msgstr "Трябва да бъдат премахнати пакети, но п�
msgid "Internal error, Ordering didn't finish"
msgstr "Вътрешна грешка, „Ordering“ не завърши"
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2011 cmdline/apt-get.cc:2044
msgid "Unable to lock the download directory"
msgstr "Неуспех при заключването на директорията за изтегляне"
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2092 cmdline/apt-get.cc:2333
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr "Списъкът с източници не можа да бъде прочетен."
@@ -861,7 +861,7 @@ msgstr "След разпакетирането ще бъде използван
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "След разпакетирането ще бъде освободено %sB дисково пространство.\n"
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2186
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2187
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Неуспех при определянето на свободното пространство в %s"
@@ -898,7 +898,7 @@ msgstr "Прекъсване."
msgid "Do you want to continue [Y/n]? "
msgstr "Искате ли да продължите [Y/n]? "
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2229
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2230
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Неуспех при изтеглянето на %s %s\n"
@@ -907,7 +907,7 @@ msgstr "Неуспех при изтеглянето на %s %s\n"
msgid "Some files failed to download"
msgstr "Някои файлове не можаха да бъдат изтеглени"
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2238
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2239
msgid "Download complete and in download only mode"
msgstr "Изтеглянето завърши в режим само на изтегляне"
@@ -1041,7 +1041,7 @@ msgid ""
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1754
msgid "The following information may help to resolve the situation:"
msgstr ""
"Следната информация може да помогне за намиране на изход от ситуацията:"
@@ -1055,31 +1055,31 @@ msgstr "Вътрешна грешка, „problem resolver“ счупи нещ�
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Вътрешна грешка, „AllUpgrade“ счупи нещо в системата"
-#: cmdline/apt-get.cc:1544
+#: cmdline/apt-get.cc:1545
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "Неуспех при намирането на пакет %s"
-#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
+#: cmdline/apt-get.cc:1660 cmdline/apt-get.cc:1696
#, c-format
msgid "Couldn't find package %s"
msgstr "Неуспех при намирането на пакет %s"
-#: cmdline/apt-get.cc:1682
+#: cmdline/apt-get.cc:1683
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Забележете, избиране на %s за регулярен израз „%s“\n"
-#: cmdline/apt-get.cc:1712
+#: cmdline/apt-get.cc:1713
#, fuzzy, c-format
msgid "%s set to manual installed.\n"
msgstr "но ще бъде инсталиран %s"
-#: cmdline/apt-get.cc:1725
+#: cmdline/apt-get.cc:1726
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Възможно е да изпълните „apt-get -f install“, за да коригирате:"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1729
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1087,7 +1087,7 @@ msgstr ""
"Неудовлетворени зависимости. Опитайте „apt-get -f install“ без пакети (или "
"укажете разрешение)."
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1741
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1099,7 +1099,7 @@ msgstr ""
"дистрибуция, че някои необходими пакети още не са създадени или пък\n"
"са били преместени от Incoming."
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1749
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1109,118 +1109,118 @@ msgstr ""
"да не може да бъде инсталиран; в такъв случай би трябвало да се подаде\n"
"доклад за грешка за този пакет."
-#: cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1757
msgid "Broken packages"
msgstr "Счупени пакети"
-#: cmdline/apt-get.cc:1785
+#: cmdline/apt-get.cc:1786
msgid "The following extra packages will be installed:"
msgstr "Следните допълнителни пакети ще бъдат инсталирани:"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Suggested packages:"
msgstr "Предложени пакети:"
-#: cmdline/apt-get.cc:1875
+#: cmdline/apt-get.cc:1876
msgid "Recommended packages:"
msgstr "Препоръчвани пакети:"
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1904
msgid "Calculating upgrade... "
msgstr "Изчисляване на актуализацията..."
-#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1907 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Неуспех"
-#: cmdline/apt-get.cc:1911
+#: cmdline/apt-get.cc:1912
msgid "Done"
msgstr "Готово"
-#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
+#: cmdline/apt-get.cc:1979 cmdline/apt-get.cc:1987
msgid "Internal error, problem resolver broke stuff"
msgstr "Вътрешна грешка, „problem resolver“ счупи нещо в системата"
-#: cmdline/apt-get.cc:2086
+#: cmdline/apt-get.cc:2087
msgid "Must specify at least one package to fetch source for"
msgstr "Трябва да укажете поне един пакет за изтегляне на изходния му код"
-#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2350
+#: cmdline/apt-get.cc:2117 cmdline/apt-get.cc:2351
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Неуспех при намирането на изходен код на пакет %s"
-#: cmdline/apt-get.cc:2165
+#: cmdline/apt-get.cc:2166
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Пропускане на вече изтегления файл „%s“\n"
-#: cmdline/apt-get.cc:2189
+#: cmdline/apt-get.cc:2190
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Нямате достатъчно свободно пространство в %s"
-#: cmdline/apt-get.cc:2194
+#: cmdline/apt-get.cc:2195
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Необходимо е да се изтеглят %sB/%sB архиви изходен код.\n"
-#: cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2198
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Необходимо е да се изтеглят %sB архиви изходен код.\n"
-#: cmdline/apt-get.cc:2203
+#: cmdline/apt-get.cc:2204
#, c-format
msgid "Fetch source %s\n"
msgstr "Изтегляне на изходен код %s\n"
-#: cmdline/apt-get.cc:2234
+#: cmdline/apt-get.cc:2235
msgid "Failed to fetch some archives."
msgstr "Неуспех при изтеглянето на някои архиви."
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2263
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
"Пропускане на разпакетирането на вече разпакетирания изходен код в %s\n"
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2275
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Командата за разпакетиране „%s“ пропадна.\n"
-#: cmdline/apt-get.cc:2275
+#: cmdline/apt-get.cc:2276
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Проверете дали имате инсталиран пакета „dpkg-dev“.\n"
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2293
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Командата за компилиране „%s“ пропадна.\n"
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:2312
msgid "Child process failed"
msgstr "Процесът-потомък пропадна"
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2328
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Трябва да укажете поне един пакет за проверка на зависимости за компилиране"
-#: cmdline/apt-get.cc:2355
+#: cmdline/apt-get.cc:2356
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
"Неуспех при получаването на информация за зависимостите за компилиране на %s"
-#: cmdline/apt-get.cc:2375
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s няма зависимости за компилиране.\n"
-#: cmdline/apt-get.cc:2427
+#: cmdline/apt-get.cc:2428
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1229,7 +1229,7 @@ msgstr ""
"Зависимост %s за пакета %s не може да бъде удовлетворена, понеже пакета %s "
"не може да бъде намерен"
-#: cmdline/apt-get.cc:2479
+#: cmdline/apt-get.cc:2480
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1239,32 +1239,32 @@ msgstr ""
"налични версии на пакета %s, които могат да удовлетворят изискването за "
"версия"
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2515
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Неуспех при удовлетворяването на зависимост %s за пакета %s: Инсталираният "
"пакет %s е твърде нов"
-#: cmdline/apt-get.cc:2539
+#: cmdline/apt-get.cc:2540
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Неуспех при удовлетворяването на зависимост %s за пакета %s: %s"
-#: cmdline/apt-get.cc:2553
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Зависимостите за компилиране на %s не можаха да бъдат удовлетворени."
-#: cmdline/apt-get.cc:2557
+#: cmdline/apt-get.cc:2558
msgid "Failed to process build dependencies"
msgstr "Неуспех при обработката на зависимостите за компилиране"
-#: cmdline/apt-get.cc:2589
+#: cmdline/apt-get.cc:2590
msgid "Supported modules:"
msgstr "Поддържани модули:"
-#: cmdline/apt-get.cc:2630
+#: cmdline/apt-get.cc:2631
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1690,25 +1690,25 @@ msgstr "Грешка при анализирането на MD5. Изместв�
msgid "This is not a valid DEB archive, missing '%s' member"
msgstr "Това не е валиден DEB архив, липсва елемент „%s“"
-#: apt-inst/deb/debfile.cc:48
-#, c-format
-msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
+#: apt-inst/deb/debfile.cc:50
+#, fuzzy, c-format
+msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
msgstr "Това не е валиден DEB архив, няма елемент „%s“ или „%s“"
-#: apt-inst/deb/debfile.cc:108
+#: apt-inst/deb/debfile.cc:110
#, c-format
msgid "Couldn't change to %s"
msgstr "Неуспех при преминаването в %s"
-#: apt-inst/deb/debfile.cc:134
+#: apt-inst/deb/debfile.cc:140
msgid "Internal error, could not locate member"
msgstr "Вътрешна грешка, не може да се открие елемент"
-#: apt-inst/deb/debfile.cc:167
+#: apt-inst/deb/debfile.cc:173
msgid "Failed to locate a valid control file"
msgstr "Неуспех при намирането на валиден контролен файл"
-#: apt-inst/deb/debfile.cc:252
+#: apt-inst/deb/debfile.cc:258
msgid "Unparsable control file"
msgstr "Контролен файл, невъзможен за анализ"
@@ -2078,15 +2078,15 @@ msgstr "Грешка при четене от сървъра. Отдалечен
msgid "Error reading from server"
msgstr "Грешка при четене от сървъра"
-#: methods/http.cc:1108
+#: methods/http.cc:1104
msgid "Bad header data"
msgstr "Невалидни данни на заглавната част"
-#: methods/http.cc:1125
+#: methods/http.cc:1121 methods/http.cc:1176
msgid "Connection failed"
msgstr "Неуспех при свързването"
-#: methods/http.cc:1216
+#: methods/http.cc:1228
msgid "Internal error"
msgstr "Вътрешна грешка"
@@ -2116,7 +2116,7 @@ msgstr "Отваряне на конфигурационен файл %s"
#: apt-pkg/contrib/configuration.cc:510
#, fuzzy, c-format
-msgid "Line %d too long (max %lu)"
+msgid "Line %d too long (max %u)"
msgstr "Ред %d е твърде дълъг (максимум %d)"
#: apt-pkg/contrib/configuration.cc:606
@@ -2374,29 +2374,29 @@ msgstr "незадължителен"
msgid "extra"
msgstr "допълнителен"
-#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129
+#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
msgid "Building dependency tree"
msgstr "Изграждане на дървото със зависимости"
-#: apt-pkg/depcache.cc:101
+#: apt-pkg/depcache.cc:122
msgid "Candidate versions"
msgstr "Версии кандидати"
-#: apt-pkg/depcache.cc:130
+#: apt-pkg/depcache.cc:151
msgid "Dependency generation"
msgstr "Генериране на зависимости"
-#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174
+#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
#, fuzzy
msgid "Reading state information"
msgstr "Смесване на наличната информация"
-#: apt-pkg/depcache.cc:198
+#: apt-pkg/depcache.cc:219
#, fuzzy, c-format
msgid "Failed to open StateFile %s"
msgstr "Неуспех при отварянето на %s"
-#: apt-pkg/depcache.cc:204
+#: apt-pkg/depcache.cc:225
#, fuzzy, c-format
msgid "Failed to write temporary StateFile %s"
msgstr "Неуспех при запис на файл %s"
@@ -2535,17 +2535,17 @@ msgstr "Неуспех при намирането на драйвер за ме
msgid "Method %s did not start correctly"
msgstr "Методът %s не стартира правилно"
-#: apt-pkg/acquire-worker.cc:381
+#: apt-pkg/acquire-worker.cc:396
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Сложете диска, озаглавен „%s“ в устройство „%s“ и натиснете „Enter“."
-#: apt-pkg/init.cc:126
+#: apt-pkg/init.cc:124
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Пакетната система „%s“ не е поддържана"
-#: apt-pkg/init.cc:142
+#: apt-pkg/init.cc:140
msgid "Unable to determine a suitable packaging system type"
msgstr "Неуспех при определянето на подходяща пакетна система"
@@ -2685,16 +2685,20 @@ msgstr "Входно/изходна грешка при запазването �
msgid "rename failed, %s (%s -> %s)."
msgstr "преименуването се провали, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:401
msgid "MD5Sum mismatch"
msgstr "Несъответствие на контролна сума MD5"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1405
+#, fuzzy
+msgid "Hash Sum mismatch"
+msgstr "Несъответствие на контролна сума MD5"
+
+#: apt-pkg/acquire-item.cc:1097
msgid "There is no public key available for the following key IDs:\n"
msgstr "Няма налични публични ключове за следните идентификатори на ключове:\n"
-#: apt-pkg/acquire-item.cc:1219
+#: apt-pkg/acquire-item.cc:1210
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2703,7 +2707,7 @@ msgstr ""
"Неуспех при намирането на файл за пакет %s. Това може да означава, че трябва "
"ръчно да оправите този пакет (поради пропусната архитектура)."
-#: apt-pkg/acquire-item.cc:1278
+#: apt-pkg/acquire-item.cc:1269
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2712,14 +2716,14 @@ msgstr ""
"Неуспех при намирането на файл за пакет %s. Това може да означава, че трябва "
"ръчно да оправите този пакет."
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1310
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"Индексните файлове на пакета са повредени. Няма поле Filename: за пакет %s."
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1397
msgid "Size mismatch"
msgstr "Несъответствие на размера"
@@ -2812,76 +2816,86 @@ msgstr "Записите в списъка с източници за този �
msgid "Unmounting CD-ROM...\n"
msgstr "Демонтиране на CD-ROM..."
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
#, c-format
msgid "Wrote %i records.\n"
msgstr "Записани са %i записа.\n"
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Записани са %i записа с %i липсващи файла.\n"
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Записани са %i записа с %i несъответстващи файла\n"
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "Записани са %i записа с %i липсващи и %i несъответстващи файла\n"
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:522
#, c-format
msgid "Preparing %s"
msgstr "Подготвяне на %s"
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:523
#, c-format
msgid "Unpacking %s"
msgstr "Разпакетиране на %s"
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:528
#, c-format
msgid "Preparing to configure %s"
msgstr "Подготвяне на %s за конфигуриране"
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:529
#, c-format
msgid "Configuring %s"
msgstr "Конфигуриране на %s"
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:530
#, c-format
msgid "Installed %s"
msgstr "%s е инсталиран"
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:535
#, c-format
msgid "Preparing for removal of %s"
msgstr "Подготвяне за премахване на %s"
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:536
#, c-format
msgid "Removing %s"
msgstr "Премахване на %s"
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:537
#, c-format
msgid "Removed %s"
msgstr "%s е премахнат"
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:542
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Подготовка за пълно премахване на %s"
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:543
#, c-format
msgid "Completely removed %s"
msgstr "%s е напълно премахнат"
+#: apt-pkg/deb/dpkgpm.cc:566
+#, fuzzy, c-format
+msgid "Directory '%s' missing"
+msgstr "Директорията със списъци %spartial липсва."
+
+#: apt-pkg/deb/dpkgpm.cc:709
+#, fuzzy, c-format
+msgid "openpty failed\n"
+msgstr "Неуспех на избора"
+
#: methods/rred.cc:219
#, fuzzy
msgid "Could not patch file"
diff --git a/po/bs.po b/po/bs.po
index 940b571b8..d978fa3a8 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.26\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-06 06:51+0200\n"
+"POT-Creation-Date: 2007-08-04 09:09+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"
@@ -157,9 +157,9 @@ msgstr ""
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2584 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2585 cmdline/apt-sortpkgs.cc:144
#, c-format
-msgid "%s %s for %s %s compiled on %s %s\n"
+msgid "%s %s for %s compiled on %s %s\n"
msgstr ""
#: cmdline/apt-cache.cc:1721
@@ -568,7 +568,7 @@ msgstr ""
msgid "Y"
msgstr ""
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1673
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
@@ -729,11 +729,11 @@ msgstr ""
msgid "Internal error, Ordering didn't finish"
msgstr ""
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2011 cmdline/apt-get.cc:2044
msgid "Unable to lock the download directory"
msgstr ""
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2092 cmdline/apt-get.cc:2333
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr ""
@@ -762,7 +762,7 @@ msgstr ""
msgid "After unpacking %sB disk space will be freed.\n"
msgstr ""
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2186
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2187
#, c-format
msgid "Couldn't determine free space in %s"
msgstr ""
@@ -797,7 +797,7 @@ msgstr "Odustani."
msgid "Do you want to continue [Y/n]? "
msgstr "Da li želite nastaviti? [Y/n]"
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2229
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2230
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr ""
@@ -806,7 +806,7 @@ msgstr ""
msgid "Some files failed to download"
msgstr ""
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2238
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2239
msgid "Download complete and in download only mode"
msgstr ""
@@ -933,7 +933,7 @@ msgid ""
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1754
msgid "The following information may help to resolve the situation:"
msgstr ""
@@ -945,37 +945,37 @@ msgstr ""
msgid "Internal error, AllUpgrade broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1544
+#: cmdline/apt-get.cc:1545
#, c-format
msgid "Couldn't find task %s"
msgstr ""
-#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
+#: cmdline/apt-get.cc:1660 cmdline/apt-get.cc:1696
#, c-format
msgid "Couldn't find package %s"
msgstr ""
-#: cmdline/apt-get.cc:1682
+#: cmdline/apt-get.cc:1683
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:1712
+#: cmdline/apt-get.cc:1713
#, fuzzy, c-format
msgid "%s set to manual installed.\n"
msgstr "ali se %s treba instalirati"
-#: cmdline/apt-get.cc:1725
+#: cmdline/apt-get.cc:1726
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1729
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
msgstr ""
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1741
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -983,159 +983,159 @@ msgid ""
"or been moved out of Incoming."
msgstr ""
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1749
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
"that package should be filed."
msgstr ""
-#: cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1757
msgid "Broken packages"
msgstr "Oštećeni paketi"
-#: cmdline/apt-get.cc:1785
+#: cmdline/apt-get.cc:1786
msgid "The following extra packages will be installed:"
msgstr "Slijedeći dodatni paketi će biti instalirani:"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Suggested packages:"
msgstr "Predloženi paketi:"
-#: cmdline/apt-get.cc:1875
+#: cmdline/apt-get.cc:1876
msgid "Recommended packages:"
msgstr "Preporučeni paketi:"
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1904
msgid "Calculating upgrade... "
msgstr "Računam nadogradnju..."
-#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1907 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Neuspješno"
-#: cmdline/apt-get.cc:1911
+#: cmdline/apt-get.cc:1912
msgid "Done"
msgstr "Urađeno"
-#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
+#: cmdline/apt-get.cc:1979 cmdline/apt-get.cc:1987
msgid "Internal error, problem resolver broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:2086
+#: cmdline/apt-get.cc:2087
msgid "Must specify at least one package to fetch source for"
msgstr ""
-#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2350
+#: cmdline/apt-get.cc:2117 cmdline/apt-get.cc:2351
#, c-format
msgid "Unable to find a source package for %s"
msgstr ""
-#: cmdline/apt-get.cc:2165
+#: cmdline/apt-get.cc:2166
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:2189
+#: cmdline/apt-get.cc:2190
#, c-format
msgid "You don't have enough free space in %s"
msgstr ""
-#: cmdline/apt-get.cc:2194
+#: cmdline/apt-get.cc:2195
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2198
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:2203
+#: cmdline/apt-get.cc:2204
#, c-format
msgid "Fetch source %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2234
+#: cmdline/apt-get.cc:2235
msgid "Failed to fetch some archives."
msgstr ""
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2263
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2275
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2275
+#: cmdline/apt-get.cc:2276
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2293
#, c-format
msgid "Build command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:2312
msgid "Child process failed"
msgstr ""
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2328
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-#: cmdline/apt-get.cc:2355
+#: cmdline/apt-get.cc:2356
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
-#: cmdline/apt-get.cc:2375
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:2427
+#: cmdline/apt-get.cc:2428
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-#: cmdline/apt-get.cc:2479
+#: cmdline/apt-get.cc:2480
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
"package %s can satisfy version requirements"
msgstr ""
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2515
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-#: cmdline/apt-get.cc:2539
+#: cmdline/apt-get.cc:2540
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr ""
-#: cmdline/apt-get.cc:2553
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
-#: cmdline/apt-get.cc:2557
+#: cmdline/apt-get.cc:2558
msgid "Failed to process build dependencies"
msgstr ""
-#: cmdline/apt-get.cc:2589
+#: cmdline/apt-get.cc:2590
msgid "Supported modules:"
msgstr "Podržani moduli:"
-#: cmdline/apt-get.cc:2630
+#: cmdline/apt-get.cc:2631
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1501,25 +1501,25 @@ msgstr ""
msgid "This is not a valid DEB archive, missing '%s' member"
msgstr ""
-#: apt-inst/deb/debfile.cc:48
+#: apt-inst/deb/debfile.cc:50
#, c-format
-msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
+msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
msgstr ""
-#: apt-inst/deb/debfile.cc:108
+#: apt-inst/deb/debfile.cc:110
#, c-format
msgid "Couldn't change to %s"
msgstr ""
-#: apt-inst/deb/debfile.cc:134
+#: apt-inst/deb/debfile.cc:140
msgid "Internal error, could not locate member"
msgstr ""
-#: apt-inst/deb/debfile.cc:167
+#: apt-inst/deb/debfile.cc:173
msgid "Failed to locate a valid control file"
msgstr ""
-#: apt-inst/deb/debfile.cc:252
+#: apt-inst/deb/debfile.cc:258
msgid "Unparsable control file"
msgstr ""
@@ -1879,15 +1879,15 @@ msgstr ""
msgid "Error reading from server"
msgstr ""
-#: methods/http.cc:1108
+#: methods/http.cc:1104
msgid "Bad header data"
msgstr ""
-#: methods/http.cc:1125
+#: methods/http.cc:1121 methods/http.cc:1176
msgid "Connection failed"
msgstr "Povezivanje neuspješno"
-#: methods/http.cc:1216
+#: methods/http.cc:1228
msgid "Internal error"
msgstr "Unutrašnja greška"
@@ -1917,7 +1917,7 @@ msgstr ""
#: apt-pkg/contrib/configuration.cc:510
#, c-format
-msgid "Line %d too long (max %lu)"
+msgid "Line %d too long (max %u)"
msgstr ""
#: apt-pkg/contrib/configuration.cc:606
@@ -2171,29 +2171,29 @@ msgstr "opcionalno"
msgid "extra"
msgstr "extra"
-#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129
+#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
msgid "Building dependency tree"
msgstr "Gradim stablo zavisnosti"
-#: apt-pkg/depcache.cc:101
+#: apt-pkg/depcache.cc:122
msgid "Candidate versions"
msgstr "Verzije kandidata"
-#: apt-pkg/depcache.cc:130
+#: apt-pkg/depcache.cc:151
msgid "Dependency generation"
msgstr "Stvaranje zavisnosti"
-#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174
+#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
#, fuzzy
msgid "Reading state information"
msgstr "Sastavljam dostupne informacije"
-#: apt-pkg/depcache.cc:198
+#: apt-pkg/depcache.cc:219
#, fuzzy, c-format
msgid "Failed to open StateFile %s"
msgstr "Ne mogu otvoriti %s"
-#: apt-pkg/depcache.cc:204
+#: apt-pkg/depcache.cc:225
#, fuzzy, c-format
msgid "Failed to write temporary StateFile %s"
msgstr "Ne mogu ukloniti %s"
@@ -2319,17 +2319,17 @@ msgstr ""
msgid "Method %s did not start correctly"
msgstr ""
-#: apt-pkg/acquire-worker.cc:381
+#: apt-pkg/acquire-worker.cc:396
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
-#: apt-pkg/init.cc:126
+#: apt-pkg/init.cc:124
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr ""
-#: apt-pkg/init.cc:142
+#: apt-pkg/init.cc:140
msgid "Unable to determine a suitable packaging system type"
msgstr ""
@@ -2461,36 +2461,39 @@ msgstr ""
msgid "rename failed, %s (%s -> %s)."
msgstr ""
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:401
msgid "MD5Sum mismatch"
msgstr ""
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1405
+msgid "Hash Sum mismatch"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1097
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:1219
+#: apt-pkg/acquire-item.cc:1210
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package. (due to missing arch)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1278
+#: apt-pkg/acquire-item.cc:1269
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"manually fix this package."
msgstr ""
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1310
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1397
msgid "Size mismatch"
msgstr ""
@@ -2579,76 +2582,86 @@ msgstr ""
msgid "Unmounting CD-ROM...\n"
msgstr "Pogrešan CD"
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
#, c-format
msgid "Wrote %i records.\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:522
#, fuzzy, c-format
msgid "Preparing %s"
msgstr "Otvaram %s"
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:523
#, fuzzy, c-format
msgid "Unpacking %s"
msgstr "Otvaram %s"
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:528
#, c-format
msgid "Preparing to configure %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:529
#, fuzzy, c-format
msgid "Configuring %s"
msgstr "Povezujem se sa %s"
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:530
#, fuzzy, c-format
msgid "Installed %s"
msgstr " Instalirano:"
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:535
#, c-format
msgid "Preparing for removal of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:536
#, fuzzy, c-format
msgid "Removing %s"
msgstr "Otvaram %s"
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:537
#, fuzzy, c-format
msgid "Removed %s"
msgstr "Preporučuje"
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:542
#, c-format
msgid "Preparing to completely remove %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:543
#, fuzzy, c-format
msgid "Completely removed %s"
msgstr "Ne mogu ukloniti %s"
+#: apt-pkg/deb/dpkgpm.cc:566
+#, c-format
+msgid "Directory '%s' missing"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:709
+#, fuzzy, c-format
+msgid "openpty failed\n"
+msgstr "Povezivanje neuspješno"
+
#: methods/rred.cc:219
msgid "Could not patch file"
msgstr ""
diff --git a/po/ca.po b/po/ca.po
index 95ba0feba..cc89eb9c9 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.6\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-06 06:51+0200\n"
+"POT-Creation-Date: 2007-08-04 09:09+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"
@@ -160,9 +160,9 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2584 cmdline/apt-sortpkgs.cc:144
-#, c-format
-msgid "%s %s for %s %s compiled on %s %s\n"
+#: cmdline/apt-get.cc:2585 cmdline/apt-sortpkgs.cc:144
+#, fuzzy, c-format
+msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s per a %s %s compilat el %s %s\n"
#: cmdline/apt-cache.cc:1721
@@ -657,7 +657,7 @@ msgstr "No s'ha pogut canviar el nom de %s a %s"
msgid "Y"
msgstr "S"
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1673
#, c-format
msgid "Regex compilation error - %s"
msgstr "S'ha produït un error de compilació de l'expressió regular - %s"
@@ -820,11 +820,11 @@ msgstr "Els paquets necessiten ser eliminats però Remove està inhabilitat."
msgid "Internal error, Ordering didn't finish"
msgstr "S'ha produït un error intern, l'ordenació no ha acabat"
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2011 cmdline/apt-get.cc:2044
msgid "Unable to lock the download directory"
msgstr "No és possible blocar el directori de descàrrega"
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2092 cmdline/apt-get.cc:2333
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr "No s'ha pogut llegir la llista de les fonts."
@@ -854,7 +854,7 @@ msgstr "Després de desempaquetar s'usaran %sB d'espai en disc addicional.\n"
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Després de desempaquetar s'alliberaran %sB d'espai en disc.\n"
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2186
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2187
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "No s'ha pogut determinar l'espai lliure en %s"
@@ -891,7 +891,7 @@ msgstr "Avortat."
msgid "Do you want to continue [Y/n]? "
msgstr "Voleu continuar [S/n]? "
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2229
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2230
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "No s'ha pogut obtenir %s %s\n"
@@ -900,7 +900,7 @@ msgstr "No s'ha pogut obtenir %s %s\n"
msgid "Some files failed to download"
msgstr "Alguns fitxers no s'han pogut descarregar"
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2238
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2239
msgid "Download complete and in download only mode"
msgstr "Descàrrega completa i en mode de només descàrrega"
@@ -1036,7 +1036,7 @@ msgid ""
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1754
msgid "The following information may help to resolve the situation:"
msgstr "La següent informació pot ajudar-vos a resoldre la situació:"
@@ -1050,31 +1050,31 @@ msgstr ""
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Error intern, AllUpgrade ha trencat coses"
-#: cmdline/apt-get.cc:1544
+#: cmdline/apt-get.cc:1545
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "No s'ha pogut trobar el paquet %s"
-#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
+#: cmdline/apt-get.cc:1660 cmdline/apt-get.cc:1696
#, c-format
msgid "Couldn't find package %s"
msgstr "No s'ha pogut trobar el paquet %s"
-#: cmdline/apt-get.cc:1682
+#: cmdline/apt-get.cc:1683
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Nota: s'està seleccionant %s per a l'expressió regular '%s'\n"
-#: cmdline/apt-get.cc:1712
+#: cmdline/apt-get.cc:1713
#, fuzzy, c-format
msgid "%s set to manual installed.\n"
msgstr "però s'instal·larà %s"
-#: cmdline/apt-get.cc:1725
+#: cmdline/apt-get.cc:1726
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Potser voldreu executar `apt-get -f install' per a corregir-ho:"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1729
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1082,7 +1082,7 @@ msgstr ""
"Dependències insatisfetes. Intenteu 'apt-get -f install' sense paquets (o "
"especifiqueu una solució)."
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1741
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1094,7 +1094,7 @@ msgstr ""
"unstable i alguns paquets requerits encara no han estat creats o bé\n"
"encara no els hi han afegit."
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1749
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1104,120 +1104,120 @@ msgstr ""
"probable que el paquet no sigui instal·lable i que s'hagi d'emetre\n"
"un informe d'error en contra d'aquest per a arxivar-lo."
-#: cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1757
msgid "Broken packages"
msgstr "Paquets trencats"
-#: cmdline/apt-get.cc:1785
+#: cmdline/apt-get.cc:1786
msgid "The following extra packages will be installed:"
msgstr "S'instal·laran els següents paquets extres:"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Suggested packages:"
msgstr "Paquets suggerits:"
-#: cmdline/apt-get.cc:1875
+#: cmdline/apt-get.cc:1876
msgid "Recommended packages:"
msgstr "Paquets recomanats:"
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1904
msgid "Calculating upgrade... "
msgstr "S'està calculant l'actualització... "
-#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1907 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Ha fallat"
-#: cmdline/apt-get.cc:1911
+#: cmdline/apt-get.cc:1912
msgid "Done"
msgstr "Fet"
-#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
+#: cmdline/apt-get.cc:1979 cmdline/apt-get.cc:1987
msgid "Internal error, problem resolver broke stuff"
msgstr ""
"S'ha produït un error intern, el solucionador de problemes ha trencat coses"
-#: cmdline/apt-get.cc:2086
+#: cmdline/apt-get.cc:2087
msgid "Must specify at least one package to fetch source for"
msgstr "Haureu d'especificar un paquet de codi font per a descarregar"
-#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2350
+#: cmdline/apt-get.cc:2117 cmdline/apt-get.cc:2351
#, c-format
msgid "Unable to find a source package for %s"
msgstr "No es pot trobar un paquet de fonts per a %s"
-#: cmdline/apt-get.cc:2165
+#: cmdline/apt-get.cc:2166
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "S'està ometent el fitxer ja descarregat «%s»\n"
-#: cmdline/apt-get.cc:2189
+#: cmdline/apt-get.cc:2190
#, c-format
msgid "You don't have enough free space in %s"
msgstr "No teniu prou espai lliure en %s"
-#: cmdline/apt-get.cc:2194
+#: cmdline/apt-get.cc:2195
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Es necessita descarregar %sB/%sB d'arxius font.\n"
-#: cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2198
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Es necessita descarregar %sB d'arxius font.\n"
-#: cmdline/apt-get.cc:2203
+#: cmdline/apt-get.cc:2204
#, c-format
msgid "Fetch source %s\n"
msgstr "Font descarregada %s\n"
-#: cmdline/apt-get.cc:2234
+#: cmdline/apt-get.cc:2235
msgid "Failed to fetch some archives."
msgstr "No s'ha pogut descarregar alguns arxius."
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2263
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
"S'està ometent el desempaquetament de les fonts que ja ho estan en %s\n"
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2275
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "L'ordre de desempaquetar «%s» ha fallat.\n"
-#: cmdline/apt-get.cc:2275
+#: cmdline/apt-get.cc:2276
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Comproveu si el paquet «dpkgdev» està instal·lat.\n"
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2293
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "L'ordre de construir «%s» ha fallat.\n"
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:2312
msgid "Child process failed"
msgstr "Ha fallat el procés fill"
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2328
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"S'ha d'especificar un paquet per a verificar les dependències de construcció "
"per a"
-#: cmdline/apt-get.cc:2355
+#: cmdline/apt-get.cc:2356
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
"No es pot obtenir informació sobre les dependències de construcció per a %s"
-#: cmdline/apt-get.cc:2375
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s no té dependències de construcció.\n"
-#: cmdline/apt-get.cc:2427
+#: cmdline/apt-get.cc:2428
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1226,7 +1226,7 @@ msgstr ""
"La dependència %s en %s no es pot satisfer per que no es pot trobar el "
"paquet %s"
-#: cmdline/apt-get.cc:2479
+#: cmdline/apt-get.cc:2480
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1235,32 +1235,32 @@ msgstr ""
"La dependència %s per a %s no es pot satisfer per que cap versió del paquet %"
"s pot satisfer els requeriments de versions"
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2515
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"No s'ha pogut satisfer la dependència %s per a %s: El paquet instal·lat %s "
"és massa nou"
-#: cmdline/apt-get.cc:2539
+#: cmdline/apt-get.cc:2540
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "No s'ha pogut satisfer la dependència %s per a %s: %s"
-#: cmdline/apt-get.cc:2553
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "No s'han pogut satisfer les dependències de construcció per a %s"
-#: cmdline/apt-get.cc:2557
+#: cmdline/apt-get.cc:2558
msgid "Failed to process build dependencies"
msgstr "No es poden processar les dependències de construcció"
-#: cmdline/apt-get.cc:2589
+#: cmdline/apt-get.cc:2590
msgid "Supported modules:"
msgstr "Mòduls suportats:"
-#: cmdline/apt-get.cc:2630
+#: cmdline/apt-get.cc:2631
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1689,25 +1689,25 @@ msgstr "S'ha produït un error en analitzar la suma MD5. Desplaçament %lu"
msgid "This is not a valid DEB archive, missing '%s' member"
msgstr "Aquest no és un arxiu DEB vàlid, falta el membre «%s»"
-#: apt-inst/deb/debfile.cc:48
-#, c-format
-msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
+#: apt-inst/deb/debfile.cc:50
+#, fuzzy, c-format
+msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
msgstr "Aquest no és un arxiu DEB vàlid, falten els membres «%s» o «%s»"
-#: apt-inst/deb/debfile.cc:108
+#: apt-inst/deb/debfile.cc:110
#, c-format
msgid "Couldn't change to %s"
msgstr "No s'ha pogut canviar a %s"
-#: apt-inst/deb/debfile.cc:134
+#: apt-inst/deb/debfile.cc:140
msgid "Internal error, could not locate member"
msgstr "S'ha produït un error intern, no s'ha trobat el membre"
-#: apt-inst/deb/debfile.cc:167
+#: apt-inst/deb/debfile.cc:173
msgid "Failed to locate a valid control file"
msgstr "No s'ha trobat un fitxer de control vàlid"
-#: apt-inst/deb/debfile.cc:252
+#: apt-inst/deb/debfile.cc:258
msgid "Unparsable control file"
msgstr "El fitxer de control no es pot analitzar"
@@ -2076,15 +2076,15 @@ msgstr "Error llegint, el servidor remot ha tancat la connexió"
msgid "Error reading from server"
msgstr "Error llegint des del servidor"
-#: methods/http.cc:1108
+#: methods/http.cc:1104
msgid "Bad header data"
msgstr "Capçalera de dades no vàlida"
-#: methods/http.cc:1125
+#: methods/http.cc:1121 methods/http.cc:1176
msgid "Connection failed"
msgstr "Ha fallat la connexió"
-#: methods/http.cc:1216
+#: methods/http.cc:1228
msgid "Internal error"
msgstr "Error intern"
@@ -2114,7 +2114,7 @@ msgstr "S'està obrint el fitxer de configuració %s"
#: apt-pkg/contrib/configuration.cc:510
#, fuzzy, c-format
-msgid "Line %d too long (max %lu)"
+msgid "Line %d too long (max %u)"
msgstr "Línia %d massa llarga (màx %d)"
#: apt-pkg/contrib/configuration.cc:606
@@ -2367,29 +2367,29 @@ msgstr "opcional"
msgid "extra"
msgstr "extra"
-#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129
+#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
msgid "Building dependency tree"
msgstr "S'està construint l'arbre de dependències"
-#: apt-pkg/depcache.cc:101
+#: apt-pkg/depcache.cc:122
msgid "Candidate versions"
msgstr "Versions candidates"
-#: apt-pkg/depcache.cc:130
+#: apt-pkg/depcache.cc:151
msgid "Dependency generation"
msgstr "Dependències que genera"
-#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174
+#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
#, fuzzy
msgid "Reading state information"
msgstr "S'està fusionant la informació disponible"
-#: apt-pkg/depcache.cc:198
+#: apt-pkg/depcache.cc:219
#, fuzzy, c-format
msgid "Failed to open StateFile %s"
msgstr "No s'ha pogut obrir %s"
-#: apt-pkg/depcache.cc:204
+#: apt-pkg/depcache.cc:225
#, fuzzy, c-format
msgid "Failed to write temporary StateFile %s"
msgstr "No s'ha pogut escriure el fitxer %s"
@@ -2524,17 +2524,17 @@ msgstr "No s'ha pogut trobar el mètode de control %s."
msgid "Method %s did not start correctly"
msgstr "El mètode %s no s'ha iniciat correctament"
-#: apt-pkg/acquire-worker.cc:381
+#: apt-pkg/acquire-worker.cc:396
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Inseriu el disc amb l'etiqueta: «%s» en la unitat «%s» i premeu Intro."
-#: apt-pkg/init.cc:126
+#: apt-pkg/init.cc:124
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "El sistema d'empaquetament '%s' no està suportat"
-#: apt-pkg/init.cc:142
+#: apt-pkg/init.cc:140
msgid "Unable to determine a suitable packaging system type"
msgstr "No es pot determinar un tipus de sistema d'empaquetament adequat."
@@ -2674,16 +2674,20 @@ msgstr "Error d'E/S en desar la memòria cau de la font"
msgid "rename failed, %s (%s -> %s)."
msgstr "no s'ha pogut canviar el nom, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:401
msgid "MD5Sum mismatch"
msgstr "Suma MD5 diferent"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1405
+#, fuzzy
+msgid "Hash Sum mismatch"
+msgstr "Suma MD5 diferent"
+
+#: apt-pkg/acquire-item.cc:1097
msgid "There is no public key available for the following key IDs:\n"
msgstr "No hi ha cap clau pública disponible per als següents ID de clau:\n"
-#: apt-pkg/acquire-item.cc:1219
+#: apt-pkg/acquire-item.cc:1210
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2693,7 +2697,7 @@ msgstr ""
"significar que haureu d'arreglar aquest paquet manualment (segons "
"arquitectura)."
-#: apt-pkg/acquire-item.cc:1278
+#: apt-pkg/acquire-item.cc:1269
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2702,7 +2706,7 @@ msgstr ""
"No s'ha trobat un fitxer pel paquet %s. Això podria significar que haureu "
"d'arreglar aquest paquet manualment."
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1310
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2710,7 +2714,7 @@ msgstr ""
"L'índex dels fitxers en el paquet està corromput. Fitxer no existent: camp "
"per al paquet %s."
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1397
msgid "Size mismatch"
msgstr "La mida no concorda"
@@ -2801,78 +2805,88 @@ msgstr "Les entrades de la llista de fonts per a aquest disc són:\n"
msgid "Unmounting CD-ROM...\n"
msgstr "S'esta desmuntant el CD-ROM..."
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
#, c-format
msgid "Wrote %i records.\n"
msgstr "S'han escrit %i registres.\n"
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "S'han escrit %i registres, on falten %i fitxers.\n"
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "S'han escrit %i registres, on hi ha %i fitxers no coincidents\n"
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
"S'han escrit %i registres, on falten %i fitxers i hi ha %i fitxers no "
"coincidents\n"
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:522
#, c-format
msgid "Preparing %s"
msgstr "S'està preparant el paquet %s"
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:523
#, c-format
msgid "Unpacking %s"
msgstr "S'està desempaquetant %s"
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:528
#, c-format
msgid "Preparing to configure %s"
msgstr "S'està preparant per a configurar el paquet %s"
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:529
#, c-format
msgid "Configuring %s"
msgstr "S'està configurant el paquet %s"
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:530
#, c-format
msgid "Installed %s"
msgstr "S'ha instal·lat el paquet %s"
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:535
#, c-format
msgid "Preparing for removal of %s"
msgstr "S'està preparant per a l'eliminació del paquet %s"
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:536
#, c-format
msgid "Removing %s"
msgstr "S'està eliminant el paquet %s"
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:537
#, c-format
msgid "Removed %s"
msgstr "S'ha eliminat el paquet %s"
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:542
#, c-format
msgid "Preparing to completely remove %s"
msgstr "S'està preparant per a eliminar completament el paquet %s"
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:543
#, c-format
msgid "Completely removed %s"
msgstr "S'ha eliminat completament el paquet %s"
+#: apt-pkg/deb/dpkgpm.cc:566
+#, fuzzy, c-format
+msgid "Directory '%s' missing"
+msgstr "Falta el directori de llistes %spartial."
+
+#: apt-pkg/deb/dpkgpm.cc:709
+#, fuzzy, c-format
+msgid "openpty failed\n"
+msgstr "Ha fallat la selecció"
+
#: methods/rred.cc:219
#, fuzzy
msgid "Could not patch file"
diff --git a/po/cs.po b/po/cs.po
index d4c31a2a6..a0671bfa1 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-06 06:51+0200\n"
+"POT-Creation-Date: 2007-08-04 09:09+0200\n"
"PO-Revision-Date: 2006-10-04 18:53+0200\n"
"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -158,9 +158,9 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2584 cmdline/apt-sortpkgs.cc:144
-#, c-format
-msgid "%s %s for %s %s compiled on %s %s\n"
+#: cmdline/apt-get.cc:2585 cmdline/apt-sortpkgs.cc:144
+#, fuzzy, c-format
+msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s pro %s %s zkompilován na %s %s\n"
#: cmdline/apt-cache.cc:1721
@@ -652,7 +652,7 @@ msgstr "Selhalo přejmenování %s na %s"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1673
#, c-format
msgid "Regex compilation error - %s"
msgstr "Chyba při kompilaci regulárního výrazu - %s"
@@ -813,11 +813,11 @@ msgstr "Balík je potřeba odstranit ale funkce Odstranit je vypnuta."
msgid "Internal error, Ordering didn't finish"
msgstr "Vnitřní chyba, třídění nedoběhlo do konce"
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2011 cmdline/apt-get.cc:2044
msgid "Unable to lock the download directory"
msgstr "Nemohu zamknout adresář pro stahování"
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2092 cmdline/apt-get.cc:2333
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr "Nelze přečíst seznam zdrojů."
@@ -847,7 +847,7 @@ msgstr "Po rozbalení bude na disku použito dalších %sB.\n"
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Po rozbalení bude na disku uvolněno %sB.\n"
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2186
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2187
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Nemohu určit volné místo v %s"
@@ -884,7 +884,7 @@ msgstr "Přerušeno."
msgid "Do you want to continue [Y/n]? "
msgstr "Chcete pokračovat [Y/n]? "
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2229
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2230
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Selhalo stažení %s %s\n"
@@ -893,7 +893,7 @@ msgstr "Selhalo stažení %s %s\n"
msgid "Some files failed to download"
msgstr "Některé soubory nemohly být staženy"
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2238
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2239
msgid "Download complete and in download only mode"
msgstr "Stahování dokončeno v režimu pouze stáhnout"
@@ -1027,7 +1027,7 @@ msgid ""
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1754
msgid "The following information may help to resolve the situation:"
msgstr "Následující informace vám mohou pomoci vyřešit tuto situaci:"
@@ -1040,31 +1040,31 @@ msgstr "Vnitřní chyba, řešitel problémů pokazil věci"
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Vnitřní chyba, AllUpgrade pokazil věci"
-#: cmdline/apt-get.cc:1544
+#: cmdline/apt-get.cc:1545
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "Nemohu najít balík %s"
-#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
+#: cmdline/apt-get.cc:1660 cmdline/apt-get.cc:1696
#, c-format
msgid "Couldn't find package %s"
msgstr "Nemohu najít balík %s"
-#: cmdline/apt-get.cc:1682
+#: cmdline/apt-get.cc:1683
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Pozn: vybírám %s pro regulární výraz '%s'\n"
-#: cmdline/apt-get.cc:1712
+#: cmdline/apt-get.cc:1713
#, fuzzy, c-format
msgid "%s set to manual installed.\n"
msgstr "ale %s se bude instalovat"
-#: cmdline/apt-get.cc:1725
+#: cmdline/apt-get.cc:1726
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Pro opravení následujících můžete spustit `apt-get -f install':"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1729
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1072,7 +1072,7 @@ msgstr ""
"Nesplněné závislosti. Zkuste spustit 'apt-get -f install' bez balíků (nebo "
"navrhněte řešení)."
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1741
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1083,7 +1083,7 @@ msgstr ""
"nemožnou situaci, nebo, pokud používáte nestabilní distribuci, že\n"
"vyžadované balíky ještě nebyly vytvořeny nebo přesunuty z Příchozí fronty."
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1749
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1093,124 +1093,124 @@ msgstr ""
"balík není instalovatelný a měl byste o tom zaslat hlášení o chybě\n"
"(bug report)."
-#: cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1757
msgid "Broken packages"
msgstr "Poškozené balíky"
-#: cmdline/apt-get.cc:1785
+#: cmdline/apt-get.cc:1786
msgid "The following extra packages will be installed:"
msgstr "Následující extra balíky budou instalovány:"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Suggested packages:"
msgstr "Navrhované balíky:"
-#: cmdline/apt-get.cc:1875
+#: cmdline/apt-get.cc:1876
msgid "Recommended packages:"
msgstr "Doporučované balíky:"
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1904
msgid "Calculating upgrade... "
msgstr "Propočítávám aktualizaci... "
-#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1907 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Selhalo"
-#: cmdline/apt-get.cc:1911
+#: cmdline/apt-get.cc:1912
msgid "Done"
msgstr "Hotovo"
-#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
+#: cmdline/apt-get.cc:1979 cmdline/apt-get.cc:1987
msgid "Internal error, problem resolver broke stuff"
msgstr "Vnitřní chyba, řešitel problémů pokazil věci"
-#: cmdline/apt-get.cc:2086
+#: cmdline/apt-get.cc:2087
msgid "Must specify at least one package to fetch source for"
msgstr "Musíte zadat aspoň jeden balík, pro který se stáhnou zdrojové texty"
-#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2350
+#: cmdline/apt-get.cc:2117 cmdline/apt-get.cc:2351
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Nemohu najít zdrojový balík pro %s"
-#: cmdline/apt-get.cc:2165
+#: cmdline/apt-get.cc:2166
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Přeskakuji dříve stažený soubor '%s'\n"
-#: cmdline/apt-get.cc:2189
+#: cmdline/apt-get.cc:2190
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Na %s nemáte dostatek volného místa"
-#: cmdline/apt-get.cc:2194
+#: cmdline/apt-get.cc:2195
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Potřebuji stáhnout %sB/%sB zdrojových archivů.\n"
-#: cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2198
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Potřebuji stáhnout %sB zdrojových archivů.\n"
-#: cmdline/apt-get.cc:2203
+#: cmdline/apt-get.cc:2204
#, c-format
msgid "Fetch source %s\n"
msgstr "Stáhnout zdroj %s\n"
-#: cmdline/apt-get.cc:2234
+#: cmdline/apt-get.cc:2235
msgid "Failed to fetch some archives."
msgstr "Stažení některých archivů selhalo."
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2263
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Přeskakuji rozbalení již rozbaleného zdroje v %s\n"
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2275
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Příkaz pro rozbalení '%s' selhal.\n"
-#: cmdline/apt-get.cc:2275
+#: cmdline/apt-get.cc:2276
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Zkontrolujte, zda je nainstalován balíček 'dpkg-dev'.\n"
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2293
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Příkaz pro sestavení '%s' selhal.\n"
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:2312
msgid "Child process failed"
msgstr "Synovský proces selhal"
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2328
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Musíte zadat alespoň jeden balík, pro který budou kontrolovány závislosti "
"pro sestavení"
-#: cmdline/apt-get.cc:2355
+#: cmdline/apt-get.cc:2356
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Nemohu získat závislosti pro sestavení %s"
-#: cmdline/apt-get.cc:2375
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nemá žádné závislosti pro sestavení.\n"
-#: cmdline/apt-get.cc:2427
+#: cmdline/apt-get.cc:2428
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "%s závislost pro %s nemůže být splněna, protože balík %s nebyl nalezen"
-#: cmdline/apt-get.cc:2479
+#: cmdline/apt-get.cc:2480
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1219,31 +1219,31 @@ msgstr ""
"%s závislost pro %s nemůže být splněna protože není k dispozici verze balíku "
"%s, která odpovídá požadavku na verzi"
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2515
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Selhalo splnění %s závislosti pro %s: Instalovaný balík %s je příliš nový"
-#: cmdline/apt-get.cc:2539
+#: cmdline/apt-get.cc:2540
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Selhalo splnění %s závislosti pro %s: %s"
-#: cmdline/apt-get.cc:2553
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Závislosti pro sestavení %s nemohly být splněny."
-#: cmdline/apt-get.cc:2557
+#: cmdline/apt-get.cc:2558
msgid "Failed to process build dependencies"
msgstr "Chyba při zpracování závislostí pro sestavení"
-#: cmdline/apt-get.cc:2589
+#: cmdline/apt-get.cc:2590
msgid "Supported modules:"
msgstr "Podporované moduly:"
-#: cmdline/apt-get.cc:2630
+#: cmdline/apt-get.cc:2631
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1663,25 +1663,25 @@ msgstr "Chyba při zpracování MD5. Offset %lu"
msgid "This is not a valid DEB archive, missing '%s' member"
msgstr "Toto není platný DEB archiv, chybí část '%s'"
-#: apt-inst/deb/debfile.cc:48
-#, c-format
-msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
+#: apt-inst/deb/debfile.cc:50
+#, fuzzy, c-format
+msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
msgstr "Toto není platný DEB archiv, neobsahuje část '%s' ani '%s'"
-#: apt-inst/deb/debfile.cc:108
+#: apt-inst/deb/debfile.cc:110
#, c-format
msgid "Couldn't change to %s"
msgstr "Nemohu přejít do %s"
-#: apt-inst/deb/debfile.cc:134
+#: apt-inst/deb/debfile.cc:140
msgid "Internal error, could not locate member"
msgstr "Vnitřní chyba, nemohu nalézt člen"
-#: apt-inst/deb/debfile.cc:167
+#: apt-inst/deb/debfile.cc:173
msgid "Failed to locate a valid control file"
msgstr "Nelze najít platný kontrolní soubor"
-#: apt-inst/deb/debfile.cc:252
+#: apt-inst/deb/debfile.cc:258
msgid "Unparsable control file"
msgstr "Nezpracovatelný kontrolní soubor"
@@ -2044,15 +2044,15 @@ msgstr "Chyba čtení ze serveru. Druhá strana zavřela spojení"
msgid "Error reading from server"
msgstr "Chyba čtení ze serveru"
-#: methods/http.cc:1108
+#: methods/http.cc:1104
msgid "Bad header data"
msgstr "Špatné datové záhlaví"
-#: methods/http.cc:1125
+#: methods/http.cc:1121 methods/http.cc:1176
msgid "Connection failed"
msgstr "Spojení selhalo"
-#: methods/http.cc:1216
+#: methods/http.cc:1228
msgid "Internal error"
msgstr "Vnitřní chyba"
@@ -2082,7 +2082,7 @@ msgstr "Otevírám konfigurační soubor %s"
#: apt-pkg/contrib/configuration.cc:510
#, fuzzy, c-format
-msgid "Line %d too long (max %lu)"
+msgid "Line %d too long (max %u)"
msgstr "Řádek %d je příliš dlouhý (max %d)"
#: apt-pkg/contrib/configuration.cc:606
@@ -2336,29 +2336,29 @@ msgstr "volitelný"
msgid "extra"
msgstr "extra"
-#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129
+#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
msgid "Building dependency tree"
msgstr "Vytvářím strom závislostí"
-#: apt-pkg/depcache.cc:101
+#: apt-pkg/depcache.cc:122
msgid "Candidate versions"
msgstr "Kandidátské verze"
-#: apt-pkg/depcache.cc:130
+#: apt-pkg/depcache.cc:151
msgid "Dependency generation"
msgstr "Generování závislostí"
-#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174
+#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
#, fuzzy
msgid "Reading state information"
msgstr "Slučuji dostupné informace"
-#: apt-pkg/depcache.cc:198
+#: apt-pkg/depcache.cc:219
#, fuzzy, c-format
msgid "Failed to open StateFile %s"
msgstr "Nelze otevřít %s"
-#: apt-pkg/depcache.cc:204
+#: apt-pkg/depcache.cc:225
#, fuzzy, c-format
msgid "Failed to write temporary StateFile %s"
msgstr "Selhal zápis souboru %s"
@@ -2489,17 +2489,17 @@ msgstr "Ovladač metody %s nemohl být nalezen."
msgid "Method %s did not start correctly"
msgstr "Metoda %s nebyla spuštěna správně"
-#: apt-pkg/acquire-worker.cc:381
+#: apt-pkg/acquire-worker.cc:396
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Vložte prosím disk nazvaný '%s' do mechaniky '%s' a stiskněte enter."
-#: apt-pkg/init.cc:126
+#: apt-pkg/init.cc:124
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Balíčkovací systém '%s' není podporován"
-#: apt-pkg/init.cc:142
+#: apt-pkg/init.cc:140
msgid "Unable to determine a suitable packaging system type"
msgstr "Nebylo možno určit vhodný typ balíčkovacího systému"
@@ -2635,16 +2635,20 @@ msgstr "Chyba IO při ukládání zdrojové cache"
msgid "rename failed, %s (%s -> %s)."
msgstr "přejmenování selhalo, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:401
msgid "MD5Sum mismatch"
msgstr "Neshoda MD5 součtů"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1405
+#, fuzzy
+msgid "Hash Sum mismatch"
+msgstr "Neshoda MD5 součtů"
+
+#: apt-pkg/acquire-item.cc:1097
msgid "There is no public key available for the following key IDs:\n"
msgstr "K následujícím ID klíčů není dostupný veřejný klíč:\n"
-#: apt-pkg/acquire-item.cc:1219
+#: apt-pkg/acquire-item.cc:1210
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2653,7 +2657,7 @@ msgstr ""
"Nebyl jsem schopen nalézt soubor s balíkem %s. To by mohlo znamenat, že "
"tento balík je třeba opravit ručně (kvůli chybějící architektuře)"
-#: apt-pkg/acquire-item.cc:1278
+#: apt-pkg/acquire-item.cc:1269
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2662,14 +2666,14 @@ msgstr ""
"Nebyl jsem schopen nalézt soubor s balíkem %s. Asi budete muset tento balík "
"opravit ručně."
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1310
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"Indexové soubory balíku jsou narušeny. Chybí pole Filename: u balíku %s."
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1397
msgid "Size mismatch"
msgstr "Velikosti nesouhlasí"
@@ -2760,77 +2764,87 @@ msgstr "Seznamy zdrojů na tomto disku jsou:\n"
msgid "Unmounting CD-ROM...\n"
msgstr "Odpojuji CD-ROM..."
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
#, c-format
msgid "Wrote %i records.\n"
msgstr "Zapsal jsem %i záznamů.\n"
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Zapsal jsem %i záznamů s chybějícími soubory (%i).\n"
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Zapsal jsem %i záznamů s nesouhlasícími soubory (%i).\n"
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
"Zapsal jsem %i záznamů s chybějícími (%i) a nesouhlasícími (%i) soubory.\n"
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:522
#, c-format
msgid "Preparing %s"
msgstr "Připravuji %s"
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:523
#, c-format
msgid "Unpacking %s"
msgstr "Rozbaluji %s"
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:528
#, c-format
msgid "Preparing to configure %s"
msgstr "Připravuji nastavení %s"
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:529
#, c-format
msgid "Configuring %s"
msgstr "Nastavuji %s"
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:530
#, c-format
msgid "Installed %s"
msgstr "Nainstalován %s"
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:535
#, c-format
msgid "Preparing for removal of %s"
msgstr "Připravuji odstranění %s"
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:536
#, c-format
msgid "Removing %s"
msgstr "Odstraňuji %s"
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:537
#, c-format
msgid "Removed %s"
msgstr "Odstraněn %s"
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:542
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Připravuji úplné odstranění %s"
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:543
#, c-format
msgid "Completely removed %s"
msgstr "Kompletně odstraněn %s"
+#: apt-pkg/deb/dpkgpm.cc:566
+#, fuzzy, c-format
+msgid "Directory '%s' missing"
+msgstr "Adresář seznamů %spartial chybí."
+
+#: apt-pkg/deb/dpkgpm.cc:709
+#, fuzzy, c-format
+msgid "openpty failed\n"
+msgstr "Výběr selhal"
+
#: methods/rred.cc:219
#, fuzzy
msgid "Could not patch file"
diff --git a/po/cy.po b/po/cy.po
index 2475df297..c5bf0d93e 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: APT\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-06 06:51+0200\n"
+"POT-Creation-Date: 2007-08-04 09:09+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"
@@ -174,9 +174,9 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2584 cmdline/apt-sortpkgs.cc:144
-#, c-format
-msgid "%s %s for %s %s compiled on %s %s\n"
+#: cmdline/apt-get.cc:2585 cmdline/apt-sortpkgs.cc:144
+#, fuzzy, c-format
+msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s ar gyfer %s %s wedi ei grynhow ar %s %s\n"
#: cmdline/apt-cache.cc:1721
@@ -680,7 +680,7 @@ msgstr "Methwyd ailenwi %s at %s"
msgid "Y"
msgstr "I"
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1673
#, c-format
msgid "Regex compilation error - %s"
msgstr "Gwall crynhoi patrwm - %s"
@@ -850,11 +850,11 @@ msgstr "Rhaid tynnu pecynnau on mae Tynnu wedi ei analluogi."
msgid "Internal error, Ordering didn't finish"
msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad"
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2011 cmdline/apt-get.cc:2044
msgid "Unable to lock the download directory"
msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho"
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2092 cmdline/apt-get.cc:2333
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr "Methwyd darllen y rhestr ffynhonellau."
@@ -883,7 +883,7 @@ msgstr "Ar ôl dadbacio defnyddir %sB o ofod disg ychwanegol.\n"
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Ar ôl dadbactio caiff %sB o ofod disg ei rhyddhau.\n"
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2186
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2187
#, fuzzy, c-format
msgid "Couldn't determine free space in %s"
msgstr "Does dim digon o le rhydd yn %s gennych"
@@ -921,7 +921,7 @@ msgstr "Erthylu."
msgid "Do you want to continue [Y/n]? "
msgstr "Ydych chi eisiau mynd ymlaen? [Y/n] "
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2229
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2230
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Methwyd cyrchu %s %s\n"
@@ -930,7 +930,7 @@ msgstr "Methwyd cyrchu %s %s\n"
msgid "Some files failed to download"
msgstr "Methodd rhai ffeiliau lawrlwytho"
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2238
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2239
msgid "Download complete and in download only mode"
msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig"
@@ -1067,7 +1067,7 @@ msgid ""
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1754
msgid "The following information may help to resolve the situation:"
msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:"
@@ -1081,32 +1081,32 @@ msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
-#: cmdline/apt-get.cc:1544
+#: cmdline/apt-get.cc:1545
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "Methwyd canfod pecyn %s"
-#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
+#: cmdline/apt-get.cc:1660 cmdline/apt-get.cc:1696
#, c-format
msgid "Couldn't find package %s"
msgstr "Methwyd canfod pecyn %s"
-#: cmdline/apt-get.cc:1682
+#: cmdline/apt-get.cc:1683
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n"
-#: cmdline/apt-get.cc:1712
+#: cmdline/apt-get.cc:1713
#, fuzzy, c-format
msgid "%s set to manual installed.\n"
msgstr "ond mae %s yn mynd i gael ei sefydlu"
-#: cmdline/apt-get.cc:1725
+#: cmdline/apt-get.cc:1726
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Efallai hoffech rhedeg `apt-get -f install' er mwyn cywiro'r rhain:"
# FIXME
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1729
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1115,7 +1115,7 @@ msgstr ""
"pecyn (neu penodwch ddatrys)"
# FIXME: needs commas
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1741
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1128,7 +1128,7 @@ msgstr ""
"heb gael eu symud allan o Incoming."
# FIXME: commas, wrapping
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1749
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1137,118 +1137,118 @@ msgstr ""
"Gan y gofynnoch am weithred syml yn unig, mae'n debygol nad yw'r pecyn\n"
"yn sefydladwy a dylid cyflwyno adroddiad nam yn erbyn y pecyn hwnnw."
-#: cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1757
msgid "Broken packages"
msgstr "Pecynnau wedi torri"
-#: cmdline/apt-get.cc:1785
+#: cmdline/apt-get.cc:1786
msgid "The following extra packages will be installed:"
msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Suggested packages:"
msgstr "Pecynnau a awgrymmir:"
-#: cmdline/apt-get.cc:1875
+#: cmdline/apt-get.cc:1876
msgid "Recommended packages:"
msgstr "Pecynnau a argymhellir:"
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1904
#, fuzzy
msgid "Calculating upgrade... "
msgstr "Yn Cyfrifo'r Uwchraddiad... "
-#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1907 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Methwyd"
-#: cmdline/apt-get.cc:1911
+#: cmdline/apt-get.cc:1912
msgid "Done"
msgstr "Wedi Gorffen"
-#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
+#: cmdline/apt-get.cc:1979 cmdline/apt-get.cc:1987
#, fuzzy
msgid "Internal error, problem resolver broke stuff"
msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
-#: cmdline/apt-get.cc:2086
+#: cmdline/apt-get.cc:2087
msgid "Must specify at least one package to fetch source for"
msgstr "Rhaid penodi o leiaf un pecyn i gyrchi ffynhonell ar ei gyfer"
-#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2350
+#: cmdline/apt-get.cc:2117 cmdline/apt-get.cc:2351
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s"
-#: cmdline/apt-get.cc:2165
+#: cmdline/apt-get.cc:2166
#, fuzzy, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n"
-#: cmdline/apt-get.cc:2189
+#: cmdline/apt-get.cc:2190
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Does dim digon o le rhydd yn %s gennych"
-#: cmdline/apt-get.cc:2194
+#: cmdline/apt-get.cc:2195
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Rhaid cyrchu %sB/%sB o archifau ffynhonell.\n"
-#: cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2198
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n"
-#: cmdline/apt-get.cc:2203
+#: cmdline/apt-get.cc:2204
#, fuzzy, c-format
msgid "Fetch source %s\n"
msgstr "Cyrchu Ffynhonell %s\n"
-#: cmdline/apt-get.cc:2234
+#: cmdline/apt-get.cc:2235
msgid "Failed to fetch some archives."
msgstr "Methwyd cyrchu rhai archifau."
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2263
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n"
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2275
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Methodd y gorchymyn dadbacio '%s'.\n"
-#: cmdline/apt-get.cc:2275
+#: cmdline/apt-get.cc:2276
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2293
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Methodd y gorchymyn adeiladu '%s'.\n"
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:2312
msgid "Child process failed"
msgstr "Methodd proses plentyn"
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2328
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Rhaid penodi o leiaf un pecyn i wirio dibyniaethau adeiladu ar eu cyfer"
-#: cmdline/apt-get.cc:2355
+#: cmdline/apt-get.cc:2356
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Ni ellir cyrchu manylion dibyniaeth adeiladu ar gyfer %s"
-#: cmdline/apt-get.cc:2375
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "%s has no build depends.\n"
msgstr "Nid oes dibyniaethau adeiladu gan %s.\n"
-#: cmdline/apt-get.cc:2427
+#: cmdline/apt-get.cc:2428
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1257,7 +1257,7 @@ msgstr ""
"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn %"
"s"
-#: cmdline/apt-get.cc:2479
+#: cmdline/apt-get.cc:2480
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1266,34 +1266,34 @@ msgstr ""
"Ni ellir bodloni'r dibyniaeth %s ar gyfer %s oherwydd does dim fersiwn sydd "
"ar gael o'r pecyn %s yn gallu bodloni'r gofynion ferswin"
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2515
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Methwyd bodloni dibynniaeth %s am %s: Mae'r pecyn sefydliedig %s yn rhy "
"newydd"
-#: cmdline/apt-get.cc:2539
+#: cmdline/apt-get.cc:2540
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Methwyd bodloni dibyniaeth %s am %s: %s"
-#: cmdline/apt-get.cc:2553
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s."
-#: cmdline/apt-get.cc:2557
+#: cmdline/apt-get.cc:2558
msgid "Failed to process build dependencies"
msgstr "Methwyd prosesu dibyniaethau adeiladu"
-#: cmdline/apt-get.cc:2589
+#: cmdline/apt-get.cc:2590
#, fuzzy
msgid "Supported modules:"
msgstr "Modylau a Gynhelir:"
# FIXME: split
-#: cmdline/apt-get.cc:2630
+#: cmdline/apt-get.cc:2631
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1733,26 +1733,26 @@ msgstr "Gwall wrth ramadegu MD5. Atred: %lu"
msgid "This is not a valid DEB archive, missing '%s' member"
msgstr "Nid yw hyn yn archif DEB dilys, aelod '%s' ar goll"
-#: apt-inst/deb/debfile.cc:48
+#: apt-inst/deb/debfile.cc:50
#, fuzzy, c-format
-msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
+msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
msgstr "Nid yw hyn yn archif DEB dilys, aelod '%s' ar goll"
-#: apt-inst/deb/debfile.cc:108
+#: apt-inst/deb/debfile.cc:110
#, c-format
msgid "Couldn't change to %s"
msgstr "Methwyd newid i %s"
-#: apt-inst/deb/debfile.cc:134
+#: apt-inst/deb/debfile.cc:140
#, fuzzy
msgid "Internal error, could not locate member"
msgstr "Gwall Methwyd, methwyd lleoli aelod"
-#: apt-inst/deb/debfile.cc:167
+#: apt-inst/deb/debfile.cc:173
msgid "Failed to locate a valid control file"
msgstr "Methwyd lleoli ffeil rheoli dilys"
-#: apt-inst/deb/debfile.cc:252
+#: apt-inst/deb/debfile.cc:258
#, fuzzy
msgid "Unparsable control file"
msgstr "Ffeil rheoli ni ellir ei ramadegu"
@@ -2127,16 +2127,16 @@ msgstr "Gwall wrth ddarllen o'r gweinydd: caeodd yr ochr pell y cysylltiad"
msgid "Error reading from server"
msgstr "Gwall wrth ddarllen o'r gweinydd"
-#: methods/http.cc:1108
+#: methods/http.cc:1104
#, fuzzy
msgid "Bad header data"
msgstr "Data pennawd gwael"
-#: methods/http.cc:1125
+#: methods/http.cc:1121 methods/http.cc:1176
msgid "Connection failed"
msgstr "Methodd y cysylltiad"
-#: methods/http.cc:1216
+#: methods/http.cc:1228
msgid "Internal error"
msgstr "Gwall mewnol"
@@ -2166,7 +2166,7 @@ msgstr "Yn agor y ffeil cyfluniad %s"
#: apt-pkg/contrib/configuration.cc:510
#, fuzzy, c-format
-msgid "Line %d too long (max %lu)"
+msgid "Line %d too long (max %u)"
msgstr "Linell %d yn rhy hir (uchaf %d)"
#: apt-pkg/contrib/configuration.cc:606
@@ -2426,32 +2426,32 @@ msgstr "opsiynnol"
msgid "extra"
msgstr "ychwanegol"
-#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129
+#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
#, fuzzy
msgid "Building dependency tree"
msgstr "Yn Aideladu Coeden Dibyniaeth"
-#: apt-pkg/depcache.cc:101
+#: apt-pkg/depcache.cc:122
#, fuzzy
msgid "Candidate versions"
msgstr "Fersiynau Posib"
-#: apt-pkg/depcache.cc:130
+#: apt-pkg/depcache.cc:151
#, fuzzy
msgid "Dependency generation"
msgstr "Cynhyrchaid Dibyniaeth"
-#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174
+#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
#, fuzzy
msgid "Reading state information"
msgstr "Yn cyfuno manylion Ar Gael"
-#: apt-pkg/depcache.cc:198
+#: apt-pkg/depcache.cc:219
#, fuzzy, c-format
msgid "Failed to open StateFile %s"
msgstr "Methwyd agor %s"
-#: apt-pkg/depcache.cc:204
+#: apt-pkg/depcache.cc:225
#, fuzzy, c-format
msgid "Failed to write temporary StateFile %s"
msgstr "Methwyd ysgrifennu ffeil %s"
@@ -2588,7 +2588,7 @@ msgstr "Methwyd canfod y gyrrydd dull %s."
msgid "Method %s did not start correctly"
msgstr "Ni gychwynodd y dull %s yn gywir"
-#: apt-pkg/acquire-worker.cc:381
+#: apt-pkg/acquire-worker.cc:396
#, fuzzy, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
@@ -2596,12 +2596,12 @@ msgstr ""
" '%s'\n"
"yn y gyrriant '%s' a gwasgwch Enter\n"
-#: apt-pkg/init.cc:126
+#: apt-pkg/init.cc:124
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Ni chynhelir y system pecynnu '%s'"
-#: apt-pkg/init.cc:142
+#: apt-pkg/init.cc:140
#, fuzzy
msgid "Unable to determine a suitable packaging system type"
msgstr "Ni ellir canfod math system addas"
@@ -2740,17 +2740,21 @@ msgstr "Gwall M/A wrth gadw'r storfa ffynhonell"
msgid "rename failed, %s (%s -> %s)."
msgstr "methwyd ailenwi, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:401
msgid "MD5Sum mismatch"
msgstr "Camgyfatebiaeth swm MD5"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1405
+#, fuzzy
+msgid "Hash Sum mismatch"
+msgstr "Camgyfatebiaeth swm MD5"
+
+#: apt-pkg/acquire-item.cc:1097
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
# FIXME: case
-#: apt-pkg/acquire-item.cc:1219
+#: apt-pkg/acquire-item.cc:1210
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2759,7 +2763,7 @@ msgstr ""
"Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi "
"drwsio'r pecyn hyn a law. (Oherwydd pensaerniaeth coll.)"
-#: apt-pkg/acquire-item.cc:1278
+#: apt-pkg/acquire-item.cc:1269
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2768,14 +2772,14 @@ msgstr ""
"Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi "
"drwsio'r pecyn hyn a law."
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1310
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"Mae'r ffeiliau mynegai pecyn yn llygr. Dim maes Filename: gan y pecyn %s."
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1397
msgid "Size mismatch"
msgstr "Camgyfatebiaeth maint"
@@ -2865,76 +2869,86 @@ msgstr ""
msgid "Unmounting CD-ROM...\n"
msgstr "CD Anghywir"
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
#, c-format
msgid "Wrote %i records.\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:522
#, fuzzy, c-format
msgid "Preparing %s"
msgstr "Yn agor %s"
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:523
#, fuzzy, c-format
msgid "Unpacking %s"
msgstr "Yn agor %s"
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:528
#, fuzzy, c-format
msgid "Preparing to configure %s"
msgstr "Yn agor y ffeil cyfluniad %s"
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:529
#, fuzzy, c-format
msgid "Configuring %s"
msgstr "Yn cysylltu i %s"
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:530
#, fuzzy, c-format
msgid "Installed %s"
msgstr " Wedi Sefydlu: "
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:535
#, c-format
msgid "Preparing for removal of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:536
#, fuzzy, c-format
msgid "Removing %s"
msgstr "Yn agor %s"
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:537
#, fuzzy, c-format
msgid "Removed %s"
msgstr "Argymell"
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:542
#, fuzzy, c-format
msgid "Preparing to completely remove %s"
msgstr "Yn agor y ffeil cyfluniad %s"
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:543
#, fuzzy, c-format
msgid "Completely removed %s"
msgstr "Methwyd dileu %s"
+#: apt-pkg/deb/dpkgpm.cc:566
+#, fuzzy, c-format
+msgid "Directory '%s' missing"
+msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll."
+
+#: apt-pkg/deb/dpkgpm.cc:709
+#, fuzzy, c-format
+msgid "openpty failed\n"
+msgstr "Methwyd dewis"
+
#: methods/rred.cc:219
#, fuzzy
msgid "Could not patch file"
diff --git a/po/da.po b/po/da.po
index 9f66c47b9..1dad03726 100644
--- a/po/da.po
+++ b/po/da.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-da\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-06 06:51+0200\n"
-"PO-Revision-Date: 2007-02-03 15:50+0100\n"
+"POT-Creation-Date: 2007-08-04 12:41+0200\n"
+"PO-Revision-Date: 2007-09-06 21:40+0200\n"
"Last-Translator: Claus Hindsgaul <claus.hindsgaul@gmail.com>\n"
"Language-Team: Danish\n"
"MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgstr ""
#: cmdline/apt-cache.cc:143
#, c-format
msgid "Package %s version %s has an unmet dep:\n"
-msgstr "Pakken %s version %s har en uopfyldt afh�ngighed:\n"
+msgstr "<Pakken %s version %s har en uopfyldt afh�ngighed:\n"
#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640
#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018
@@ -60,26 +60,24 @@ msgid "Total distinct versions: "
msgstr "Totale forskellige versioner: "
#: cmdline/apt-cache.cc:295
-#, fuzzy
msgid "Total Distinct Descriptions: "
-msgstr "Totale forskellige versioner: "
+msgstr "Sammenlagt forskellige beskrivelser: "
#: cmdline/apt-cache.cc:297
msgid "Total dependencies: "
-msgstr "Totale afh�ngigheder: "
+msgstr "Sammenlagt afh�ngigheder: "
#: cmdline/apt-cache.cc:300
msgid "Total ver/file relations: "
-msgstr "Totale version/fil-relationer: "
+msgstr "Sammenlagt version/fil-relationer: "
#: cmdline/apt-cache.cc:302
-#, fuzzy
msgid "Total Desc/File relations: "
-msgstr "Totale version/fil-relationer: "
+msgstr "Sammenlagt version/fil-relationer: "
#: cmdline/apt-cache.cc:304
msgid "Total Provides mappings: "
-msgstr "Totale 'tilbyder'-markeringer: "
+msgstr "Sammenlagt 'Tilbyder'-markeringer: "
#: cmdline/apt-cache.cc:316
msgid "Total globbed strings: "
@@ -164,10 +162,10 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2584 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2585 cmdline/apt-sortpkgs.cc:144
#, c-format
-msgid "%s %s for %s %s compiled on %s %s\n"
-msgstr "%s %s for %s %s oversat p� %s %s\n"
+msgid "%s %s for %s compiled on %s %s\n"
+msgstr "%s %s for %s oversat %s %s\n"
#: cmdline/apt-cache.cc:1721
msgid ""
@@ -660,7 +658,7 @@ msgstr "Kunne ikke omd�be %s til %s"
msgid "Y"
msgstr "J"
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1673
#, c-format
msgid "Regex compilation error - %s"
msgstr "Fejl ved tolkning af regul�rt udtryk - %s"
@@ -791,7 +789,7 @@ msgstr "Uopfyldte afh�ngigheder. Pr�v med -f."
#: cmdline/apt-get.cc:704
msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "ADVARSEL: F�lgende pakkers autensitet kunne ikke verificeres!"
+msgstr "ADVARSEL: F�lgende pakkers autenticitet kunne ikke verificeres!"
#: cmdline/apt-get.cc:708
msgid "Authentication warning overridden.\n"
@@ -821,11 +819,11 @@ msgstr "Pakker skal afinstalleres, men Remove er deaktiveret."
msgid "Internal error, Ordering didn't finish"
msgstr "Intern fejl. Sortering blev ikke fuldf�rt"
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2011 cmdline/apt-get.cc:2044
msgid "Unable to lock the download directory"
msgstr "Kunne ikke l�se nedhentningsmappen"
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2092 cmdline/apt-get.cc:2333
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr "Listen med kilder kunne ikke l�ses."
@@ -854,7 +852,7 @@ msgstr "Efter udpakning vil %sB yderligere diskplads v�re brugt.\n"
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Efter udpakning vil %sB diskplads blive frigjort.\n"
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2186
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2187
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Kunne ikke bestemme ledig plads i %s"
@@ -891,7 +889,7 @@ msgstr "Afbryder."
msgid "Do you want to continue [Y/n]? "
msgstr "Vil du forts�tte [J/n]? "
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2229
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2230
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Kunne ikke hente %s %s\n"
@@ -900,7 +898,7 @@ msgstr "Kunne ikke hente %s %s\n"
msgid "Some files failed to download"
msgstr "Nedhentningen af filer mislykkedes"
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2238
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2239
msgid "Download complete and in download only mode"
msgstr "Nedhentning afsluttet i 'hent-kun'-tilstand"
@@ -1018,62 +1016,64 @@ msgstr ""
#: cmdline/apt-get.cc:1433
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
+"Det er ikke meningen, at vi skal slette ting og sager, kan ikke starte "
+"AutoRemover"
#: cmdline/apt-get.cc:1465
-#, fuzzy
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
-msgstr "F�lgende NYE pakker vil blive installeret:"
+msgstr "F�lgende pakker blev installeret automatisk, og beh�ves ikke l�ngere:"
#: cmdline/apt-get.cc:1467
msgid "Use 'apt-get autoremove' to remove them."
-msgstr ""
+msgstr "Brug 'apt-get autoremove' til at fjerne dem."
#: cmdline/apt-get.cc:1472
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
msgstr ""
+"Hmm, det lader til at AutoRemover smadrede noget, der virkelig ikke\n"
+"burde kunne ske. Indsend venligst en fejlrapport om apt."
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1754
msgid "The following information may help to resolve the situation:"
msgstr "F�lgende oplysninger kan hj�lpe dig med at klare situationen:"
#: cmdline/apt-get.cc:1479
-#, fuzzy
msgid "Internal Error, AutoRemover broke stuff"
-msgstr "Intern fejl. Probleml�seren �delagde noget"
+msgstr "Intern fejl. AutoRemover �delagde noget"
#: cmdline/apt-get.cc:1498
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Intern fejl, AllUpgrade �delagde noget"
-#: cmdline/apt-get.cc:1544
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:1545
+#, c-format
msgid "Couldn't find task %s"
-msgstr "Kunne ikke finde pakken %s"
+msgstr "Kunne ikke finde opgaven %s"
-#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
+#: cmdline/apt-get.cc:1660 cmdline/apt-get.cc:1696
#, c-format
msgid "Couldn't find package %s"
msgstr "Kunne ikke finde pakken %s"
-#: cmdline/apt-get.cc:1682
+#: cmdline/apt-get.cc:1683
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Bem�rk, v�lger %s som regul�rt udtryk '%s'\n"
-#: cmdline/apt-get.cc:1712
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:1713
+#, c-format
msgid "%s set to manual installed.\n"
-msgstr "men %s forventes installeret"
+msgstr "%s sat til manuelt installeret.\n"
-#: cmdline/apt-get.cc:1725
+#: cmdline/apt-get.cc:1726
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Du kan muligvis rette det ved at k�re 'apt-get -f install':"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1729
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1081,7 +1081,7 @@ msgstr ""
"Uopfyldte afh�ngigheder. Pr�v 'apt-get -f install' uden pakker (eller angiv "
"en l�sning)."
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1741
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1092,7 +1092,7 @@ msgstr ""
"en umulig situation eller bruger den ustabile distribution, hvor enkelte\n"
"pakker endnu ikke er lavet eller gjort tilg�ngelige."
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1749
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1101,115 +1101,115 @@ msgstr ""
"Siden du kan bad om en enkelt handling, kan pakken h�jst sandsynligt slet\n"
"ikke installeres og du b�r indsende en fejlrapport for denne pakke."
-#: cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1757
msgid "Broken packages"
msgstr "�delagte pakker"
-#: cmdline/apt-get.cc:1785
+#: cmdline/apt-get.cc:1786
msgid "The following extra packages will be installed:"
msgstr "F�lgende yderligere pakker vil blive installeret:"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Suggested packages:"
msgstr "Foresl�ede pakker:"
-#: cmdline/apt-get.cc:1875
+#: cmdline/apt-get.cc:1876
msgid "Recommended packages:"
msgstr "Anbefalede pakker:"
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1904
msgid "Calculating upgrade... "
msgstr "Beregner opgraderingen... "
-#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1907 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Mislykkedes"
-#: cmdline/apt-get.cc:1911
+#: cmdline/apt-get.cc:1912
msgid "Done"
msgstr "F�rdig"
-#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
+#: cmdline/apt-get.cc:1979 cmdline/apt-get.cc:1987
msgid "Internal error, problem resolver broke stuff"
msgstr "Intern fejl. Probleml�seren �delagde noget"
-#: cmdline/apt-get.cc:2086
+#: cmdline/apt-get.cc:2087
msgid "Must specify at least one package to fetch source for"
msgstr "Du skal angive mindst �n pakke at hente kildeteksten til"
-#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2350
+#: cmdline/apt-get.cc:2117 cmdline/apt-get.cc:2351
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Kunne ikke finde kildetekstpakken for %s"
-#: cmdline/apt-get.cc:2165
+#: cmdline/apt-get.cc:2166
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Overspringer allerede hentet fil '%s'\n"
-#: cmdline/apt-get.cc:2189
+#: cmdline/apt-get.cc:2190
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Du har ikke nok ledig plads i %s"
-#: cmdline/apt-get.cc:2194
+#: cmdline/apt-get.cc:2195
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "%sB/%sB skal hentes fra kildetekst-arkiverne.\n"
-#: cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2198
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "%sB skal hentes fra kildetekst-arkiverne.\n"
-#: cmdline/apt-get.cc:2203
+#: cmdline/apt-get.cc:2204
#, c-format
msgid "Fetch source %s\n"
msgstr "Henter kildetekst %s\n"
-#: cmdline/apt-get.cc:2234
+#: cmdline/apt-get.cc:2235
msgid "Failed to fetch some archives."
msgstr "Nogle arkiver kunne ikke hentes."
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2263
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Overspringer udpakning af allerede udpakket kildetekst i %s\n"
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2275
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Udpakningskommandoen '%s' fejlede.\n"
-#: cmdline/apt-get.cc:2275
+#: cmdline/apt-get.cc:2276
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Tjek om pakken 'dpkg-dev' er installeret.\n"
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2293
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Opbygningskommandoen '%s' fejlede.\n"
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:2312
msgid "Child process failed"
msgstr "Barneprocessen fejlede"
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2328
msgid "Must specify at least one package to check builddeps for"
msgstr "Skal angive mindst �n pakke at tjekke opbygningsafh�ngigheder for"
-#: cmdline/apt-get.cc:2355
+#: cmdline/apt-get.cc:2356
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Kunne ikke hente oplysninger om opbygningsafh�ngigheder for %s"
-#: cmdline/apt-get.cc:2375
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s har ingen opbygningsafh�ngigheder.\n"
-#: cmdline/apt-get.cc:2427
+#: cmdline/apt-get.cc:2428
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1217,7 +1217,7 @@ msgid ""
msgstr ""
"%s-afh�ngigheden for %s kan ikke opfyldes, da pakken %s ikke blev fundet"
-#: cmdline/apt-get.cc:2479
+#: cmdline/apt-get.cc:2480
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1226,33 +1226,32 @@ msgstr ""
"%s-afh�ngigheden for %s kan ikke opfyldes, da ingen af de tilg�ngelige "
"udgaver af pakken %s kan tilfredsstille versions-kravene"
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2515
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Kunne ikke opfylde %s-afh�ngigheden for %s: Den installerede pakke %s er for "
"ny"
-#: cmdline/apt-get.cc:2539
+#: cmdline/apt-get.cc:2540
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Kunne ikke opfylde %s-afh�ngigheden for %s: %s"
-#: cmdline/apt-get.cc:2553
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Opbygningsafh�ngigheden for %s kunne ikke opfyldes."
-#: cmdline/apt-get.cc:2557
+#: cmdline/apt-get.cc:2558
msgid "Failed to process build dependencies"
msgstr "Kunne ikke behandler opbygningsafh�ngighederne"
-#: cmdline/apt-get.cc:2589
+#: cmdline/apt-get.cc:2590
msgid "Supported modules:"
msgstr "Underst�ttede moduler:"
-#: cmdline/apt-get.cc:2630
-#, fuzzy
+#: cmdline/apt-get.cc:2631
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1307,6 +1306,7 @@ msgstr ""
" upgrade - Udf�r en opgradering\n"
" install - Install�r nye pakker (pakke er libc6, ikke libc6.deb)\n"
" remove - Afinstall�r pakker\n"
+" purge - Fjern og udrens pakker\n"
" source - Hent kildetekstarkiver\n"
" build-dep - S�t opbygningsafh�ngigheder op for kildetekstpakker\n"
" dist-upgrade - Distributionsopgradering, se apt-get(8)\n"
@@ -1677,26 +1677,27 @@ msgstr "Fejl under tolkning af MD5. Forskydning %lu"
msgid "This is not a valid DEB archive, missing '%s' member"
msgstr "Dette er ikke et gyldigt DEB-arkiv, mangler '%s'-elementet"
-#: apt-inst/deb/debfile.cc:48
+#: apt-inst/deb/debfile.cc:50
#, c-format
-msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
+msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
msgstr ""
-"Dette er ikke et gyldigt DEB-arkiv, det har intet'%s- eller %s-elementet"
+"Dette er ikke et gyldigt DEB-arkiv, det har intet''%s', '%s' eller '%s'-"
+"elementet"
-#: apt-inst/deb/debfile.cc:108
+#: apt-inst/deb/debfile.cc:110
#, c-format
msgid "Couldn't change to %s"
msgstr "Kunne ikke skifte til %s"
-#: apt-inst/deb/debfile.cc:134
+#: apt-inst/deb/debfile.cc:140
msgid "Internal error, could not locate member"
msgstr "Intern fejl, kunne ikke finde element"
-#: apt-inst/deb/debfile.cc:167
+#: apt-inst/deb/debfile.cc:173
msgid "Failed to locate a valid control file"
msgstr "Kunne ikke finde en gyldig kontrolfil"
-#: apt-inst/deb/debfile.cc:252
+#: apt-inst/deb/debfile.cc:258
msgid "Unparsable control file"
msgstr "Ikke-tolkbar kontrolfil"
@@ -2061,15 +2062,15 @@ msgstr "Fejl ved l�sning fra serveren. Den fjerne ende lukkede forbindelsen"
msgid "Error reading from server"
msgstr "Fejl ved l�sning fra server"
-#: methods/http.cc:1108
+#: methods/http.cc:1104
msgid "Bad header data"
msgstr "Ugyldige hoved-data"
-#: methods/http.cc:1125
+#: methods/http.cc:1121 methods/http.cc:1176
msgid "Connection failed"
msgstr "Forbindelsen mislykkedes"
-#: methods/http.cc:1216
+#: methods/http.cc:1228
msgid "Internal error"
msgstr "Intern fejl"
@@ -2098,9 +2099,9 @@ msgid "Opening configuration file %s"
msgstr "�bner konfigurationsfilen %s"
#: apt-pkg/contrib/configuration.cc:510
-#, fuzzy, c-format
-msgid "Line %d too long (max %lu)"
-msgstr "Linjen %d er for lang (m� h�jst v�re %d)"
+#, c-format
+msgid "Line %d too long (max %u)"
+msgstr "Linjen %d er for lang (maks %u)"
#: apt-pkg/contrib/configuration.cc:606
#, c-format
@@ -2330,7 +2331,7 @@ msgstr "Overfl�digg�r"
#: apt-pkg/pkgcache.cc:226
msgid "Breaks"
-msgstr ""
+msgstr "�del�gger"
#: apt-pkg/pkgcache.cc:237
msgid "important"
@@ -2352,32 +2353,31 @@ msgstr "frivillig"
msgid "extra"
msgstr "ekstra"
-#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129
+#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
msgid "Building dependency tree"
msgstr "Opbygger afh�ngighedstr�"
-#: apt-pkg/depcache.cc:101
+#: apt-pkg/depcache.cc:122
msgid "Candidate versions"
msgstr "Kandidatversioner"
-#: apt-pkg/depcache.cc:130
+#: apt-pkg/depcache.cc:151
msgid "Dependency generation"
msgstr "Afh�ngighedsgenerering"
-#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174
-#, fuzzy
+#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
msgid "Reading state information"
-msgstr "Sammenfletter tilg�ngelighedsoplysninger"
+msgstr "L�ser tilstandsoplysninger"
-#: apt-pkg/depcache.cc:198
-#, fuzzy, c-format
+#: apt-pkg/depcache.cc:219
+#, c-format
msgid "Failed to open StateFile %s"
-msgstr "Kunne ikke �bne %s"
+msgstr "Kunne ikke �bne StateFile %s"
-#: apt-pkg/depcache.cc:204
-#, fuzzy, c-format
+#: apt-pkg/depcache.cc:225
+#, c-format
msgid "Failed to write temporary StateFile %s"
-msgstr "Kunne ikke skrive filen %s"
+msgstr "Kunne ikke skrive den midlertidige StateFile %s"
#: apt-pkg/tagfile.cc:102
#, c-format
@@ -2508,17 +2508,17 @@ msgstr "Metodedriveren %s blev ikke fundet."
msgid "Method %s did not start correctly"
msgstr "Metoden %s startede ikke korrekt"
-#: apt-pkg/acquire-worker.cc:381
+#: apt-pkg/acquire-worker.cc:396
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Inds�t disken med navnet: '%s' i drevet '%s' og tryk retur."
-#: apt-pkg/init.cc:126
+#: apt-pkg/init.cc:124
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Pakkesystemet '%s' underst�ttes ikke"
-#: apt-pkg/init.cc:142
+#: apt-pkg/init.cc:140
msgid "Unable to determine a suitable packaging system type"
msgstr "Kunne ikke bestemme en passende pakkesystemtype"
@@ -2567,9 +2567,9 @@ msgid "Error occurred while processing %s (UsePackage1)"
msgstr "Der skete en fejl under behandlingen af %s (UsePackage1)"
#: apt-pkg/pkgcachegen.cc:153
-#, fuzzy, c-format
+#, c-format
msgid "Error occurred while processing %s (NewFileDesc1)"
-msgstr "Der skete en fejl under behandlingen af %s (NewFileVer1)"
+msgstr "Der skete en fejl under behandlingen af %s (NewFileDesc1)"
#: apt-pkg/pkgcachegen.cc:178
#, c-format
@@ -2597,9 +2597,9 @@ msgid "Error occurred while processing %s (NewVersion2)"
msgstr "Der skete en fejl under behandlingen af %s (NewVersion2)"
#: apt-pkg/pkgcachegen.cc:245
-#, fuzzy, c-format
+#, c-format
msgid "Error occurred while processing %s (NewFileDesc2)"
-msgstr "Der skete en fejl under behandlingen af %s (NewFileVer1)"
+msgstr "Der skete en fejl under behandlingen af %s (NewFileDesc2)"
#: apt-pkg/pkgcachegen.cc:251
msgid "Wow, you exceeded the number of package names this APT is capable of."
@@ -2611,7 +2611,6 @@ msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr "Hold da op! Du n�ede over det antal versioner, denne APT kan h�ndtere."
#: apt-pkg/pkgcachegen.cc:257
-#, fuzzy
msgid "Wow, you exceeded the number of descriptions this APT is capable of."
msgstr "Hold da op! Du n�ede over det antal versioner, denne APT kan h�ndtere."
@@ -2653,17 +2652,22 @@ msgstr "IO-fejl ved gemning af kilde-mellemlageret"
msgid "rename failed, %s (%s -> %s)."
msgstr "omd�bning mislykkedes, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:401
msgid "MD5Sum mismatch"
msgstr "MD5Sum stemmer ikke"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1405
+#, fuzzy
+#| msgid "MD5Sum mismatch"
+msgid "Hash Sum mismatch"
+msgstr "MD5Sum stemmer ikke"
+
+#: apt-pkg/acquire-item.cc:1097
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"Der er ingen tilg�ngelige offentlige n�gler for f�lgende n�gle-ID'er:\n"
-#: apt-pkg/acquire-item.cc:1219
+#: apt-pkg/acquire-item.cc:1210
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2672,7 +2676,7 @@ msgstr ""
"Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er "
"n�dt til manuelt at reparere denne pakke. (grundet manglende arch)"
-#: apt-pkg/acquire-item.cc:1278
+#: apt-pkg/acquire-item.cc:1269
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2681,13 +2685,13 @@ msgstr ""
"Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er "
"n�dt til manuelt at reparere denne pakke."
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1310
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "Pakkeindeksfilerne er i stykker. Intet 'Filename:'-felt for pakken %s."
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1397
msgid "Size mismatch"
msgstr "St�rrelsen stemmer ikke"
@@ -2737,16 +2741,18 @@ msgid "Scanning disc for index files..\n"
msgstr "Skanner disken for indeksfiler..\n"
#: apt-pkg/cdrom.cc:671
-#, fuzzy, c-format
+#, c-format
msgid ""
"Found %i package indexes, %i source indexes, %i translation indexes and %i "
"signatures\n"
-msgstr "Fandt %i pakkeindekser, %i kildeindekser og %i signaturer\n"
+msgstr ""
+"Fandt %i pakkeindekser, %i kildeindekser, %i overs�ttelsesindekser og %i "
+"signaturer\n"
#: apt-pkg/cdrom.cc:708
-#, fuzzy, c-format
+#, c-format
msgid "Found label '%s'\n"
-msgstr "Gemt m�rkat: %s \n"
+msgstr "Fandt m�rkatet '%s'\n"
#: apt-pkg/cdrom.cc:737
msgid "That is not a valid name, try again.\n"
@@ -2774,80 +2780,91 @@ msgid "Source list entries for this disc are:\n"
msgstr "Denne disk har f�lgende kildeliste-indgange:\n"
#: apt-pkg/cdrom.cc:834
-#, fuzzy
msgid "Unmounting CD-ROM...\n"
-msgstr "Afmonterer cdrom..."
+msgstr "Afmonterer cdrom...\n"
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
#, c-format
msgid "Wrote %i records.\n"
msgstr "Skrev %i poster.\n"
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Skrev %i poster med %i manglende filer.\n"
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Skrev %i poster med %i ikke-trufne filer\n"
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "Skrev %i poster med %i manglende filer og %i ikke-trufne filer\n"
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:522
#, c-format
msgid "Preparing %s"
msgstr "Klarg�r %s"
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:523
#, c-format
msgid "Unpacking %s"
msgstr "Pakker %s ud"
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:528
#, c-format
msgid "Preparing to configure %s"
msgstr "G�r klar til at s�tte %s op"
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:529
#, c-format
msgid "Configuring %s"
msgstr "S�tter %s op"
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:530
#, c-format
msgid "Installed %s"
msgstr "Installerede %s"
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:535
#, c-format
msgid "Preparing for removal of %s"
msgstr "G�r klar til afinstallation af %s"
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:536
#, c-format
msgid "Removing %s"
msgstr "Fjerner %s"
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:537
#, c-format
msgid "Removed %s"
msgstr "Fjernede %s"
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:542
#, c-format
msgid "Preparing to completely remove %s"
msgstr "G�r klar til at fjerne %s helt"
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:543
#, c-format
msgid "Completely removed %s"
msgstr "Fjernede %s helt"
+#: apt-pkg/deb/dpkgpm.cc:566
+#, fuzzy, c-format
+#| msgid "Lists directory %spartial is missing."
+msgid "Directory '%s' missing"
+msgstr "Listemappen %spartial mangler."
+
+#: apt-pkg/deb/dpkgpm.cc:709
+#, fuzzy, c-format
+#| msgid "Select failed"
+msgid "openpty failed\n"
+msgstr "Valg mislykkedes"
+
#: methods/rred.cc:219
msgid "Could not patch file"
msgstr "Kunne ikke p�f�re filen %s en lap"
diff --git a/po/de.po b/po/de.po
index fb2f911f3..f852f49c2 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.6.46.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-06 06:51+0200\n"
+"POT-Creation-Date: 2007-08-04 09:09+0200\n"
"PO-Revision-Date: 2006-10-24 11:45+0200\n"
"Last-Translator: Michael Piefel <piefel@debian.org>\n"
"Language-Team: <de@li.org>\n"
@@ -158,9 +158,9 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2584 cmdline/apt-sortpkgs.cc:144
-#, c-format
-msgid "%s %s for %s %s compiled on %s %s\n"
+#: cmdline/apt-get.cc:2585 cmdline/apt-sortpkgs.cc:144
+#, fuzzy, c-format
+msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s für %s %s kompiliert am %s %s\n"
#: cmdline/apt-cache.cc:1721
@@ -669,7 +669,7 @@ msgstr "Konnte %s nicht in %s umbenennen"
msgid "Y"
msgstr "J"
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1673
#, c-format
msgid "Regex compilation error - %s"
msgstr "Fehler beim Kompilieren eines regulären Ausdrucks – %s"
@@ -830,11 +830,11 @@ msgstr "Pakete müssen entfernt werden, aber Entfernen ist abgeschaltet."
msgid "Internal error, Ordering didn't finish"
msgstr "Interner Fehler, Anordnung beendete nicht"
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2011 cmdline/apt-get.cc:2044
msgid "Unable to lock the download directory"
msgstr "Kann kein Lock für das Downloadverzeichnis erhalten."
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2092 cmdline/apt-get.cc:2333
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr "Die Liste der Quellen konnte nicht gelesen werden."
@@ -865,7 +865,7 @@ msgstr "Nach dem Auspacken werden %sB Plattenplatz zusätzlich benutzt.\n"
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Nach dem Auspacken werden %sB Plattenplatz freigegeben worden sein.\n"
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2186
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2187
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Konnte freien Platz in %s nicht bestimmen"
@@ -902,7 +902,7 @@ msgstr "Abbruch."
msgid "Do you want to continue [Y/n]? "
msgstr "Möchten Sie fortfahren [J/n]? "
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2229
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2230
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Konnte %s nicht holen %s\n"
@@ -911,7 +911,7 @@ msgstr "Konnte %s nicht holen %s\n"
msgid "Some files failed to download"
msgstr "Einige Dateien konnten nicht heruntergeladen werden"
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2238
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2239
msgid "Download complete and in download only mode"
msgstr "Herunterladen abgeschlossen und im Nur-Herunterladen-Modus"
@@ -1048,7 +1048,7 @@ msgid ""
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1754
msgid "The following information may help to resolve the situation:"
msgstr ""
"Die folgenden Informationen helfen Ihnen vielleicht, die Situation zu lösen:"
@@ -1062,31 +1062,31 @@ msgstr "Interner Fehler, der Problem-Löser hat was kaputt gemacht"
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Interner Fehler, AllUpgrade hat was kaputt gemacht"
-#: cmdline/apt-get.cc:1544
+#: cmdline/apt-get.cc:1545
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "Konnte Paket %s nicht finden"
-#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
+#: cmdline/apt-get.cc:1660 cmdline/apt-get.cc:1696
#, c-format
msgid "Couldn't find package %s"
msgstr "Konnte Paket %s nicht finden"
-#: cmdline/apt-get.cc:1682
+#: cmdline/apt-get.cc:1683
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Achtung, wähle %s für reg. Ausdruck „%s“\n"
-#: cmdline/apt-get.cc:1712
+#: cmdline/apt-get.cc:1713
#, fuzzy, c-format
msgid "%s set to manual installed.\n"
msgstr "aber %s soll installiert werden"
-#: cmdline/apt-get.cc:1725
+#: cmdline/apt-get.cc:1726
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Probieren Sie „apt-get -f install“, um diese zu korrigieren:"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1729
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1094,7 +1094,7 @@ msgstr ""
"Nichterfüllte Abhängigkeiten. Versuchen Sie „apt-get -f install“ ohne "
"jeglich Pakete (oder geben Sie eine Lösung an)."
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1741
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1106,7 +1106,7 @@ msgstr ""
"Unstable-Distribution verwenden, einige erforderliche Pakete noch nicht\n"
"kreiert oder aus Incoming herausbewegt wurden."
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1749
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1117,119 +1117,119 @@ msgstr ""
"dass das Paket einfach nicht installierbar ist und eine Fehlermeldung über\n"
"dieses Paket erfolgen sollte."
-#: cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1757
msgid "Broken packages"
msgstr "Kaputte Pakete"
-#: cmdline/apt-get.cc:1785
+#: cmdline/apt-get.cc:1786
msgid "The following extra packages will be installed:"
msgstr "Die folgenden zusätzlichen Pakete werden installiert:"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Suggested packages:"
msgstr "Vorgeschlagene Pakete:"
-#: cmdline/apt-get.cc:1875
+#: cmdline/apt-get.cc:1876
msgid "Recommended packages:"
msgstr "Empfohlene Pakete:"
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1904
msgid "Calculating upgrade... "
msgstr "Berechne Upgrade..."
-#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1907 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Fehlgeschlagen"
-#: cmdline/apt-get.cc:1911
+#: cmdline/apt-get.cc:1912
msgid "Done"
msgstr "Fertig"
-#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
+#: cmdline/apt-get.cc:1979 cmdline/apt-get.cc:1987
msgid "Internal error, problem resolver broke stuff"
msgstr "Interner Fehler, der Problem-Löser hat was kaputt gemacht"
-#: cmdline/apt-get.cc:2086
+#: cmdline/apt-get.cc:2087
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Es muss mindestens ein Paket angegeben werden, dessen Quellen geholt werden "
"sollen"
-#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2350
+#: cmdline/apt-get.cc:2117 cmdline/apt-get.cc:2351
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Kann Quellpaket für %s nicht finden"
-#: cmdline/apt-get.cc:2165
+#: cmdline/apt-get.cc:2166
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Überspringe schon heruntergeladene Datei „%s“\n"
-#: cmdline/apt-get.cc:2189
+#: cmdline/apt-get.cc:2190
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Sie haben nicht genug freien Platz in %s"
-#: cmdline/apt-get.cc:2194
+#: cmdline/apt-get.cc:2195
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Es müssen noch %sB/%sB der Quellarchive geholt werden.\n"
-#: cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2198
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Es müssen %sB der Quellarchive geholt werden.\n"
-#: cmdline/apt-get.cc:2203
+#: cmdline/apt-get.cc:2204
#, c-format
msgid "Fetch source %s\n"
msgstr "Hole Quelle %s\n"
-#: cmdline/apt-get.cc:2234
+#: cmdline/apt-get.cc:2235
msgid "Failed to fetch some archives."
msgstr "Konnte einige Archive nicht holen."
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2263
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Überspringe Entpacken der schon entpackten Quelle in %s\n"
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2275
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Entpack-Befehl „%s“ fehlgeschlagen.\n"
-#: cmdline/apt-get.cc:2275
+#: cmdline/apt-get.cc:2276
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Überprüfen Sie, ob das Paket „dpkg-dev“ installiert ist.\n"
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2293
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Build-Befehl „%s“ fehlgeschlagen.\n"
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:2312
msgid "Child process failed"
msgstr "Kindprozess fehlgeschlagen"
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2328
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Es muss zumindest ein Paket angegeben werden, dessen Build-Dependencies\n"
"überprüft werden sollen."
-#: cmdline/apt-get.cc:2355
+#: cmdline/apt-get.cc:2356
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Information zu Build-Dependencies für %s konnte nicht gefunden werden."
-#: cmdline/apt-get.cc:2375
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s hat keine Build-Dependencies.\n"
-#: cmdline/apt-get.cc:2427
+#: cmdline/apt-get.cc:2428
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1238,7 +1238,7 @@ msgstr ""
"%s Abhängigkeit für %s kann nicht befriedigt werden, da Paket %s nicht "
"gefunden werden kann."
-#: cmdline/apt-get.cc:2479
+#: cmdline/apt-get.cc:2480
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1247,32 +1247,32 @@ msgstr ""
"%s Abhängigkeit für %s kann nicht befriedigt werden, da keine verfügbare "
"Version von Paket %s die Versionsanforderungen erfüllen kann."
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2515
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Konnte die %s-Abhängigkeit für %s nicht erfüllen: Installiertes Paket %s ist "
"zu neu."
-#: cmdline/apt-get.cc:2539
+#: cmdline/apt-get.cc:2540
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Konnte die %s-Abhängigkeit für %s nicht erfüllen: %s"
-#: cmdline/apt-get.cc:2553
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Build-Abhängigkeiten für %s konnten nicht erfüllt werden."
-#: cmdline/apt-get.cc:2557
+#: cmdline/apt-get.cc:2558
msgid "Failed to process build dependencies"
msgstr "Verarbeitung der Build-Abhängigkeiten fehlgeschlagen"
-#: cmdline/apt-get.cc:2589
+#: cmdline/apt-get.cc:2590
msgid "Supported modules:"
msgstr "Unterstützte Module:"
-#: cmdline/apt-get.cc:2630
+#: cmdline/apt-get.cc:2631
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1704,25 +1704,25 @@ msgstr "Fehler beim Parsen der MD5-Summe. Abstand %lu"
msgid "This is not a valid DEB archive, missing '%s' member"
msgstr "Dies ist kein gültiges DEB-Archiv, da es „%s“ nicht enthält"
-#: apt-inst/deb/debfile.cc:48
-#, c-format
-msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
+#: apt-inst/deb/debfile.cc:50
+#, fuzzy, c-format
+msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
msgstr "Dies ist kein gültiges DEB-Archiv, da es weder „%s“ noch „%s“ enthält"
-#: apt-inst/deb/debfile.cc:108
+#: apt-inst/deb/debfile.cc:110
#, c-format
msgid "Couldn't change to %s"
msgstr "Konnte nicht in %s wechseln"
-#: apt-inst/deb/debfile.cc:134
+#: apt-inst/deb/debfile.cc:140
msgid "Internal error, could not locate member"
msgstr "Interner Fehler, konnte Bestandteil nicht finden"
-#: apt-inst/deb/debfile.cc:167
+#: apt-inst/deb/debfile.cc:173
msgid "Failed to locate a valid control file"
msgstr "Konnte gültige Kontroll-Datei nicht finden"
-#: apt-inst/deb/debfile.cc:252
+#: apt-inst/deb/debfile.cc:258
msgid "Unparsable control file"
msgstr "Unparsbare Kontroll-Datei"
@@ -2096,15 +2096,15 @@ msgstr ""
msgid "Error reading from server"
msgstr "Fehler beim Lesen vom Server"
-#: methods/http.cc:1108
+#: methods/http.cc:1104
msgid "Bad header data"
msgstr "Fehlerhafte Kopfzeilendaten"
-#: methods/http.cc:1125
+#: methods/http.cc:1121 methods/http.cc:1176
msgid "Connection failed"
msgstr "Verbindung fehlgeschlagen"
-#: methods/http.cc:1216
+#: methods/http.cc:1228
msgid "Internal error"
msgstr "Interner Fehler"
@@ -2134,7 +2134,7 @@ msgstr "Öffne Konfigurationsdatei %s"
#: apt-pkg/contrib/configuration.cc:510
#, fuzzy, c-format
-msgid "Line %d too long (max %lu)"
+msgid "Line %d too long (max %u)"
msgstr "Zeile %d zu lang (maximal %d)"
#: apt-pkg/contrib/configuration.cc:606
@@ -2389,29 +2389,29 @@ msgstr "optional"
msgid "extra"
msgstr "extra"
-#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129
+#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
msgid "Building dependency tree"
msgstr "Abhängigkeitsbaum wird aufgebaut"
-#: apt-pkg/depcache.cc:101
+#: apt-pkg/depcache.cc:122
msgid "Candidate versions"
msgstr "Mögliche Versionen"
-#: apt-pkg/depcache.cc:130
+#: apt-pkg/depcache.cc:151
msgid "Dependency generation"
msgstr "Abhängigkeits-Generierung"
-#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174
+#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
#, fuzzy
msgid "Reading state information"
msgstr "Führe Information zur Verfügbarkeit zusammen"
-#: apt-pkg/depcache.cc:198
+#: apt-pkg/depcache.cc:219
#, fuzzy, c-format
msgid "Failed to open StateFile %s"
msgstr "Konnte %s nicht öffnen"
-#: apt-pkg/depcache.cc:204
+#: apt-pkg/depcache.cc:225
#, fuzzy, c-format
msgid "Failed to write temporary StateFile %s"
msgstr "Konnte Datei %s nicht schreiben"
@@ -2545,19 +2545,19 @@ msgstr "Der Treiber für Methode %s konnte nicht gefunden werden."
msgid "Method %s did not start correctly"
msgstr "Methode %s hat nicht korrekt gestartet"
-#: apt-pkg/acquire-worker.cc:381
+#: apt-pkg/acquire-worker.cc:396
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
"Bitte legen Sie das Medium mit dem Namen „%s“ in Laufwerk „%s“ und drücken "
"Sie die Eingabetaste."
-#: apt-pkg/init.cc:126
+#: apt-pkg/init.cc:124
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Paketierungssystem „%s“ wird nicht unterstützt"
-#: apt-pkg/init.cc:142
+#: apt-pkg/init.cc:140
msgid "Unable to determine a suitable packaging system type"
msgstr "Kann keinen passenden Paketierungssystem-Typ bestimmen"
@@ -2702,17 +2702,21 @@ msgstr "E/A-Fehler beim Sichern des Quellcaches"
msgid "rename failed, %s (%s -> %s)."
msgstr "Umbenennen fehlgeschlagen, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:401
msgid "MD5Sum mismatch"
msgstr "MD5-Summe stimmt nicht"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1405
+#, fuzzy
+msgid "Hash Sum mismatch"
+msgstr "MD5-Summe stimmt nicht"
+
+#: apt-pkg/acquire-item.cc:1097
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"Es gibt keine öffentlichen Schlüssel für die folgenden Schlüssel-IDs:\n"
-#: apt-pkg/acquire-item.cc:1219
+#: apt-pkg/acquire-item.cc:1210
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2721,7 +2725,7 @@ msgstr ""
"Ich konnte keine Datei für Paket %s finden. Das könnte heißen, dass Sie "
"dieses Paket von Hand korrigieren müssen (aufgrund fehlender Architektur)."
-#: apt-pkg/acquire-item.cc:1278
+#: apt-pkg/acquire-item.cc:1269
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2730,14 +2734,14 @@ msgstr ""
"Ich konnte keine Datei für Paket %s finden. Das könnte heißen, dass Sie "
"dieses Paket von Hand korrigieren müssen."
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1310
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"Die Paketindexdateien sind korrumpiert: Kein Filename:-Feld für Paket %s."
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1397
msgid "Size mismatch"
msgstr "Größe stimmt nicht"
@@ -2828,78 +2832,88 @@ msgstr "Quelllisteneinträge für diese CD sind:\n"
msgid "Unmounting CD-ROM...\n"
msgstr "Hänge CD-ROM aus..."
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
#, c-format
msgid "Wrote %i records.\n"
msgstr "Es wurden %i Datensätze geschrieben.\n"
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Es wurden %i Datensätze mit %i fehlenden Dateien geschrieben.\n"
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Es wurden %i Datensätze mit %i nicht passenden Dateien geschrieben.\n"
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
"Es wurden %i Datensätze mit %i fehlenden und %i nicht passenden Dateien "
"geschrieben.\n"
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:522
#, c-format
msgid "Preparing %s"
msgstr "%s wird vorbereitet"
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:523
#, c-format
msgid "Unpacking %s"
msgstr "%s wird entpackt"
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:528
#, c-format
msgid "Preparing to configure %s"
msgstr "Konfiguration von %s wird vorbereitet"
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:529
#, c-format
msgid "Configuring %s"
msgstr "Konfiguriere %s"
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:530
#, c-format
msgid "Installed %s"
msgstr "%s installiert"
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:535
#, c-format
msgid "Preparing for removal of %s"
msgstr "Entfernen von %s wird vorbereitet"
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:536
#, c-format
msgid "Removing %s"
msgstr "%s wird entfernt"
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:537
#, c-format
msgid "Removed %s"
msgstr "%s entfernt"
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:542
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Komplettes Entfernen von %s wird vorbereitet"
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:543
#, c-format
msgid "Completely removed %s"
msgstr "%s komplett entfernt"
+#: apt-pkg/deb/dpkgpm.cc:566
+#, fuzzy, c-format
+msgid "Directory '%s' missing"
+msgstr "Listenverzeichnis %spartial fehlt."
+
+#: apt-pkg/deb/dpkgpm.cc:709
+#, fuzzy, c-format
+msgid "openpty failed\n"
+msgstr "Auswahl fehlgeschlagen"
+
#: methods/rred.cc:219
#, fuzzy
msgid "Could not patch file"
diff --git a/po/el.po b/po/el.po
index 8ea5133a6..328ac8f72 100644
--- a/po/el.po
+++ b/po/el.po
@@ -18,7 +18,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po_el_new\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-06 06:51+0200\n"
+"POT-Creation-Date: 2007-08-04 09:09+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"
@@ -173,9 +173,9 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2584 cmdline/apt-sortpkgs.cc:144
-#, c-format
-msgid "%s %s for %s %s compiled on %s %s\n"
+#: cmdline/apt-get.cc:2585 cmdline/apt-sortpkgs.cc:144
+#, fuzzy, c-format
+msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s για %s %s είναι μεταγλωττισμένο σε %s %s\n"
#: cmdline/apt-cache.cc:1721
@@ -673,7 +673,7 @@ msgstr "Αποτυχία μετονομασίας του %s σε %s"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1673
#, c-format
msgid "Regex compilation error - %s"
msgstr "σφάλμα μεταγλωτισμου - %s"
@@ -837,11 +837,11 @@ msgstr ""
msgid "Internal error, Ordering didn't finish"
msgstr "Εσωτερικό Σφάλμα, η Ταξινόμηση δεν ολοκληρώθηκε"
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2011 cmdline/apt-get.cc:2044
msgid "Unable to lock the download directory"
msgstr "Αδύνατο το κλείδωμα του καταλόγου μεταφόρτωσης"
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2092 cmdline/apt-get.cc:2333
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr "Αδύνατη η ανάγνωση της λίστας πηγών."
@@ -872,7 +872,7 @@ msgstr "Μετά την αποσυμπίεση θα χρησιμοποιηθού
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Μετά την αποσυμπίεση θα ελευθερωθούν %sB χώρου από το δίσκο.\n"
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2186
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2187
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Δεν μπόρεσα να προσδιορίσω τον ελεύθερο χώρο στο %s"
@@ -909,7 +909,7 @@ msgstr "Εγκατάλειψη."
msgid "Do you want to continue [Y/n]? "
msgstr "Θέλετε να συνεχίσετε [Ν/ο]; "
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2229
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2230
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Αποτυχία ανάκτησης του %s %s\n"
@@ -918,7 +918,7 @@ msgstr "Αποτυχία ανάκτησης του %s %s\n"
msgid "Some files failed to download"
msgstr "Για μερικά αρχεία απέτυχε η μεταφόρτωση"
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2238
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2239
msgid "Download complete and in download only mode"
msgstr "Ολοκληρώθηκε η μεταφόρτωση μόνο"
@@ -1057,7 +1057,7 @@ msgid ""
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1754
msgid "The following information may help to resolve the situation:"
msgstr "Οι ακόλουθες πληροφορίες ίσως βοηθήσουν στην επίλυση του προβλήματος:"
@@ -1072,31 +1072,31 @@ msgstr ""
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Εσωτερικό Σφάλμα, Η διαδικασία αναβάθμισης χάλασε"
-#: cmdline/apt-get.cc:1544
+#: cmdline/apt-get.cc:1545
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "Αδύνατη η εύρεση του πακέτου %s"
-#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
+#: cmdline/apt-get.cc:1660 cmdline/apt-get.cc:1696
#, c-format
msgid "Couldn't find package %s"
msgstr "Αδύνατη η εύρεση του πακέτου %s"
-#: cmdline/apt-get.cc:1682
+#: cmdline/apt-get.cc:1683
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Σημείωση, επιλέχτηκε το %s στη θέση του '%s'\n"
-#: cmdline/apt-get.cc:1712
+#: cmdline/apt-get.cc:1713
#, fuzzy, c-format
msgid "%s set to manual installed.\n"
msgstr "αλλά το %s πρόκειται να εγκατασταθεί"
-#: cmdline/apt-get.cc:1725
+#: cmdline/apt-get.cc:1726
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Aν τρέξετε 'apt-get f install' ίσως να διορθώσετε αυτά τα προβλήματα:"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1729
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1104,7 +1104,7 @@ msgstr ""
"Ανεπίλυτες εξαρτήσεις. Δοκιμάστε 'apt-get -f install' χωρίς να ορίσετε "
"πακέτο (ή καθορίστε μια λύση)."
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1741
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1116,7 +1116,7 @@ msgstr ""
"διανομή, ότι μερικά από τα πακέτα δεν έχουν ακόμα δημιουργηθεί ή έχουν\n"
"μετακινηθεί από τα εισερχόμενα."
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1749
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1126,120 +1126,120 @@ msgstr ""
"το πακέτο αυτό δεν είναι εγκαταστάσιμο και θα πρέπει να κάνετε μια\n"
"αναφορά σφάλματος για αυτό το πακέτο."
-#: cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1757
msgid "Broken packages"
msgstr "Χαλασμένα πακέτα"
-#: cmdline/apt-get.cc:1785
+#: cmdline/apt-get.cc:1786
msgid "The following extra packages will be installed:"
msgstr "Τα ακόλουθα επιπλέον πακέτα θα εγκατασταθούν:"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Suggested packages:"
msgstr "Προτεινόμενα πακέτα:"
-#: cmdline/apt-get.cc:1875
+#: cmdline/apt-get.cc:1876
msgid "Recommended packages:"
msgstr "Συνιστώμενα πακέτα:"
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1904
msgid "Calculating upgrade... "
msgstr "Υπολογισμός της αναβάθμισης... "
-#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1907 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Απέτυχε"
-#: cmdline/apt-get.cc:1911
+#: cmdline/apt-get.cc:1912
msgid "Done"
msgstr "Ετοιμο"
-#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
+#: cmdline/apt-get.cc:1979 cmdline/apt-get.cc:1987
msgid "Internal error, problem resolver broke stuff"
msgstr ""
"Εσωτερικό Σφάλμα, η προσπάθεια επίλυσης του προβλήματος \"έσπασε\" κάποιο "
"υλικό"
-#: cmdline/apt-get.cc:2086
+#: cmdline/apt-get.cc:2087
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για να μεταφορτώσετε τον "
"κωδικάτου"
-#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2350
+#: cmdline/apt-get.cc:2117 cmdline/apt-get.cc:2351
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Αδυναμία εντοπισμού του κώδικά του πακέτου %s"
-#: cmdline/apt-get.cc:2165
+#: cmdline/apt-get.cc:2166
#, fuzzy, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Παράκαμψη του ήδη μεταφορτωμένου αρχείου `%s`\n"
-#: cmdline/apt-get.cc:2189
+#: cmdline/apt-get.cc:2190
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Δεν διαθέτετε αρκετό ελεύθερο χώρο στο %s"
-#: cmdline/apt-get.cc:2194
+#: cmdline/apt-get.cc:2195
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Χρειάζεται να μεταφορτωθούν %sB/%sB πηγαίου κώδικα.\n"
-#: cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2198
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Χρειάζεται να μεταφορτωθούν %sB πηγαίου κώδικα.\n"
-#: cmdline/apt-get.cc:2203
+#: cmdline/apt-get.cc:2204
#, c-format
msgid "Fetch source %s\n"
msgstr "Μεταφόρτωση Κωδικα %s\n"
-#: cmdline/apt-get.cc:2234
+#: cmdline/apt-get.cc:2235
msgid "Failed to fetch some archives."
msgstr "Αποτυχία μεταφόρτωσης μερικών αρχειοθηκών."
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2263
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Παράκαμψη της αποσυμπίεσης ήδη μεταφορτωμένου κώδικα στο %s\n"
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2275
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Απέτυχε η εντολή αποσυμπίεσης %s\n"
-#: cmdline/apt-get.cc:2275
+#: cmdline/apt-get.cc:2276
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Ελέγξτε αν είναι εγκαταστημένο το πακέτο 'dpkg-dev'.\n"
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2293
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Απέτυχε η εντολή χτισίματος %s.\n"
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:2312
msgid "Child process failed"
msgstr "Η απογονική διεργασία απέτυχε"
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2328
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για έλεγχο των εξαρτήσεων του"
-#: cmdline/apt-get.cc:2355
+#: cmdline/apt-get.cc:2356
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Αδύνατη η εύρεση πληροφοριών χτισίματος για το %s"
-#: cmdline/apt-get.cc:2375
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "%s has no build depends.\n"
msgstr "το %s δεν έχει εξαρτήσεις χτισίματος.\n"
-#: cmdline/apt-get.cc:2427
+#: cmdline/apt-get.cc:2428
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1247,7 +1247,7 @@ msgid ""
msgstr ""
"%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το πακέτο %s δεν βρέθηκε"
-#: cmdline/apt-get.cc:2479
+#: cmdline/apt-get.cc:2480
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1256,32 +1256,32 @@ msgstr ""
"%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή δεν υπάρχουν διαθέσιμες "
"εκδόσεις του πακέτου %s που να ικανοποιούν τις απαιτήσεις έκδοσης"
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2515
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Αποτυχία ικανοποίησης %s εξαρτήσεων για το %s: Το εγκατεστημένο πακέτο %s "
"είναι νεώτερο"
-#: cmdline/apt-get.cc:2539
+#: cmdline/apt-get.cc:2540
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Αποτυχία ικανοποίησης %s εξάρτησης για το %s: %s"
-#: cmdline/apt-get.cc:2553
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Οι εξαρτήσεις χτισίματος για το %s δεν ικανοποιούνται."
-#: cmdline/apt-get.cc:2557
+#: cmdline/apt-get.cc:2558
msgid "Failed to process build dependencies"
msgstr "Αποτυχία επεξεργασίας εξαρτήσεων χτισίματος"
-#: cmdline/apt-get.cc:2589
+#: cmdline/apt-get.cc:2590
msgid "Supported modules:"
msgstr "Υποστηριζόμενοι Οδηγοί:"
-#: cmdline/apt-get.cc:2630
+#: cmdline/apt-get.cc:2631
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1707,25 +1707,25 @@ msgstr "Σφάλμα στην ανάλυση του MD5. Γραμμή %lu"
msgid "This is not a valid DEB archive, missing '%s' member"
msgstr "Αυτό δεν είναι ένα έγκυρο αρχείο DEB, αγνοείται το μέλος '%s'"
-#: apt-inst/deb/debfile.cc:48
-#, c-format
-msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
+#: apt-inst/deb/debfile.cc:50
+#, fuzzy, c-format
+msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
msgstr "Μη έγκυρο αρχείο DEB, δεν περιέχει το μέλος %s' or '%s' "
-#: apt-inst/deb/debfile.cc:108
+#: apt-inst/deb/debfile.cc:110
#, c-format
msgid "Couldn't change to %s"
msgstr "Αδύνατη η αλλαγή σε %s"
-#: apt-inst/deb/debfile.cc:134
+#: apt-inst/deb/debfile.cc:140
msgid "Internal error, could not locate member"
msgstr "Εσωτερικό Σφάλμα, αδυναμία εντοπισμού του μέλους"
-#: apt-inst/deb/debfile.cc:167
+#: apt-inst/deb/debfile.cc:173
msgid "Failed to locate a valid control file"
msgstr "Αποτυχία εντοπισμού ενός έγκυρου αρχείου control"
-#: apt-inst/deb/debfile.cc:252
+#: apt-inst/deb/debfile.cc:258
msgid "Unparsable control file"
msgstr "Μη αναλύσιμο αρχείο control"
@@ -2090,15 +2090,15 @@ msgstr ""
msgid "Error reading from server"
msgstr "Σφάλμα στην ανάγνωση από το διακομιστή"
-#: methods/http.cc:1108
+#: methods/http.cc:1104
msgid "Bad header data"
msgstr "Ελαττωματικά δεδομένα επικεφαλίδας"
-#: methods/http.cc:1125
+#: methods/http.cc:1121 methods/http.cc:1176
msgid "Connection failed"
msgstr "Η σύνδεση απέτυχε"
-#: methods/http.cc:1216
+#: methods/http.cc:1228
msgid "Internal error"
msgstr "Εσωτερικό Σφάλμα"
@@ -2128,7 +2128,7 @@ msgstr "Άνοιγμα του αρχείου ρυθμίσεων %s"
#: apt-pkg/contrib/configuration.cc:510
#, fuzzy, c-format
-msgid "Line %d too long (max %lu)"
+msgid "Line %d too long (max %u)"
msgstr "Η γραμμή %d έχει υπερβολικό μήκος (μέγιστο %d)"
#: apt-pkg/contrib/configuration.cc:606
@@ -2386,29 +2386,29 @@ msgstr "προαιρετικό"
msgid "extra"
msgstr "επιπλέον"
-#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129
+#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
msgid "Building dependency tree"
msgstr "Κατασκευή Δένδρου Εξαρτήσεων"
-#: apt-pkg/depcache.cc:101
+#: apt-pkg/depcache.cc:122
msgid "Candidate versions"
msgstr "Υποψήφιες Εκδόσεις"
-#: apt-pkg/depcache.cc:130
+#: apt-pkg/depcache.cc:151
msgid "Dependency generation"
msgstr "Παραγωγή Εξαρτήσεων"
-#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174
+#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
#, fuzzy
msgid "Reading state information"
msgstr "Σύμπτυξη Διαθέσιμων Πληροφοριών"
-#: apt-pkg/depcache.cc:198
+#: apt-pkg/depcache.cc:219
#, fuzzy, c-format
msgid "Failed to open StateFile %s"
msgstr "Αποτυχία ανοίγματος του %s"
-#: apt-pkg/depcache.cc:204
+#: apt-pkg/depcache.cc:225
#, fuzzy, c-format
msgid "Failed to write temporary StateFile %s"
msgstr "Αποτυχία εγγραφής του αρχείου %s"
@@ -2542,19 +2542,19 @@ msgstr "Ο οδηγός μεθόδου %s δεν μπορεί να εντοπι�
msgid "Method %s did not start correctly"
msgstr "Η μέθοδος %s δεν εκκινήθηκε σωστά"
-#: apt-pkg/acquire-worker.cc:381
+#: apt-pkg/acquire-worker.cc:396
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
"Παρακαλώ εισάγετε το δίσκο με ετικέτα '%s' στη συσκευή '%s' και πατήστε "
"enter."
-#: apt-pkg/init.cc:126
+#: apt-pkg/init.cc:124
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Το σύστημα συσκευασίας '%s' δεν υποστηρίζεται"
-#: apt-pkg/init.cc:142
+#: apt-pkg/init.cc:140
msgid "Unable to determine a suitable packaging system type"
msgstr "Αδύνατος ο καθορισμός ενός κατάλληλου τύπου συστήματος πακέτων"
@@ -2693,16 +2693,20 @@ msgstr "Σφάλμα IO κατά την αποθήκευση της cache πηγ
msgid "rename failed, %s (%s -> %s)."
msgstr "απέτυχε η μετονομασία, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:401
msgid "MD5Sum mismatch"
msgstr "Ανόμοιο MD5Sum"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1405
+#, fuzzy
+msgid "Hash Sum mismatch"
+msgstr "Ανόμοιο MD5Sum"
+
+#: apt-pkg/acquire-item.cc:1097
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:1219
+#: apt-pkg/acquire-item.cc:1210
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2711,7 +2715,7 @@ msgstr ""
"Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι "
"χρειάζεται να διορθώσετε χειροκίνητα το πακέτο. (λόγω χαμένου αρχείου)"
-#: apt-pkg/acquire-item.cc:1278
+#: apt-pkg/acquire-item.cc:1269
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2720,7 +2724,7 @@ msgstr ""
"Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι "
"χρειάζεται να διορθώσετε χειροκίνητα το πακέτο."
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1310
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2728,7 +2732,7 @@ msgstr ""
"Κατεστραμμένα αρχεία ευρετηρίου πακέτων. Δεν υπάρχει πεδίο Filename: στο "
"πακέτο %s."
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1397
msgid "Size mismatch"
msgstr "Ανόμοιο μέγεθος"
@@ -2819,76 +2823,86 @@ msgstr "Οι κατάλογοι με τις πηγές αυτού του δίσ�
msgid "Unmounting CD-ROM...\n"
msgstr "Αποπροσάρτηση του CD-ROM..."
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
#, c-format
msgid "Wrote %i records.\n"
msgstr "Εγιναν %i εγγραφές.\n"
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Εγιναν %i εγγραφές με %i απώντα αρχεία.\n"
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Εγιναν %i εγγραφές με %i ασύμβατα αρχεία.\n"
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "Εγιναν %i εγγραφές με %i απώντα αρχεία και %i ασύμβατα αρχεία\n"
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:522
#, c-format
msgid "Preparing %s"
msgstr "Προετοιμασία του %s"
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:523
#, c-format
msgid "Unpacking %s"
msgstr "Ξεπακετάρισμα του %s"
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:528
#, c-format
msgid "Preparing to configure %s"
msgstr "Προετοιμασία ρύθμισης του %s"
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:529
#, c-format
msgid "Configuring %s"
msgstr "Ρύθμιση του %s"
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:530
#, c-format
msgid "Installed %s"
msgstr "Εγκατέστησα το %s"
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:535
#, c-format
msgid "Preparing for removal of %s"
msgstr "Προετοιμασία για την αφαίρεση του %s"
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:536
#, c-format
msgid "Removing %s"
msgstr "Αφαιρώ το %s"
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:537
#, c-format
msgid "Removed %s"
msgstr "Αφαίρεσα το %s"
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:542
#, fuzzy, c-format
msgid "Preparing to completely remove %s"
msgstr "Προετοιμασία ρύθμισης του %s"
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:543
#, fuzzy, c-format
msgid "Completely removed %s"
msgstr "Αποτυχία διαγραφής του %s"
+#: apt-pkg/deb/dpkgpm.cc:566
+#, fuzzy, c-format
+msgid "Directory '%s' missing"
+msgstr "Ο φάκελος λιστών %spartial αγνοείται."
+
+#: apt-pkg/deb/dpkgpm.cc:709
+#, fuzzy, c-format
+msgid "openpty failed\n"
+msgstr "Η επιλογή απέτυχε"
+
#: methods/rred.cc:219
#, fuzzy
msgid "Could not patch file"
diff --git a/po/en_GB.po b/po/en_GB.po
index 76d443ee7..54f266dc0 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.6.46.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-06 06:51+0200\n"
+"POT-Creation-Date: 2007-08-04 09:09+0200\n"
"PO-Revision-Date: 2006-10-12 11:07+0100\n"
"Last-Translator: Neil Williams <linux@codehelp.co.uk>\n"
"Language-Team: en_GB <en_gb@li.org>\n"
@@ -158,9 +158,9 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2584 cmdline/apt-sortpkgs.cc:144
-#, c-format
-msgid "%s %s for %s %s compiled on %s %s\n"
+#: cmdline/apt-get.cc:2585 cmdline/apt-sortpkgs.cc:144
+#, fuzzy, c-format
+msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s for %s %s compiled on %s %s\n"
#: cmdline/apt-cache.cc:1721
@@ -653,7 +653,7 @@ msgstr "Failed to rename %s to %s"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1673
#, c-format
msgid "Regex compilation error - %s"
msgstr "Regex compilation error - %s"
@@ -814,11 +814,11 @@ msgstr "Packages need to be removed but remove is disabled."
msgid "Internal error, Ordering didn't finish"
msgstr "Internal error, Ordering didn't finish"
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2011 cmdline/apt-get.cc:2044
msgid "Unable to lock the download directory"
msgstr "Unable to lock the download directory"
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2092 cmdline/apt-get.cc:2333
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr "The list of sources could not be read."
@@ -847,7 +847,7 @@ msgstr "After unpacking %sB of additional disk space will be used.\n"
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "After unpacking %sB disk space will be freed.\n"
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2186
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2187
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Couldn't determine free space in %s"
@@ -884,7 +884,7 @@ msgstr "Abort."
msgid "Do you want to continue [Y/n]? "
msgstr "Do you want to continue [Y/n]? "
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2229
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2230
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Failed to fetch %s %s\n"
@@ -893,7 +893,7 @@ msgstr "Failed to fetch %s %s\n"
msgid "Some files failed to download"
msgstr "Some files failed to download"
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2238
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2239
msgid "Download complete and in download only mode"
msgstr "Download complete and in download only mode"
@@ -1027,7 +1027,7 @@ msgid ""
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1754
msgid "The following information may help to resolve the situation:"
msgstr "The following information may help to resolve the situation:"
@@ -1040,31 +1040,31 @@ msgstr "Internal error, problem resolver broke stuff"
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Internal error, AllUpgrade broke stuff"
-#: cmdline/apt-get.cc:1544
+#: cmdline/apt-get.cc:1545
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "Couldn't find package %s"
-#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
+#: cmdline/apt-get.cc:1660 cmdline/apt-get.cc:1696
#, c-format
msgid "Couldn't find package %s"
msgstr "Couldn't find package %s"
-#: cmdline/apt-get.cc:1682
+#: cmdline/apt-get.cc:1683
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Note, selecting %s for regex ‘%s’\n"
-#: cmdline/apt-get.cc:1712
+#: cmdline/apt-get.cc:1713
#, fuzzy, c-format
msgid "%s set to manual installed.\n"
msgstr "but %s is to be installed"
-#: cmdline/apt-get.cc:1725
+#: cmdline/apt-get.cc:1726
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "You might want to run ‘apt-get -f install’ to correct these:"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1729
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1072,7 +1072,7 @@ msgstr ""
"Unmet dependencies. Try ‘apt-get -f install’ with no packages (or specify a "
"solution)."
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1741
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1084,7 +1084,7 @@ msgstr ""
"distribution that some required packages have not yet been created\n"
"or been moved out of Incoming."
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1749
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1094,115 +1094,115 @@ msgstr ""
"the package is simply not installable and a bug report against\n"
"that package should be filed."
-#: cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1757
msgid "Broken packages"
msgstr "Broken packages"
-#: cmdline/apt-get.cc:1785
+#: cmdline/apt-get.cc:1786
msgid "The following extra packages will be installed:"
msgstr "The following extra packages will be installed:"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Suggested packages:"
msgstr "Suggested packages:"
-#: cmdline/apt-get.cc:1875
+#: cmdline/apt-get.cc:1876
msgid "Recommended packages:"
msgstr "Recommended packages:"
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1904
msgid "Calculating upgrade... "
msgstr "Calculating upgrade... "
-#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1907 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Failed"
-#: cmdline/apt-get.cc:1911
+#: cmdline/apt-get.cc:1912
msgid "Done"
msgstr "Done"
-#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
+#: cmdline/apt-get.cc:1979 cmdline/apt-get.cc:1987
msgid "Internal error, problem resolver broke stuff"
msgstr "Internal error, problem resolver broke stuff"
-#: cmdline/apt-get.cc:2086
+#: cmdline/apt-get.cc:2087
msgid "Must specify at least one package to fetch source for"
msgstr "Must specify at least one package for which to fetch source"
-#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2350
+#: cmdline/apt-get.cc:2117 cmdline/apt-get.cc:2351
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Unable to find a source package for %s"
-#: cmdline/apt-get.cc:2165
+#: cmdline/apt-get.cc:2166
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Skipping already downloaded file '%s'\n"
-#: cmdline/apt-get.cc:2189
+#: cmdline/apt-get.cc:2190
#, c-format
msgid "You don't have enough free space in %s"
msgstr "You don't have enough free space in %s"
-#: cmdline/apt-get.cc:2194
+#: cmdline/apt-get.cc:2195
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Need to get %sB/%sB of source archives.\n"
-#: cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2198
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Need to get %sB of source archives.\n"
-#: cmdline/apt-get.cc:2203
+#: cmdline/apt-get.cc:2204
#, c-format
msgid "Fetch source %s\n"
msgstr "Fetch source %s\n"
-#: cmdline/apt-get.cc:2234
+#: cmdline/apt-get.cc:2235
msgid "Failed to fetch some archives."
msgstr "Failed to fetch some archives."
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2263
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Skipping unpack of already unpacked source in %s\n"
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2275
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Unpack command ‘%s’ failed.\n"
-#: cmdline/apt-get.cc:2275
+#: cmdline/apt-get.cc:2276
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Check if the 'dpkg-dev' package is installed.\n"
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2293
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Build command ‘%s’ failed.\n"
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:2312
msgid "Child process failed"
msgstr "Child process failed"
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2328
msgid "Must specify at least one package to check builddeps for"
msgstr "Must specify at least one package to check builddeps for"
-#: cmdline/apt-get.cc:2355
+#: cmdline/apt-get.cc:2356
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Unable to get build-dependency information for %s"
-#: cmdline/apt-get.cc:2375
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s has no build depends.\n"
-#: cmdline/apt-get.cc:2427
+#: cmdline/apt-get.cc:2428
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1211,7 +1211,7 @@ msgstr ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
-#: cmdline/apt-get.cc:2479
+#: cmdline/apt-get.cc:2480
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1220,31 +1220,31 @@ msgstr ""
"%s dependency for %s cannot be satisfied because no available versions of "
"package %s can satisfy version requirements"
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2515
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Failed to satisfy %s dependency for %s: Installed package %s is too new"
-#: cmdline/apt-get.cc:2539
+#: cmdline/apt-get.cc:2540
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Failed to satisfy %s dependency for %s: %s"
-#: cmdline/apt-get.cc:2553
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Build-dependencies for %s could not be satisfied."
-#: cmdline/apt-get.cc:2557
+#: cmdline/apt-get.cc:2558
msgid "Failed to process build dependencies"
msgstr "Failed to process build dependencies"
-#: cmdline/apt-get.cc:2589
+#: cmdline/apt-get.cc:2590
msgid "Supported modules:"
msgstr "Supported modules:"
-#: cmdline/apt-get.cc:2630
+#: cmdline/apt-get.cc:2631
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1666,25 +1666,25 @@ msgstr "Error parsing MD5. Offset %lu"
msgid "This is not a valid DEB archive, missing '%s' member"
msgstr "This is not a valid DEB archive, missing ‘%s’ member"
-#: apt-inst/deb/debfile.cc:48
-#, c-format
-msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
+#: apt-inst/deb/debfile.cc:50
+#, fuzzy, c-format
+msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
msgstr "This is not a valid DEB archive, it has no %s or ‘%s’ member"
-#: apt-inst/deb/debfile.cc:108
+#: apt-inst/deb/debfile.cc:110
#, c-format
msgid "Couldn't change to %s"
msgstr "Couldn't change to %s"
-#: apt-inst/deb/debfile.cc:134
+#: apt-inst/deb/debfile.cc:140
msgid "Internal error, could not locate member"
msgstr "Internal error, could not locate member"
-#: apt-inst/deb/debfile.cc:167
+#: apt-inst/deb/debfile.cc:173
msgid "Failed to locate a valid control file"
msgstr "Failed to locate a valid control file"
-#: apt-inst/deb/debfile.cc:252
+#: apt-inst/deb/debfile.cc:258
msgid "Unparsable control file"
msgstr "Unparsable control file"
@@ -2047,15 +2047,15 @@ msgstr "Error reading from server. Remote end closed connection"
msgid "Error reading from server"
msgstr "Error reading from server"
-#: methods/http.cc:1108
+#: methods/http.cc:1104
msgid "Bad header data"
msgstr "Bad header data"
-#: methods/http.cc:1125
+#: methods/http.cc:1121 methods/http.cc:1176
msgid "Connection failed"
msgstr "Connection failed"
-#: methods/http.cc:1216
+#: methods/http.cc:1228
msgid "Internal error"
msgstr "Internal error"
@@ -2085,7 +2085,7 @@ msgstr "Opening configuration file %s"
#: apt-pkg/contrib/configuration.cc:510
#, fuzzy, c-format
-msgid "Line %d too long (max %lu)"
+msgid "Line %d too long (max %u)"
msgstr "Line %d too long (max %d)"
#: apt-pkg/contrib/configuration.cc:606
@@ -2338,29 +2338,29 @@ msgstr "optional"
msgid "extra"
msgstr "extra"
-#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129
+#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
msgid "Building dependency tree"
msgstr "Building dependency tree"
-#: apt-pkg/depcache.cc:101
+#: apt-pkg/depcache.cc:122
msgid "Candidate versions"
msgstr "Candidate versions"
-#: apt-pkg/depcache.cc:130
+#: apt-pkg/depcache.cc:151
msgid "Dependency generation"
msgstr "Dependency generation"
-#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174
+#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
#, fuzzy
msgid "Reading state information"
msgstr "Merging available information"
-#: apt-pkg/depcache.cc:198
+#: apt-pkg/depcache.cc:219
#, fuzzy, c-format
msgid "Failed to open StateFile %s"
msgstr "Failed to open %s"
-#: apt-pkg/depcache.cc:204
+#: apt-pkg/depcache.cc:225
#, fuzzy, c-format
msgid "Failed to write temporary StateFile %s"
msgstr "Failed to write file ‘%s’"
@@ -2492,18 +2492,18 @@ msgstr "The method driver %s could not be found."
msgid "Method %s did not start correctly"
msgstr "Method %s did not start correctly"
-#: apt-pkg/acquire-worker.cc:381
+#: apt-pkg/acquire-worker.cc:396
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
"Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-#: apt-pkg/init.cc:126
+#: apt-pkg/init.cc:124
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Packaging system ‘%s’ is not supported"
-#: apt-pkg/init.cc:142
+#: apt-pkg/init.cc:140
msgid "Unable to determine a suitable packaging system type"
msgstr "Unable to determine a suitable packaging system type"
@@ -2636,16 +2636,20 @@ msgstr "IO Error saving source cache"
msgid "rename failed, %s (%s -> %s)."
msgstr "rename failed, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:401
msgid "MD5Sum mismatch"
msgstr "MD5Sum mismatch"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1405
+#, fuzzy
+msgid "Hash Sum mismatch"
+msgstr "MD5Sum mismatch"
+
+#: apt-pkg/acquire-item.cc:1097
msgid "There is no public key available for the following key IDs:\n"
msgstr "There is no public key available for the following key IDs:\n"
-#: apt-pkg/acquire-item.cc:1219
+#: apt-pkg/acquire-item.cc:1210
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2654,7 +2658,7 @@ msgstr ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package. (due to missing arch)"
-#: apt-pkg/acquire-item.cc:1278
+#: apt-pkg/acquire-item.cc:1269
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2663,14 +2667,14 @@ msgstr ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"manually fix this package."
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1310
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"The package index files are corrupted. No Filename: field for package %s."
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1397
msgid "Size mismatch"
msgstr "Size mismatch"
@@ -2761,76 +2765,86 @@ msgstr "Source list entries for this disc are:\n"
msgid "Unmounting CD-ROM...\n"
msgstr "Unmounting CD-ROM..."
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
#, c-format
msgid "Wrote %i records.\n"
msgstr "Wrote %i records.\n"
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Wrote %i records with %i missing files.\n"
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Wrote %i records with %i mismatched files\n"
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "Wrote %i records with %i missing files and %i mismatched files\n"
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:522
#, c-format
msgid "Preparing %s"
msgstr "Preparing %s"
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:523
#, c-format
msgid "Unpacking %s"
msgstr "Unpacking %s"
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:528
#, c-format
msgid "Preparing to configure %s"
msgstr "Preparing to configure %s"
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:529
#, c-format
msgid "Configuring %s"
msgstr "Configuring %s"
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:530
#, c-format
msgid "Installed %s"
msgstr "Installed %s"
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:535
#, c-format
msgid "Preparing for removal of %s"
msgstr "Preparing for removal of %s"
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:536
#, c-format
msgid "Removing %s"
msgstr "Removing %s"
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:537
#, c-format
msgid "Removed %s"
msgstr "Removed %s"
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:542
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Preparing to completely remove %s"
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:543
#, c-format
msgid "Completely removed %s"
msgstr "Completely removed %s"
+#: apt-pkg/deb/dpkgpm.cc:566
+#, fuzzy, c-format
+msgid "Directory '%s' missing"
+msgstr "Lists directory %spartial is missing."
+
+#: apt-pkg/deb/dpkgpm.cc:709
+#, fuzzy, c-format
+msgid "openpty failed\n"
+msgstr "Select failed"
+
#: methods/rred.cc:219
msgid "Could not patch file"
msgstr "Could not patch file"
diff --git a/po/es.po b/po/es.po
index 5aac81090..2690bccde 100644
--- a/po/es.po
+++ b/po/es.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.6.42.3exp1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-06 06:51+0200\n"
+"POT-Creation-Date: 2007-08-04 09:09+0200\n"
"PO-Revision-Date: 2007-06-21 13:06+0200\n"
"Last-Translator: Javier Fernandez-Sanguino <jfs@debian.org>\n"
"Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -161,9 +161,9 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2584 cmdline/apt-sortpkgs.cc:144
-#, c-format
-msgid "%s %s for %s %s compiled on %s %s\n"
+#: cmdline/apt-get.cc:2585 cmdline/apt-sortpkgs.cc:144
+#, fuzzy, c-format
+msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s para %s %s compilado en %s %s\n"
#: cmdline/apt-cache.cc:1721
@@ -666,7 +666,7 @@ msgstr "Fall� el renombre de %s a %s"
msgid "Y"
msgstr "S"
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1673
#, c-format
msgid "Regex compilation error - %s"
msgstr "Error de compilaci�n de expresiones regulares - %s"
@@ -827,11 +827,11 @@ msgstr "Los paquetes necesitan eliminarse pero Remove est� deshabilitado."
msgid "Internal error, Ordering didn't finish"
msgstr "Error interno, no termin� el ordenamiento"
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2011 cmdline/apt-get.cc:2044
msgid "Unable to lock the download directory"
msgstr "No se puede bloquear el directorio de descarga"
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2092 cmdline/apt-get.cc:2333
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr "No se pudieron leer las listas de fuentes."
@@ -863,7 +863,7 @@ msgstr ""
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Se liberar�n %sB despu�s de desempaquetar.\n"
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2186
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2187
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "No pude determinar el espacio libre en %s"
@@ -900,7 +900,7 @@ msgstr "Abortado."
msgid "Do you want to continue [Y/n]? "
msgstr "�Desea continuar [S/n]? "
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2229
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2230
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Imposible obtener %s %s\n"
@@ -909,7 +909,7 @@ msgstr "Imposible obtener %s %s\n"
msgid "Some files failed to download"
msgstr "Algunos archivos no pudieron descargarse"
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2238
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2239
msgid "Download complete and in download only mode"
msgstr "Descarga completa y en modo de s�lo descarga"
@@ -1047,7 +1047,7 @@ msgstr ""
"Hmmm. Parece que �AutoRemover� destruy� algo y eso no deber�a haber pasado. "
"Por favor, env�e un informe de fallo al programa apt."
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1754
msgid "The following information may help to resolve the situation:"
msgstr "La siguiente informaci�n puede ayudar a resolver la situaci�n:"
@@ -1059,31 +1059,31 @@ msgstr "Error interno, �AutoRemover� rompi� cosas"
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Error Interno, AllUpgrade rompi� cosas"
-#: cmdline/apt-get.cc:1544
+#: cmdline/apt-get.cc:1545
#, c-format
msgid "Couldn't find task %s"
msgstr "No se pudo encontrar la tarea %s"
-#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
+#: cmdline/apt-get.cc:1660 cmdline/apt-get.cc:1696
#, c-format
msgid "Couldn't find package %s"
msgstr "No se pudo encontrar el paquete %s"
-#: cmdline/apt-get.cc:1682
+#: cmdline/apt-get.cc:1683
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Nota, seleccionando %s para la expresi�n regular '%s'\n"
-#: cmdline/apt-get.cc:1712
+#: cmdline/apt-get.cc:1713
#, c-format
msgid "%s set to manual installed.\n"
msgstr "fijado %s como instalado manualmente.\n"
-#: cmdline/apt-get.cc:1725
+#: cmdline/apt-get.cc:1726
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Tal vez quiera ejecutar `apt-get -f install' para corregirlo:"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1729
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1091,7 +1091,7 @@ msgstr ""
"Dependencias incumplidas. Intente 'apt-get -f install' sin paquetes (o "
"especifique una soluci�n)."
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1741
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1103,7 +1103,7 @@ msgstr ""
"inestable, que algunos paquetes necesarios no han sido creados o han\n"
"sido movidos fuera de Incoming."
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1749
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1113,119 +1113,119 @@ msgstr ""
"paquete simplemente no sea instalable y deber�a de rellenar un informe de\n"
"error contra ese paquete."
-#: cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1757
msgid "Broken packages"
msgstr "Paquetes rotos"
-#: cmdline/apt-get.cc:1785
+#: cmdline/apt-get.cc:1786
msgid "The following extra packages will be installed:"
msgstr "Se instalar�n los siguientes paquetes extras:"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Suggested packages:"
msgstr "Paquetes sugeridos:"
-#: cmdline/apt-get.cc:1875
+#: cmdline/apt-get.cc:1876
msgid "Recommended packages:"
msgstr "Paquetes recomendados"
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1904
msgid "Calculating upgrade... "
msgstr "Calculando la actualizaci�n... "
-#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1907 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Fall�"
-#: cmdline/apt-get.cc:1911
+#: cmdline/apt-get.cc:1912
msgid "Done"
msgstr "Listo"
-#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
+#: cmdline/apt-get.cc:1979 cmdline/apt-get.cc:1987
msgid "Internal error, problem resolver broke stuff"
msgstr ""
"Error interno, el sistema de soluci�n de problemas rompi�\n"
"algunas cosas"
-#: cmdline/apt-get.cc:2086
+#: cmdline/apt-get.cc:2087
msgid "Must specify at least one package to fetch source for"
msgstr "Debe especificar al menos un paquete para obtener su c�digo fuente"
-#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2350
+#: cmdline/apt-get.cc:2117 cmdline/apt-get.cc:2351
#, c-format
msgid "Unable to find a source package for %s"
msgstr "No se pudo encontrar un paquete de fuentes para %s"
-#: cmdline/apt-get.cc:2165
+#: cmdline/apt-get.cc:2166
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Ignorando fichero ya descargado '%s'\n"
-#: cmdline/apt-get.cc:2189
+#: cmdline/apt-get.cc:2190
#, c-format
msgid "You don't have enough free space in %s"
msgstr "No tiene suficiente espacio libre en %s"
-#: cmdline/apt-get.cc:2194
+#: cmdline/apt-get.cc:2195
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Necesito descargar %sB/%sB de archivos fuente.\n"
-#: cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2198
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Necesito descargar %sB de archivos fuente.\n"
-#: cmdline/apt-get.cc:2203
+#: cmdline/apt-get.cc:2204
#, c-format
msgid "Fetch source %s\n"
msgstr "Fuente obtenida %s\n"
-#: cmdline/apt-get.cc:2234
+#: cmdline/apt-get.cc:2235
msgid "Failed to fetch some archives."
msgstr "No se pudieron obtener algunos archivos."
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2263
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Ignorando desempaquetamiento de paquetes ya desempaquetados en %s\n"
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2275
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Fall� la orden de desempaquetamiento '%s'.\n"
-#: cmdline/apt-get.cc:2275
+#: cmdline/apt-get.cc:2276
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Compruebe que el paquete �dpkg-dev� est� instalado.\n"
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2293
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Fall� la orden de construcci�n '%s'.\n"
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:2312
msgid "Child process failed"
msgstr "Fall� el proceso hijo"
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2328
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Debe especificar al menos un paquete para verificar sus\n"
"dependencias de construcci�n"
-#: cmdline/apt-get.cc:2355
+#: cmdline/apt-get.cc:2356
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "No se pudo obtener informaci�n de dependencias de construcci�n para %s"
-#: cmdline/apt-get.cc:2375
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s no tiene dependencias de construcci�n.\n"
-#: cmdline/apt-get.cc:2427
+#: cmdline/apt-get.cc:2428
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1234,7 +1234,7 @@ msgstr ""
"La dependencia %s en %s no puede satisfacerse porque no se puede \n"
"encontrar el paquete %s"
-#: cmdline/apt-get.cc:2479
+#: cmdline/apt-get.cc:2480
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1243,32 +1243,32 @@ msgstr ""
"La dependencia %s en %s no puede satisfacerse porque ninguna versi�n\n"
"disponible del paquete %s satisface los requisitos de versi�n"
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2515
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"No se pudo satisfacer la dependencia %s para %s: El paquete instalado %s es "
"demasiado nuevo"
-#: cmdline/apt-get.cc:2539
+#: cmdline/apt-get.cc:2540
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "No se pudo satisfacer la dependencia %s para %s: %s"
-#: cmdline/apt-get.cc:2553
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "No se pudieron satisfacer las dependencias de construcci�n de %s."
-#: cmdline/apt-get.cc:2557
+#: cmdline/apt-get.cc:2558
msgid "Failed to process build dependencies"
msgstr "No se pudieron procesar las dependencias de construcci�n"
-#: cmdline/apt-get.cc:2589
+#: cmdline/apt-get.cc:2590
msgid "Supported modules:"
msgstr "M�dulos soportados:"
-#: cmdline/apt-get.cc:2630
+#: cmdline/apt-get.cc:2631
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1699,25 +1699,25 @@ msgstr "Error leyendo Md5. Desplazo %lu"
msgid "This is not a valid DEB archive, missing '%s' member"
msgstr "Este no es un archivo DEB v�lido, falta el miembro '%s'"
-#: apt-inst/deb/debfile.cc:48
-#, c-format
-msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
+#: apt-inst/deb/debfile.cc:50
+#, fuzzy, c-format
+msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
msgstr "Este no es un archivo DEB v�lido, falta el miembro '%s' o '%s'"
-#: apt-inst/deb/debfile.cc:108
+#: apt-inst/deb/debfile.cc:110
#, c-format
msgid "Couldn't change to %s"
msgstr "No pude cambiar a %s"
-#: apt-inst/deb/debfile.cc:134
+#: apt-inst/deb/debfile.cc:140
msgid "Internal error, could not locate member"
msgstr "Error interno, no pude localizar el miembro"
-#: apt-inst/deb/debfile.cc:167
+#: apt-inst/deb/debfile.cc:173
msgid "Failed to locate a valid control file"
msgstr "No pude localizar un archivo de control v�lido"
-#: apt-inst/deb/debfile.cc:252
+#: apt-inst/deb/debfile.cc:258
msgid "Unparsable control file"
msgstr "Archivo de control inanalizable"
@@ -2082,15 +2082,15 @@ msgstr "Error leyendo del servidor, el lado remoto cerr� la conexi�n."
msgid "Error reading from server"
msgstr "Error leyendo del servidor"
-#: methods/http.cc:1108
+#: methods/http.cc:1104
msgid "Bad header data"
msgstr "Mala cabecera Data"
-#: methods/http.cc:1125
+#: methods/http.cc:1121 methods/http.cc:1176
msgid "Connection failed"
msgstr "Fallo la conexi�n"
-#: methods/http.cc:1216
+#: methods/http.cc:1228
msgid "Internal error"
msgstr "Error interno"
@@ -2119,8 +2119,8 @@ msgid "Opening configuration file %s"
msgstr "Abriendo fichero de configuraci�n %s"
#: apt-pkg/contrib/configuration.cc:510
-#, c-format
-msgid "Line %d too long (max %lu)"
+#, fuzzy, c-format
+msgid "Line %d too long (max %u)"
msgstr "L�nea %d demasiado larga (m�x %lu)"
#: apt-pkg/contrib/configuration.cc:606
@@ -2377,28 +2377,28 @@ msgstr "opcional"
msgid "extra"
msgstr "extra"
-#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129
+#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
msgid "Building dependency tree"
msgstr "Creando �rbol de dependencias"
-#: apt-pkg/depcache.cc:101
+#: apt-pkg/depcache.cc:122
msgid "Candidate versions"
msgstr "Versiones candidatas"
-#: apt-pkg/depcache.cc:130
+#: apt-pkg/depcache.cc:151
msgid "Dependency generation"
msgstr "Generaci�n de dependencias"
-#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174
+#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
msgid "Reading state information"
msgstr "Leyendo la informaci�n de estado"
-#: apt-pkg/depcache.cc:198
+#: apt-pkg/depcache.cc:219
#, c-format
msgid "Failed to open StateFile %s"
msgstr "No se pudo abrir el fichero de estado %s"
-#: apt-pkg/depcache.cc:204
+#: apt-pkg/depcache.cc:225
#, c-format
msgid "Failed to write temporary StateFile %s"
msgstr "Fall� la escritura del fichero de estado temporal %s"
@@ -2534,17 +2534,17 @@ msgstr "No se pudo encontrar el m�todo %s."
msgid "Method %s did not start correctly"
msgstr "El m�todo %s no se inici� correctamente"
-#: apt-pkg/acquire-worker.cc:381
+#: apt-pkg/acquire-worker.cc:396
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Por favor, inserte el disco �%s� en la unidad �%s� y presione Intro"
-#: apt-pkg/init.cc:126
+#: apt-pkg/init.cc:124
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "El sistema de paquetes '%s' no est� soportado"
-#: apt-pkg/init.cc:142
+#: apt-pkg/init.cc:140
msgid "Unable to determine a suitable packaging system type"
msgstr "No se pudo determinar un tipo de sistema de paquetes adecuado"
@@ -2685,18 +2685,22 @@ msgstr "Error de E/S guardando cach� fuente"
msgid "rename failed, %s (%s -> %s)."
msgstr "fall� el cambio de nombre, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:401
msgid "MD5Sum mismatch"
msgstr "La suma MD5 difiere"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1405
+#, fuzzy
+msgid "Hash Sum mismatch"
+msgstr "La suma MD5 difiere"
+
+#: apt-pkg/acquire-item.cc:1097
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"No existe ninguna clave p�blica disponible para los siguientes "
"identificadores de clave:\n"
-#: apt-pkg/acquire-item.cc:1219
+#: apt-pkg/acquire-item.cc:1210
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2706,7 +2710,7 @@ msgstr ""
"que necesita arreglar manualmente este paquete (debido a que falta una "
"arquitectura)"
-#: apt-pkg/acquire-item.cc:1278
+#: apt-pkg/acquire-item.cc:1269
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2715,7 +2719,7 @@ msgstr ""
"No se pudo localizar un archivo para el paquete %s. Esto puede significar "
"que necesita arreglar manualmente este paquete."
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1310
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2723,7 +2727,7 @@ msgstr ""
"Los archivos de �ndice de paquetes est�n corrompidos. El campo 'Filename:' "
"no existe para para el paquete %s."
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1397
msgid "Size mismatch"
msgstr "El tama�o difiere"
@@ -2815,77 +2819,87 @@ msgstr "Las entradas de la lista de fuentes para este disco son:\n"
msgid "Unmounting CD-ROM...\n"
msgstr "Desmontando el CD-ROM...\n"
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
#, c-format
msgid "Wrote %i records.\n"
msgstr "%i registros escritos.\n"
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "%i registros escritos con %i fichero de menos.\n"
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "%i registros escritos con %i fichero mal emparejado\n"
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
"%i registros escritos con %i fichero de menos y %i ficheros mal emparejados\n"
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:522
#, c-format
msgid "Preparing %s"
msgstr "Preparando %s"
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:523
#, c-format
msgid "Unpacking %s"
msgstr "Desempaquetando %s"
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:528
#, c-format
msgid "Preparing to configure %s"
msgstr "Prepar�ndose para configurar %s"
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:529
#, c-format
msgid "Configuring %s"
msgstr "Configurando %s"
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:530
#, c-format
msgid "Installed %s"
msgstr "%s instalado"
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:535
#, c-format
msgid "Preparing for removal of %s"
msgstr "Prepar�ndose para eliminar %s"
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:536
#, c-format
msgid "Removing %s"
msgstr "Eliminando %s"
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:537
#, c-format
msgid "Removed %s"
msgstr "%s eliminado"
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:542
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Prepar�ndose para eliminar completamente %s"
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:543
#, c-format
msgid "Completely removed %s"
msgstr "Se borr� completamente %s"
+#: apt-pkg/deb/dpkgpm.cc:566
+#, fuzzy, c-format
+msgid "Directory '%s' missing"
+msgstr "Falta el directorio de listas %spartial."
+
+#: apt-pkg/deb/dpkgpm.cc:709
+#, fuzzy, c-format
+msgid "openpty failed\n"
+msgstr "Fall� la selecci�n"
+
#: methods/rred.cc:219
msgid "Could not patch file"
msgstr "No pude parchear el fichero"
diff --git a/po/eu.po b/po/eu.po
index 79ab71bc4..7a750b8fe 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po_eu\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-06 06:51+0200\n"
-"PO-Revision-Date: 2007-07-10 11:57+0200\n"
+"POT-Creation-Date: 2007-08-04 09:09+0200\n"
+"PO-Revision-Date: 2007-08-07 12:25+0100\n"
"Last-Translator: Piarres Beobide <pi@beobide.net>\n"
"Language-Team: Euskara <Librezale@librezale.org>\n"
"MIME-Version: 1.0\n"
@@ -16,7 +16,6 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"\n"
#: cmdline/apt-cache.cc:143
#, c-format
@@ -161,10 +160,10 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2584 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2585 cmdline/apt-sortpkgs.cc:144
#, c-format
-msgid "%s %s for %s %s compiled on %s %s\n"
-msgstr "%s %s (%s %s) konpilatua: %s %s\n"
+msgid "%s %s for %s compiled on %s %s\n"
+msgstr "%s %s %s-rentzat %s %s-ean konpilatua\n"
#: cmdline/apt-cache.cc:1721
msgid ""
@@ -655,7 +654,7 @@ msgstr "Huts egin du %s izenaren ordez %s ipintzean"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1673
#, c-format
msgid "Regex compilation error - %s"
msgstr "Adierazpen erregularren konpilazio-errorea - %s"
@@ -816,11 +815,11 @@ msgstr "Paketeak ezabatu beharra dute bain Ezabatzea ezgaiturik dago."
msgid "Internal error, Ordering didn't finish"
msgstr "Barne errorea, ez da ordenatzeaz amaitu"
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2011 cmdline/apt-get.cc:2044
msgid "Unable to lock the download directory"
msgstr "Ezin da deskarga-direktorioa blokeatu"
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2092 cmdline/apt-get.cc:2333
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr "Ezin izan da iturburu-zerrenda irakurri."
@@ -851,7 +850,7 @@ msgstr "Deskonprimitu ondoren, %sB gehiago erabiliko dira diskoan.\n"
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Deskonprimitu ondoren, %sB libratuko dira diskoan.\n"
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2186
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2187
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Ezin da %s(e)n duzun leku librea atzeman."
@@ -888,7 +887,7 @@ msgstr "Abortatu."
msgid "Do you want to continue [Y/n]? "
msgstr "Aurrera jarraitu nahi al duzu [B/e]? "
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2229
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2230
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Ezin da lortu %s %s\n"
@@ -897,7 +896,7 @@ msgstr "Ezin da lortu %s %s\n"
msgid "Some files failed to download"
msgstr "Fitxategi batzuk ezin izan dira deskargatu"
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2238
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2239
msgid "Download complete and in download only mode"
msgstr "Deskarga amaituta eta deskarga soileko moduan"
@@ -1034,7 +1033,7 @@ msgstr ""
"Hmmm, dirudienez AutoRemover-ek gertatu behar ez zen apurtu du\n"
"Mesedez programa errore txosten bat bete mesedez."
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1754
msgid "The following information may help to resolve the situation:"
msgstr "Informazio honek arazoa konpontzen lagun dezake:"
@@ -1046,31 +1045,31 @@ msgstr "Barne Errorea, AutoRemover-ek zerbait apurtu du"
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Barne Errorea, AllUpgade-k zerbait apurtu du"
-#: cmdline/apt-get.cc:1544
+#: cmdline/apt-get.cc:1545
#, c-format
msgid "Couldn't find task %s"
msgstr "Ezin izan da %s zeregina aurkitu"
-#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
+#: cmdline/apt-get.cc:1660 cmdline/apt-get.cc:1696
#, c-format
msgid "Couldn't find package %s"
msgstr "Ezin izan da %s paketea aurkitu"
-#: cmdline/apt-get.cc:1682
+#: cmdline/apt-get.cc:1683
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Oharra: %s hautatzen '%s' adierazpen erregularrarentzat\n"
-#: cmdline/apt-get.cc:1712
+#: cmdline/apt-get.cc:1713
#, c-format
msgid "%s set to manual installed.\n"
msgstr "%s eskuz instalatua bezala ezarri.\n"
-#: cmdline/apt-get.cc:1725
+#: cmdline/apt-get.cc:1726
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Beharbada `apt-get -f install' exekutatu nahiko duzu hauek zuzentzeko:"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1729
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1078,7 +1077,7 @@ msgstr ""
"Bete gabeko mendekotasunak. Probatu 'apt-get -f install' paketerik gabe (edo "
"zehaztu konponbide bat)."
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1741
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1090,7 +1089,7 @@ msgstr ""
"beharrezko pakete batzuk ez ziren sortuko oraindik, edo \n"
"Sarrerakoetan (Incoming) egoten jarraituko dute."
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1749
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1099,117 +1098,117 @@ msgstr ""
"Eragiketa soil bat eskatu duzunez, seguru asko paketea ez da instalagarria\n"
"izango, eta pakete horren errorearen berri ematea komeni da."
-#: cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1757
msgid "Broken packages"
msgstr "Hautsitako paketeak"
-#: cmdline/apt-get.cc:1785
+#: cmdline/apt-get.cc:1786
msgid "The following extra packages will be installed:"
msgstr "Ondorengo pakete gehigarriak instalatuko dira:"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Suggested packages:"
msgstr "Iradokitako paketeak:"
-#: cmdline/apt-get.cc:1875
+#: cmdline/apt-get.cc:1876
msgid "Recommended packages:"
msgstr "Gomendatutako paketeak:"
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1904
msgid "Calculating upgrade... "
msgstr "Berriketak kalkulatzen... "
-#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1907 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Huts egin du"
-#: cmdline/apt-get.cc:1911
+#: cmdline/apt-get.cc:1912
msgid "Done"
msgstr "Eginda"
-#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
+#: cmdline/apt-get.cc:1979 cmdline/apt-get.cc:1987
msgid "Internal error, problem resolver broke stuff"
msgstr "Barne Errorea, arazo konpontzaileak zerbait apurtu du"
-#: cmdline/apt-get.cc:2086
+#: cmdline/apt-get.cc:2087
msgid "Must specify at least one package to fetch source for"
msgstr "Gutxienez pakete bat zehaztu behar duzu iturburua lortzeko"
-#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2350
+#: cmdline/apt-get.cc:2117 cmdline/apt-get.cc:2351
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Ezin da iturburu-paketerik aurkitu %s(r)entzat"
-#: cmdline/apt-get.cc:2165
+#: cmdline/apt-get.cc:2166
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Dagoeneko deskargaturiko '%s' fitxategia saltatzen\n"
-#: cmdline/apt-get.cc:2189
+#: cmdline/apt-get.cc:2190
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Ez daukazu nahikoa leku libre %s(e)n."
-#: cmdline/apt-get.cc:2194
+#: cmdline/apt-get.cc:2195
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Iturburu-artxiboetako %sB/%sB eskuratu behar dira.\n"
-#: cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2198
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Iturburu-artxiboetako %sB eskuratu behar dira.\n"
-#: cmdline/apt-get.cc:2203
+#: cmdline/apt-get.cc:2204
#, c-format
msgid "Fetch source %s\n"
msgstr "Eskuratu %s iturubura\n"
-#: cmdline/apt-get.cc:2234
+#: cmdline/apt-get.cc:2235
msgid "Failed to fetch some archives."
msgstr "Huts egin du zenbat artxibo lortzean."
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2263
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
"%s(e)n dagoeneko deskonprimitutako iturburua deskonprimitzea saltatzen\n"
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2275
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Deskonprimitzeko '%s' komandoak huts egin du.\n"
-#: cmdline/apt-get.cc:2275
+#: cmdline/apt-get.cc:2276
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Egiaztattu 'dpkg-dev' paketea instalaturik dagoen.\n"
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2293
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Eraikitzeko '%s' komandoak huts egin du.\n"
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:2312
msgid "Child process failed"
msgstr "Prozesu umeak huts egin du"
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2328
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Gutxienez pakete bat zehaztu behar duzu eraikitze-mendekotasunak egiaztatzeko"
-#: cmdline/apt-get.cc:2355
+#: cmdline/apt-get.cc:2356
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Ezin izan da %s(r)en eraikitze-mendekotasunen informazioa eskuratu"
-#: cmdline/apt-get.cc:2375
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s: ez du eraikitze-mendekotasunik.\n"
-#: cmdline/apt-get.cc:2427
+#: cmdline/apt-get.cc:2428
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1217,7 +1216,7 @@ msgid ""
msgstr ""
"%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu"
-#: cmdline/apt-get.cc:2479
+#: cmdline/apt-get.cc:2480
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1226,32 +1225,32 @@ msgstr ""
"%2$s(r)en %1$s mendekotasuna ezin da bete, ez baitago bertsio-eskakizunak "
"betetzen dituen %3$s paketearen bertsio erabilgarririk"
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2515
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Huts egin du %2$s(r)en %1$s mendekotasuna betetzean: instalatutako %3$s "
"paketea berriegia da"
-#: cmdline/apt-get.cc:2539
+#: cmdline/apt-get.cc:2540
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Huts egin du %2$s(r)en %1$s mendekotasuna betetzean: %3$s"
-#: cmdline/apt-get.cc:2553
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "%s(r)en eraikitze-mendekotasunak ezin izan dira bete."
-#: cmdline/apt-get.cc:2557
+#: cmdline/apt-get.cc:2558
msgid "Failed to process build dependencies"
msgstr "Huts egin du eraikitze-mendekotasunak prozesatzean"
-#: cmdline/apt-get.cc:2589
+#: cmdline/apt-get.cc:2590
msgid "Supported modules:"
msgstr "Onartutako Moduluak:"
-#: cmdline/apt-get.cc:2630
+#: cmdline/apt-get.cc:2631
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1674,26 +1673,26 @@ msgstr "Errorea MD5 analizatzean. Desplazamendua %lu"
msgid "This is not a valid DEB archive, missing '%s' member"
msgstr "Ez da baliozko DEB artxiboa; '%s' kidea falta da"
-#: apt-inst/deb/debfile.cc:48
+#: apt-inst/deb/debfile.cc:50
#, c-format
-msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
+msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
msgstr ""
-"Hau ez da balioz DEB fitxategi bat, ez du ez '%s' ez '%s' atalik falta du"
+"Hau ez da balioz DEB fitxategi bat, ez du '%s', '%s' eta '%s' atalik "
-#: apt-inst/deb/debfile.cc:108
+#: apt-inst/deb/debfile.cc:110
#, c-format
msgid "Couldn't change to %s"
msgstr "Ezin izan da %s(e)ra aldatu"
-#: apt-inst/deb/debfile.cc:134
+#: apt-inst/deb/debfile.cc:140
msgid "Internal error, could not locate member"
msgstr "Barne Errorea, ezin da atala kokatu"
-#: apt-inst/deb/debfile.cc:167
+#: apt-inst/deb/debfile.cc:173
msgid "Failed to locate a valid control file"
msgstr "Ezin izan da baliozko kontrol-fitxategi bat lokalizatu"
-#: apt-inst/deb/debfile.cc:252
+#: apt-inst/deb/debfile.cc:258
msgid "Unparsable control file"
msgstr "Kontrol fitxategi ezin analizagarria"
@@ -2061,15 +2060,15 @@ msgstr "Errorea zerbitzaritik irakurtzen Urrunetik amaitutako konexio itxiera"
msgid "Error reading from server"
msgstr "Errorea zerbitzaritik irakurtzean"
-#: methods/http.cc:1108
+#: methods/http.cc:1104
msgid "Bad header data"
msgstr "Goiburu data gaizki dago"
-#: methods/http.cc:1125
+#: methods/http.cc:1121 methods/http.cc:1176
msgid "Connection failed"
msgstr "Konexioak huts egin du"
-#: methods/http.cc:1216
+#: methods/http.cc:1228
msgid "Internal error"
msgstr "Barne-errorea"
@@ -2099,8 +2098,8 @@ msgstr "%s konfigurazio-fitxategia irekitzen"
#: apt-pkg/contrib/configuration.cc:510
#, c-format
-msgid "Line %d too long (max %lu)"
-msgstr "%d lerroa luzeegia da (gehienez %lu)"
+msgid "Line %d too long (max %u)"
+msgstr "%d lerroa luzeegia da (gehienez %u)"
#: apt-pkg/contrib/configuration.cc:606
#, c-format
@@ -2356,28 +2355,28 @@ msgstr "aukerakoa"
msgid "extra"
msgstr "estra"
-#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129
+#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
msgid "Building dependency tree"
msgstr "Dependentzia zuhaitza eraikitzen"
-#: apt-pkg/depcache.cc:101
+#: apt-pkg/depcache.cc:122
msgid "Candidate versions"
msgstr "Hautagaien bertsioak"
-#: apt-pkg/depcache.cc:130
+#: apt-pkg/depcache.cc:151
msgid "Dependency generation"
msgstr "Dependentzi Sormena"
-#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174
+#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
msgid "Reading state information"
msgstr "Egoera argibideak irakurtzen"
-#: apt-pkg/depcache.cc:198
+#: apt-pkg/depcache.cc:219
#, c-format
msgid "Failed to open StateFile %s"
msgstr "Huts egin du %s EgoeraFitxategia irekitzean"
-#: apt-pkg/depcache.cc:204
+#: apt-pkg/depcache.cc:225
#, c-format
msgid "Failed to write temporary StateFile %s"
msgstr "Ezin izan da %s aldiroko EgoeraFitrxategia idatzi"
@@ -2510,17 +2509,17 @@ msgstr "Ezin izan da %s metodo-kontrolatzailea aurkitu."
msgid "Method %s did not start correctly"
msgstr "%s metodoa ez da behar bezala abiarazi"
-#: apt-pkg/acquire-worker.cc:381
+#: apt-pkg/acquire-worker.cc:396
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Mesedez sa ''%s' izeneko diska '%s' gailuan eta enter sakatu"
-#: apt-pkg/init.cc:126
+#: apt-pkg/init.cc:124
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "'%s' pakete-sistema ez da onartzen"
-#: apt-pkg/init.cc:142
+#: apt-pkg/init.cc:140
msgid "Unable to determine a suitable packaging system type"
msgstr "Ezin da pakete-sistemaren mota egokirik zehaztu"
@@ -2652,16 +2651,19 @@ msgstr "S/I errorea iturburu-cachea gordetzean"
msgid "rename failed, %s (%s -> %s)."
msgstr "huts egin du izen-aldaketak, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:401
msgid "MD5Sum mismatch"
msgstr "MD5Sum ez dator bat"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1405
+msgid "Hash Sum mismatch"
+msgstr "Egiaztapena ez dator bat"
+
+#: apt-pkg/acquire-item.cc:1097
msgid "There is no public key available for the following key IDs:\n"
msgstr "Ez dago gako publiko erabilgarririk hurrengo gako ID hauentzat:\n"
-#: apt-pkg/acquire-item.cc:1219
+#: apt-pkg/acquire-item.cc:1210
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2670,7 +2672,7 @@ msgstr ""
"Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu "
"beharko duzu paketea. (arkitektura falta delako)"
-#: apt-pkg/acquire-item.cc:1278
+#: apt-pkg/acquire-item.cc:1269
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2679,7 +2681,7 @@ msgstr ""
"Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu "
"beharko duzu paketea."
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1310
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2687,7 +2689,7 @@ msgstr ""
"Paketearen indize-fitxategiak hondatuta daude. 'Filename:' eremurik ez %s "
"paketearentzat."
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1397
msgid "Size mismatch"
msgstr "Tamaina ez dator bat"
@@ -2779,77 +2781,87 @@ msgstr "Diskarentzako jaotrri sarrerak:\n"
msgid "Unmounting CD-ROM...\n"
msgstr "CD-ROM Desmuntatzen...\n"
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
#, c-format
msgid "Wrote %i records.\n"
msgstr "%i erregistro grabaturik.\n"
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "%i erregistro eta %i galdutako fitxategi grabaturik.\n"
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "%i erregistro eta %i okerreko fitxategi grabaturik.\n"
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
"%i erregistro, %i galdutako fitxategi eta %i okerreko fitxategi grabaturik.\n"
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:522
#, c-format
msgid "Preparing %s"
msgstr "%s prestatzen"
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:523
#, c-format
msgid "Unpacking %s"
msgstr "%s irekitzen"
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:528
#, c-format
msgid "Preparing to configure %s"
msgstr "%s konfiguratzeko prestatzen"
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:529
#, c-format
msgid "Configuring %s"
msgstr "%s konfiguratzen"
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:530
#, c-format
msgid "Installed %s"
msgstr "%s Instalatuta"
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:535
#, c-format
msgid "Preparing for removal of %s"
msgstr "%s kentzeko prestatzen"
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:536
#, c-format
msgid "Removing %s"
msgstr "%s kentzen"
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:537
#, c-format
msgid "Removed %s"
msgstr "%s kendurik"
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:542
#, c-format
msgid "Preparing to completely remove %s"
msgstr "%s guztiz ezabatzeko prestatzen"
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:543
#, c-format
msgid "Completely removed %s"
msgstr "%s guztiz ezabatu da"
+#: apt-pkg/deb/dpkgpm.cc:566
+#, c-format
+msgid "Directory '%s' missing"
+msgstr "'%s' direktorioa falta da."
+
+#: apt-pkg/deb/dpkgpm.cc:709
+#, c-format
+msgid "openpty failed\n"
+msgstr "openpty-ek huts egin du\n"
+
#: methods/rred.cc:219
msgid "Could not patch file"
msgstr "Ezin izan zaio fixtategiari adabakia ezarri"
diff --git a/po/fi.po b/po/fi.po
index cf6af5347..8e9877df1 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.26\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-06 06:51+0200\n"
+"POT-Creation-Date: 2007-08-04 09:09+0200\n"
"PO-Revision-Date: 2006-09-29 16:06+0300\n"
"Last-Translator: Tapio Lehtonen <tale@debian.org>\n"
"Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@ -160,9 +160,9 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2584 cmdline/apt-sortpkgs.cc:144
-#, c-format
-msgid "%s %s for %s %s compiled on %s %s\n"
+#: cmdline/apt-get.cc:2585 cmdline/apt-sortpkgs.cc:144
+#, fuzzy, c-format
+msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s laitealustalle %s %s käännöksen päiväys %s %s\n"
#: cmdline/apt-cache.cc:1721
@@ -657,7 +657,7 @@ msgstr "Nimen muuttaminen %s -> %s ei onnistunut"
msgid "Y"
msgstr "K"
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1673
#, c-format
msgid "Regex compilation error - %s"
msgstr "Käännösvirhe lausekkeessa - %s"
@@ -818,11 +818,11 @@ msgstr "Paketteja pitäisi poistaa mutta Remove ei ole käytössä."
msgid "Internal error, Ordering didn't finish"
msgstr "Tapahtui sisäinen virhe, järjestäminen keskeytyi"
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2011 cmdline/apt-get.cc:2044
msgid "Unable to lock the download directory"
msgstr "Noutokansiota ei saatu lukittua"
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2092 cmdline/apt-get.cc:2333
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr "Lähteiden luetteloa ei pystynyt lukemaan."
@@ -852,7 +852,7 @@ msgstr "Purkamisen jälkeen käytetään %st lisää levytilaa.\n"
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Purkamisen jälkeen vapautuu %st levytilaa.\n"
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2186
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2187
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Kansion %s vapaan tilan määrä ei selvinnyt"
@@ -890,7 +890,7 @@ msgstr "Keskeytä."
msgid "Do you want to continue [Y/n]? "
msgstr "Haluatko jatkaa [K/e]? "
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2229
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2230
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Tiedoston %s nouto ei onnistunut %s\n"
@@ -899,7 +899,7 @@ msgstr "Tiedoston %s nouto ei onnistunut %s\n"
msgid "Some files failed to download"
msgstr "Joidenkin tiedostojen nouto ei onnistunut"
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2238
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2239
msgid "Download complete and in download only mode"
msgstr "Nouto on valmis ja määrätty vain nouto"
@@ -1033,7 +1033,7 @@ msgid ""
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1754
msgid "The following information may help to resolve the situation:"
msgstr "Seuraavista tiedoista voi olla hyötyä selvitettäessä tilannetta:"
@@ -1046,31 +1046,31 @@ msgstr "Sisäinen virhe, resolver rikkoi jotain"
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Sisäinen virhe, AllUpgrade rikkoi jotain"
-#: cmdline/apt-get.cc:1544
+#: cmdline/apt-get.cc:1545
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "Pakettia %s ei löytynyt"
-#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
+#: cmdline/apt-get.cc:1660 cmdline/apt-get.cc:1696
#, c-format
msgid "Couldn't find package %s"
msgstr "Pakettia %s ei löytynyt"
-#: cmdline/apt-get.cc:1682
+#: cmdline/apt-get.cc:1683
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Huomautus, valitaan %s lausekkeella \"%s\"\n"
-#: cmdline/apt-get.cc:1712
+#: cmdline/apt-get.cc:1713
#, fuzzy, c-format
msgid "%s set to manual installed.\n"
msgstr "mutta %s on merkitty asennettavaksi"
-#: cmdline/apt-get.cc:1725
+#: cmdline/apt-get.cc:1726
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Saatat haluta suorittaa \"apt-get -f install\" korjaamaan nämä:"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1729
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1078,7 +1078,7 @@ msgstr ""
"Kaikkia riippuvuuksia ei ole tyydytetty. Kokeile \"apt-get -f install\" "
"ilmanpaketteja (tai ratkaise itse)."
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1741
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1089,7 +1089,7 @@ msgstr ""
"jos käytetään epävakaata jakelua, joitain vaadittuja paketteja ei ole\n"
"vielä luotu tai siirretty Incoming-kansiosta."
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1749
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1099,116 +1099,116 @@ msgstr ""
"paketti ei lainkaan ole asennettavissa ja olisi tehtävä vikailmoitus\n"
"tuosta paketista."
-#: cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1757
msgid "Broken packages"
msgstr "Rikkinäiset paketit"
-#: cmdline/apt-get.cc:1785
+#: cmdline/apt-get.cc:1786
msgid "The following extra packages will be installed:"
msgstr "Seuraavat ylimääräiset paketit on merkitty asennettaviksi:"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Suggested packages:"
msgstr "Ehdotetut paketit:"
-#: cmdline/apt-get.cc:1875
+#: cmdline/apt-get.cc:1876
msgid "Recommended packages:"
msgstr "Suositellut paketit:"
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1904
msgid "Calculating upgrade... "
msgstr "Käsitellään päivitystä ... "
-#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1907 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Ei onnistunut"
-#: cmdline/apt-get.cc:1911
+#: cmdline/apt-get.cc:1912
msgid "Done"
msgstr "Valmis"
-#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
+#: cmdline/apt-get.cc:1979 cmdline/apt-get.cc:1987
msgid "Internal error, problem resolver broke stuff"
msgstr "Sisäinen virhe, resolver rikkoi jotain"
-#: cmdline/apt-get.cc:2086
+#: cmdline/apt-get.cc:2087
msgid "Must specify at least one package to fetch source for"
msgstr "On annettava ainakin yksi paketti jonka lähdekoodi noudetaan"
-#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2350
+#: cmdline/apt-get.cc:2117 cmdline/apt-get.cc:2351
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Paketin %s lähdekoodipakettia ei löytynyt"
-#: cmdline/apt-get.cc:2165
+#: cmdline/apt-get.cc:2166
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Ohitetaan jo noudettu tiedosto \"%s\"\n"
-#: cmdline/apt-get.cc:2189
+#: cmdline/apt-get.cc:2190
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Kansiossa %s ei ole riittävästi vapaata tilaa"
-#: cmdline/apt-get.cc:2194
+#: cmdline/apt-get.cc:2195
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "On noudettava %st/%st lähdekoodiarkistoja.\n"
-#: cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2198
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "On noudettava %st lähdekoodiarkistoja.\n"
-#: cmdline/apt-get.cc:2203
+#: cmdline/apt-get.cc:2204
#, c-format
msgid "Fetch source %s\n"
msgstr "Nouda lähdekoodi %s\n"
-#: cmdline/apt-get.cc:2234
+#: cmdline/apt-get.cc:2235
msgid "Failed to fetch some archives."
msgstr "Joidenkin arkistojen noutaminen ei onnistunut."
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2263
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Ohitetaan purku jo puretun lähdekoodin %s kohdalla\n"
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2275
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Purkukomento \"%s\" ei onnistunut.\n"
-#: cmdline/apt-get.cc:2275
+#: cmdline/apt-get.cc:2276
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Tarkista onko paketti \"dpkg-dev\" asennettu.\n"
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2293
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Paketointikomento \"%s\" ei onnistunut.\n"
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:2312
msgid "Child process failed"
msgstr "Lapsiprosessi kaatui"
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2328
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"On annettava ainakin yksi paketti jonka paketointiriippuvuudet tarkistetaan"
-#: cmdline/apt-get.cc:2355
+#: cmdline/apt-get.cc:2356
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Paketille %s ei ole saatavilla riippuvuustietoja"
-#: cmdline/apt-get.cc:2375
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "%s has no build depends.\n"
msgstr "Paketille %s ei ole määritetty paketointiriippuvuuksia.\n"
-#: cmdline/apt-get.cc:2427
+#: cmdline/apt-get.cc:2428
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1216,7 +1216,7 @@ msgid ""
msgstr ""
"riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy"
-#: cmdline/apt-get.cc:2479
+#: cmdline/apt-get.cc:2480
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1225,32 +1225,32 @@ msgstr ""
"%s riippuvuutta paketille %s ei voi tyydyttää koska mikään paketin %s versio "
"ei vastaa versioriippuvuuksia"
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2515
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Riippuvutta %s paketille %s ei voi tyydyttää: Asennettu paketti %s on liian "
"uusi"
-#: cmdline/apt-get.cc:2539
+#: cmdline/apt-get.cc:2540
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Riippuvuutta %s paketille %s ei voi tyydyttää: %s"
-#: cmdline/apt-get.cc:2553
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Paketointiriippuvuuksia paketille %s ei voi tyydyttää."
-#: cmdline/apt-get.cc:2557
+#: cmdline/apt-get.cc:2558
msgid "Failed to process build dependencies"
msgstr "Paketointiriippuvuuksien käsittely ei onnistunut"
-#: cmdline/apt-get.cc:2589
+#: cmdline/apt-get.cc:2590
msgid "Supported modules:"
msgstr "Tuetut moduulit:"
-#: cmdline/apt-get.cc:2630
+#: cmdline/apt-get.cc:2631
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1673,25 +1673,25 @@ msgstr "Tapahtui virhe jäsennettäessä MD5:ttä. Kohta %lu"
msgid "This is not a valid DEB archive, missing '%s' member"
msgstr "Tämä ei ole kelvollinen DEB-arkisto, puuttuu tiedosto \"%s\""
-#: apt-inst/deb/debfile.cc:48
-#, c-format
-msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
+#: apt-inst/deb/debfile.cc:50
+#, fuzzy, c-format
+msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
msgstr "Tämä ei ole kelvollinen DEB-arkisto, puuttuu osat \"%s\" ja \"%s\"."
-#: apt-inst/deb/debfile.cc:108
+#: apt-inst/deb/debfile.cc:110
#, c-format
msgid "Couldn't change to %s"
msgstr "Kansioon %s vaihto ei onnistunut"
-#: apt-inst/deb/debfile.cc:134
+#: apt-inst/deb/debfile.cc:140
msgid "Internal error, could not locate member"
msgstr "Tapahtui sisäinen virhe, tiedostoa ei löydy"
-#: apt-inst/deb/debfile.cc:167
+#: apt-inst/deb/debfile.cc:173
msgid "Failed to locate a valid control file"
msgstr "Kelvollista ohjaustiedostoa ei löydy"
-#: apt-inst/deb/debfile.cc:252
+#: apt-inst/deb/debfile.cc:258
msgid "Unparsable control file"
msgstr "Ohjaustiedosto ei jäsenny"
@@ -2056,15 +2056,15 @@ msgstr "Tapahtui virhe luettaessa palvelimelta. Etäpää sulki yhteyden"
msgid "Error reading from server"
msgstr "Tapahtui virhe luettaessa palvelimelta"
-#: methods/http.cc:1108
+#: methods/http.cc:1104
msgid "Bad header data"
msgstr "Virheellinen otsikkotieto"
-#: methods/http.cc:1125
+#: methods/http.cc:1121 methods/http.cc:1176
msgid "Connection failed"
msgstr "Yhteys ei toiminut"
-#: methods/http.cc:1216
+#: methods/http.cc:1228
msgid "Internal error"
msgstr "Sisäinen virhe"
@@ -2094,7 +2094,7 @@ msgstr "Avataan asetustiedosto %s"
#: apt-pkg/contrib/configuration.cc:510
#, fuzzy, c-format
-msgid "Line %d too long (max %lu)"
+msgid "Line %d too long (max %u)"
msgstr "Rivi %d on liian pitkä (enintään %d)"
#: apt-pkg/contrib/configuration.cc:606
@@ -2347,29 +2347,29 @@ msgstr "valinnainen"
msgid "extra"
msgstr "ylimääräinen"
-#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129
+#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
msgid "Building dependency tree"
msgstr "Muodostetaan riippuvuussuhteiden puu"
-#: apt-pkg/depcache.cc:101
+#: apt-pkg/depcache.cc:122
msgid "Candidate versions"
msgstr "Mahdolliset versiot"
-#: apt-pkg/depcache.cc:130
+#: apt-pkg/depcache.cc:151
msgid "Dependency generation"
msgstr "Luodaan riippuvuudet"
-#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174
+#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
#, fuzzy
msgid "Reading state information"
msgstr "Yhdistetään saatavuustiedot"
-#: apt-pkg/depcache.cc:198
+#: apt-pkg/depcache.cc:219
#, fuzzy, c-format
msgid "Failed to open StateFile %s"
msgstr "Tiedoston %s avaaminen ei onnistunut"
-#: apt-pkg/depcache.cc:204
+#: apt-pkg/depcache.cc:225
#, fuzzy, c-format
msgid "Failed to write temporary StateFile %s"
msgstr "Tiedoston %s kirjoittaminen ei onnistunut"
@@ -2500,17 +2500,17 @@ msgstr "Menetelmän ajuria %s ei löytynyt"
msgid "Method %s did not start correctly"
msgstr "Menetelmä %s ei käynnistynyt oikein"
-#: apt-pkg/acquire-worker.cc:381
+#: apt-pkg/acquire-worker.cc:396
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Pistä levy nimeltään: \"%s\" asemaan \"%s\" ja paina Enter."
-#: apt-pkg/init.cc:126
+#: apt-pkg/init.cc:124
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Paketointijärjestelmä \"%s\" ei ole tuettu"
-#: apt-pkg/init.cc:142
+#: apt-pkg/init.cc:140
msgid "Unable to determine a suitable packaging system type"
msgstr "Sopivaa paketointijärjestelmän tyyppiä ei saa selvitettyä"
@@ -2645,16 +2645,20 @@ msgstr "Syöttö/Tulostus -virhe tallennettaessa pakettivarastoa"
msgid "rename failed, %s (%s -> %s)."
msgstr "nimen vaihto ei onnistunut, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:401
msgid "MD5Sum mismatch"
msgstr "MD5Sum ei täsmää"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1405
+#, fuzzy
+msgid "Hash Sum mismatch"
+msgstr "MD5Sum ei täsmää"
+
+#: apt-pkg/acquire-item.cc:1097
msgid "There is no public key available for the following key IDs:\n"
msgstr "Julkisia avaimia ei ole saatavilla, avainten ID:t ovat:\n"
-#: apt-pkg/acquire-item.cc:1219
+#: apt-pkg/acquire-item.cc:1210
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2663,7 +2667,7 @@ msgstr ""
"En löytänyt pakettia %s vastaavaa tiedostoa. Voit ehkä joutua korjaamaan "
"tämän paketin itse (puuttuvan arkkitehtuurin vuoksi)"
-#: apt-pkg/acquire-item.cc:1278
+#: apt-pkg/acquire-item.cc:1269
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2672,7 +2676,7 @@ msgstr ""
"Pakettia %s vastaavaa tiedostoa ei löytynyt. Voit ehkä joutua korjaamaan "
"tämän paketin itse."
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1310
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2680,7 +2684,7 @@ msgstr ""
"Pakettihakemistotiedostot ovat turmeltuneet. Paketille %s ei ole Filename-"
"kenttää."
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1397
msgid "Size mismatch"
msgstr "Koko ei täsmää"
@@ -2773,78 +2777,88 @@ msgstr "Tämän levyn lähdekoodipakettien luettelon tietueita ovat:\n"
msgid "Unmounting CD-ROM...\n"
msgstr "Irrotetaan romppu..."
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
#, c-format
msgid "Wrote %i records.\n"
msgstr "Kirjoitettiin %i tietuetta.\n"
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Kirjoitettiin %i tietuetta joissa oli %i puuttuvaa tiedostoa.\n"
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Kirjoitettiin %i tietuetta joissa oli %i paritonta tiedostoa\n"
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
"Kirjoitettiin %i tietuetta joissa oli %i puuttuvaa ja %i paritonta "
"tiedostoa\n"
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:522
#, c-format
msgid "Preparing %s"
msgstr "Valmistellaan %s"
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:523
#, c-format
msgid "Unpacking %s"
msgstr "Puretaan %s"
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:528
#, c-format
msgid "Preparing to configure %s"
msgstr "Valmistaudutaan tekemään asetukset: %s"
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:529
#, c-format
msgid "Configuring %s"
msgstr "Tehdään asetukset: %s"
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:530
#, c-format
msgid "Installed %s"
msgstr "%s asennettu"
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:535
#, c-format
msgid "Preparing for removal of %s"
msgstr "Valmistaudutaan poistamaan %s"
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:536
#, c-format
msgid "Removing %s"
msgstr "Poistetaan %s"
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:537
#, c-format
msgid "Removed %s"
msgstr "%s poistettu"
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:542
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Valmistaudutaan poistamaan %s kokonaan"
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:543
#, c-format
msgid "Completely removed %s"
msgstr "%s poistettiin kokonaan"
+#: apt-pkg/deb/dpkgpm.cc:566
+#, fuzzy, c-format
+msgid "Directory '%s' missing"
+msgstr "Luettelokansio %spartial puuttuu."
+
+#: apt-pkg/deb/dpkgpm.cc:709
+#, fuzzy, c-format
+msgid "openpty failed\n"
+msgstr "Select ei toiminut"
+
#: methods/rred.cc:219
msgid "Could not patch file"
msgstr "Tiedostoa %s ei voitu avata"
diff --git a/po/fr.po b/po/fr.po
index d15b66929..11e8be953 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,14 +6,14 @@
# Christian Perrier <bubulle@debian.org>, 2004-2005, 2006, 2007.
msgid ""
msgstr ""
-"Project-Id-Version: fr\n"
+"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-06 06:51+0200\n"
-"PO-Revision-Date: 2007-06-12 22:24+0200\n"
+"POT-Creation-Date: 2007-08-04 09:09+0200\n"
+"PO-Revision-Date: 2007-08-04 12:46+0200\n"
"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: Plural-Forms: nplurals=2; plural=n>1;\n"
@@ -21,7 +21,7 @@ msgstr ""
#: cmdline/apt-cache.cc:143
#, c-format
msgid "Package %s version %s has an unmet dep:\n"
-msgstr "Le paquet %s de version %s contient une d�pendance absente�:\n"
+msgstr "Le paquet %s de version %s contient une dépendance absente :\n"
#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640
#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018
@@ -32,72 +32,72 @@ msgstr "Impossible de trouver le paquet %s"
#: cmdline/apt-cache.cc:247
msgid "Total package names : "
-msgstr "Nombre total de paquets�: "
+msgstr "Nombre total de paquets : "
#: cmdline/apt-cache.cc:287
msgid " Normal packages: "
-msgstr " Paquets ordinaires�: "
+msgstr " Paquets ordinaires : "
#: cmdline/apt-cache.cc:288
msgid " Pure virtual packages: "
-msgstr " Paquets enti�rement virtuels�: "
+msgstr " Paquets entièrement virtuels : "
#: cmdline/apt-cache.cc:289
msgid " Single virtual packages: "
-msgstr " Paquets virtuels simples�: "
+msgstr " Paquets virtuels simples : "
#: cmdline/apt-cache.cc:290
msgid " Mixed virtual packages: "
-msgstr " Paquets virtuels mixtes�: "
+msgstr " Paquets virtuels mixtes : "
#: cmdline/apt-cache.cc:291
msgid " Missing: "
-msgstr " Manquants�: "
+msgstr " Manquants : "
#: cmdline/apt-cache.cc:293
msgid "Total distinct versions: "
-msgstr "Nombre de versions distinctes�: "
+msgstr "Nombre de versions distinctes : "
#: cmdline/apt-cache.cc:295
msgid "Total Distinct Descriptions: "
-msgstr "Nombre de descriptions distinctes�: "
+msgstr "Nombre de descriptions distinctes : "
#: cmdline/apt-cache.cc:297
msgid "Total dependencies: "
-msgstr "Nombre de d�pendances�: "
+msgstr "Nombre de dépendances : "
#: cmdline/apt-cache.cc:300
msgid "Total ver/file relations: "
-msgstr "Nombre de relations version/fichier�: "
+msgstr "Nombre de relations version/fichier : "
#: cmdline/apt-cache.cc:302
msgid "Total Desc/File relations: "
-msgstr "Nombre de relations description/fichier�: "
+msgstr "Nombre de relations description/fichier : "
#: cmdline/apt-cache.cc:304
msgid "Total Provides mappings: "
-msgstr "Nombre de relations ��Provides���: "
+msgstr "Nombre de relations « Provides » : "
#: cmdline/apt-cache.cc:316
msgid "Total globbed strings: "
-msgstr "Nombre de motifs rationnels�: "
+msgstr "Nombre de motifs rationnels : "
#: cmdline/apt-cache.cc:330
msgid "Total dependency version space: "
-msgstr "Espace occup� par les versions des d�pendances�: "
+msgstr "Espace occupé par les versions des dépendances : "
#: cmdline/apt-cache.cc:335
msgid "Total slack space: "
-msgstr "Espace disque gaspill�: "
+msgstr "Espace disque gaspillé : "
#: cmdline/apt-cache.cc:343
msgid "Total space accounted for: "
-msgstr "Total de l'espace attribu�: "
+msgstr "Total de l'espace attribué : "
#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218
#, c-format
msgid "Package file %s is out of sync."
-msgstr "Fichier %s d�synchronis�."
+msgstr "Fichier %s désynchronisé."
#: cmdline/apt-cache.cc:1293
msgid "You must give exactly one pattern"
@@ -105,15 +105,15 @@ msgstr "Vous devez fournir exactement un motif"
#: cmdline/apt-cache.cc:1447
msgid "No packages found"
-msgstr "Aucun paquet n'a �t� trouv�"
+msgstr "Aucun paquet n'a été trouvé"
#: cmdline/apt-cache.cc:1524
msgid "Package files:"
-msgstr "Fichiers du paquet�:"
+msgstr "Fichiers du paquet :"
#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617
msgid "Cache is out of sync, can't x-ref a package file"
-msgstr "Le cache est d�synchronis�, impossible de r�f�rencer un fichier"
+msgstr "Le cache est désynchronisé, impossible de référencer un fichier"
#: cmdline/apt-cache.cc:1532
#, c-format
@@ -123,16 +123,16 @@ msgstr "%4i %s\n"
#. Show any packages have explicit pins
#: cmdline/apt-cache.cc:1544
msgid "Pinned packages:"
-msgstr "Paquets �tiquet�s�:"
+msgstr "Paquets étiquetés :"
#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597
msgid "(not found)"
-msgstr "(non trouv�)"
+msgstr "(non trouvé)"
#. Installed version
#: cmdline/apt-cache.cc:1577
msgid " Installed: "
-msgstr " Install�: "
+msgstr " Installé : "
#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587
msgid "(none)"
@@ -141,16 +141,16 @@ msgstr "(aucun)"
#. Candidate Version
#: cmdline/apt-cache.cc:1584
msgid " Candidate: "
-msgstr " Candidat�: "
+msgstr " Candidat : "
#: cmdline/apt-cache.cc:1594
msgid " Package pin: "
-msgstr " �tiquette de paquet�: "
+msgstr " Étiquette de paquet : "
#. Show the priority tables
#: cmdline/apt-cache.cc:1603
msgid " Version table:"
-msgstr " Table de version�:"
+msgstr " Table de version :"
#: cmdline/apt-cache.cc:1618
#, c-format
@@ -159,10 +159,10 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2584 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2585 cmdline/apt-sortpkgs.cc:144
#, c-format
-msgid "%s %s for %s %s compiled on %s %s\n"
-msgstr "%s %s pour %s %s est compil� le %s %s\n"
+msgid "%s %s for %s compiled on %s %s\n"
+msgstr "%s %s pour %s compilé sur %s %s\n"
#: cmdline/apt-cache.cc:1721
msgid ""
@@ -202,7 +202,7 @@ msgid ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
msgstr ""
-"Usage�: apt-cache [options] commande\n"
+"Usage : apt-cache [options] commande\n"
" apt-cache [options] add fichier1 [fichier2 ...]\n"
" apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
" apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
@@ -210,56 +210,56 @@ msgstr ""
"apt-cache est un outil de bas niveau pour manipuler les fichiers de cache\n"
"pour les binaires, et pour en obtenir des informations.\n"
"\n"
-"Commandes�:\n"
+"Commandes :\n"
" add - Ajoute un paquet au cache source\n"
" gencaches - Construit le cache des sources et celui des binaires\n"
-" showpkg - Affiche quelques informations g�n�rales pour un unique paquet\n"
+" showpkg - Affiche quelques informations générales pour un unique paquet\n"
" showsrc - Affiche les enregistrements des sources\n"
" stats - Affiche quelques statistiques de base\n"
-" dump - Affiche la totalit� des fichiers dans un formulaire succinct\n"
+" dump - Affiche la totalité des fichiers dans un formulaire succinct\n"
" dumpavail - Affiche une liste de fichiers disponibles sur la sortie "
"standard\n"
-" unmet - Affiche les d�pendances manquantes\n"
+" unmet - Affiche les dépendances manquantes\n"
" search - Cherche une expression rationnelle dans la liste des paquets\n"
" show - Affiche la description du paquet\n"
-" depends - Affiche toutes les d�pendances d'un paquet\n"
-" rdepends - Affiche les d�pendances inverses d'un paquet\n"
+" depends - Affiche toutes les dépendances d'un paquet\n"
+" rdepends - Affiche les dépendances inverses d'un paquet\n"
" pkgnames - Liste le nom de tous les paquets\n"
-" dotty - G�n�re un graphe des paquets pour GraphVis\n"
-" xvcg - G�n�re un graphe des paquets pour xvcg\n"
-" policy - Affiche l'�tiquetage (Pin) en vigueur\n"
+" dotty - Génère un graphe des paquets pour GraphVis\n"
+" xvcg - Génère un graphe des paquets pour xvcg\n"
+" policy - Affiche l'étiquetage (Pin) en vigueur\n"
"\n"
-"Options�:\n"
+"Options :\n"
" -h Ce texte d'aide\n"
" -p=? Le cache des paquets\n"
" -s=? Le cache des sources\n"
-" -q Enl�ve l'indicateur de progression\n"
-" -i Affiche seulement les d�pendances importantes pour la commande "
-"��unmet��\n"
+" -q Enlève l'indicateur de progression\n"
+" -i Affiche seulement les dépendances importantes pour la commande "
+"« unmet »\n"
" -c=? Lit ce fichier de configuration\n"
-" -o=? Sp�cifie une option de configuration, p.�ex. -o dir::cache=/tmp\n"
+" -o=? Spécifie une option de configuration, p. ex. -o dir::cache=/tmp\n"
"Regardez les pages de manuel de apt-cache(8) et apt.conf(5) pour plus\n"
"d'informations.\n"
#: cmdline/apt-cdrom.cc:78
msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
msgstr ""
-"Veuillez indiquer le nom de ce disque, par exemple ��Debian 2.1r1 Disk 1��"
+"Veuillez indiquer le nom de ce disque, par exemple « Debian 2.1r1 Disk 1 »"
#: cmdline/apt-cdrom.cc:93
msgid "Please insert a Disc in the drive and press enter"
msgstr ""
-"Veuillez ins�rer un disque dans le lecteur et appuyez sur la touche Entr�e"
+"Veuillez insérer un disque dans le lecteur et appuyez sur la touche Entrée"
#: cmdline/apt-cdrom.cc:117
msgid "Repeat this process for the rest of the CDs in your set."
msgstr ""
-"Veuillez r�p�ter cette op�ration pour tous les disques de votre jeu de "
-"c�d�roms."
+"Veuillez répéter cette opération pour tous les disques de votre jeu de "
+"cédéroms."
#: cmdline/apt-config.cc:41
msgid "Arguments not in pairs"
-msgstr "Les arguments ne sont pas en parit�"
+msgstr "Les arguments ne sont pas en parité"
#: cmdline/apt-config.cc:76
msgid ""
@@ -276,18 +276,18 @@ msgid ""
" -c=? Read this configuration file\n"
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-"Usage�: apt-config [options] commande\n"
+"Usage : apt-config [options] commande\n"
"\n"
"apt-config est un outil simple pour lire le fichier de configuration d'APT\n"
"\n"
-"Commandes�:\n"
+"Commandes :\n"
" shell - Mode console\n"
" dump - Affiche la configuration\n"
"\n"
-"Options�:\n"
+"Options :\n"
" -h Ce texte d'aide\n"
" -c=? Lit ce fichier de configuration\n"
-" -o=? Sp�cifie une option de configuration, p.�ex. -o dir::cache=/tmp\n"
+" -o=? Spécifie une option de configuration, p. ex. -o dir::cache=/tmp\n"
#: cmdline/apt-extracttemplates.cc:98
#, c-format
@@ -307,26 +307,26 @@ msgid ""
" -c=? Read this configuration file\n"
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-"Usage�: apt-extracttemplates fichier1 [fichier2 ...]\n"
+"Usage : apt-extracttemplates fichier1 [fichier2 ...]\n"
"\n"
"apt-extracttemplates est un outil pour extraire la configuration et les\n"
"informations des gabarits des paquets Debian\n"
"\n"
-"Options�:\n"
+"Options :\n"
" -h Ce texte d'aide\n"
-" -t Place le r�pertoire temporaire\n"
+" -t Place le répertoire temporaire\n"
" -c=? Lit ce fichier de configuration\n"
-" -o=? Sp�cifie une option de configuration, p.�ex. -o dir::cache=/tmp\n"
+" -o=? Spécifie une option de configuration, p. ex. -o dir::cache=/tmp\n"
#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:815
#, c-format
msgid "Unable to write to %s"
-msgstr "Impossible d'�crire sur %s"
+msgstr "Impossible d'écrire sur %s"
#: cmdline/apt-extracttemplates.cc:310
msgid "Cannot get debconf version. Is debconf installed?"
msgstr ""
-"Impossible d'obtenir la version de debconf. Est-ce que debconf est install�?"
+"Impossible d'obtenir la version de debconf. Est-ce que debconf est installé ?"
#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338
msgid "Package extension list is too long"
@@ -337,7 +337,7 @@ msgstr "La liste d'extension du paquet est trop longue"
#: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289
#, c-format
msgid "Error processing directory %s"
-msgstr "Erreur lors du traitement du r�pertoire %s"
+msgstr "Erreur lors du traitement du répertoire %s"
#: ftparchive/apt-ftparchive.cc:251
msgid "Source extension list is too long"
@@ -345,7 +345,7 @@ msgstr "La liste d'extension des sources est trop grande"
#: ftparchive/apt-ftparchive.cc:368
msgid "Error writing header to contents file"
-msgstr "Erreur lors de l'�criture de l'en-t�te du fichier contenu"
+msgstr "Erreur lors de l'écriture de l'en-tête du fichier contenu"
#: ftparchive/apt-ftparchive.cc:398
#, c-format
@@ -393,80 +393,80 @@ msgid ""
" -c=? Read this configuration file\n"
" -o=? Set an arbitrary configuration option"
msgstr ""
-"Usage�: apt-ftparchive [options] commande\n"
-"Commandes�: paquets binarypath [fichier d'��override�� [chemin du "
-"pr�fixe]]\n"
-" sources srcpath [fichier d'��override�� [chemin du pr�fixe]]\n"
+"Usage : apt-ftparchive [options] commande\n"
+"Commandes : paquets binarypath [fichier d'« override » [chemin du "
+"préfixe]]\n"
+" sources srcpath [fichier d'« override » [chemin du préfixe]]\n"
" contents path\n"
" release path\n"
" generate config [groupes]\n"
" clean config\n"
"\n"
-"apt-ftparchive g�n�re des fichiers d'index pour les archives Debian. Il\n"
-"supporte de nombreux types de g�n�ration, d'une automatisation compl�te �\n"
+"apt-ftparchive génère des fichiers d'index pour les archives Debian. Il\n"
+"supporte de nombreux types de génération, d'une automatisation complète à\n"
"des remplacements fonctionnels pour dpkg-scanpackages et dpkg-scansources\n"
"\n"
-"apt-ftparchive g�n�re les fichiers de paquets � partir d'un arbre de .debs.\n"
-"Le fichier des paquets contient les contenus de tous les champs de contr�le\n"
-"de chaque paquet aussi bien que les hach�s MD5 et la taille du fichier. Un\n"
-"fichier d'��override�� est accept� pour forcer la valeur des priorit�s et\n"
+"apt-ftparchive génère les fichiers de paquets à partir d'un arbre de .debs.\n"
+"Le fichier des paquets contient les contenus de tous les champs de contrôle\n"
+"de chaque paquet aussi bien que les hachés MD5 et la taille du fichier. Un\n"
+"fichier d'« override » est accepté pour forcer la valeur des priorités et\n"
"des sections\n"
"\n"
-"De fa�on similaire, apt-ftparchive g�n�re des fichiers de source � partir\n"
-"d'un arbre de .dscs. L'option --source-override peut �tre employ�e pour\n"
-"sp�cifier un fichier src d'��override��\n"
+"De façon similaire, apt-ftparchive génère des fichiers de source à partir\n"
+"d'un arbre de .dscs. L'option --source-override peut être employée pour\n"
+"spécifier un fichier src d'« override »\n"
"\n"
-"Les commandes ��packages�� et ��sources�� devraient �tre d�marr�es � la\n"
-"racine de l'arbre. ��BinaryPath�� devrait pointer sur la base d'une\n"
-"recherche r�cursive et le fichier d'��override�� devrait contenir les\n"
-"drapeaux d'annulation. ��Pathprefix�� est ajout� au champ du non de\n"
-"fichier s'il est pr�sent. Exemple d'utilisation d'archive Debian�:\n"
+"Les commandes « packages » et « sources » devraient être démarrées à la\n"
+"racine de l'arbre. « BinaryPath » devrait pointer sur la base d'une\n"
+"recherche récursive et le fichier d'« override » devrait contenir les\n"
+"drapeaux d'annulation. « Pathprefix » est ajouté au champ du non de\n"
+"fichier s'il est présent. Exemple d'utilisation d'archive Debian :\n"
" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
" dists/potato/main/binary-i386/Packages\n"
"\n"
-"Options�:\n"
+"Options :\n"
" -h Ce texte d'aide\n"
-" --md5 Contr�le la g�n�ration des MD5\n"
-" -s=? Fichier d'��override�� pour les sources\n"
+" --md5 Contrôle la génération des MD5\n"
+" -s=? Fichier d'« override » pour les sources\n"
" -q Silencieux\n"
-" -d=? S�lectionne la base de donn�es optionnelle de cache\n"
-" --no-delink Permet le mode de d�bogage d�li�\n"
-" --contents Contr�le la g�n�ration de fichier\n"
+" -d=? Sélectionne la base de données optionnelle de cache\n"
+" --no-delink Permet le mode de débogage délié\n"
+" --contents Contrôle la génération de fichier\n"
" -c=? Lit ce fichier de configuration\n"
" -o=? Place une option de configuration arbitraire"
#: ftparchive/apt-ftparchive.cc:759
msgid "No selections matched"
-msgstr "Aucune s�lection ne correspond"
+msgstr "Aucune sélection ne correspond"
#: ftparchive/apt-ftparchive.cc:832
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr ""
-"Quelques fichiers sont manquants dans le groupe de fichiers de paquets ��%s��"
+"Quelques fichiers sont manquants dans le groupe de fichiers de paquets « %s »"
#: ftparchive/cachedb.cc:43
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
-msgstr "Base de donn�es corrompue, fichier renomm� en %s.old"
+msgstr "Base de données corrompue, fichier renommé en %s.old"
#: ftparchive/cachedb.cc:61
#, c-format
msgid "DB is old, attempting to upgrade %s"
-msgstr "Base de donn�es ancienne, tentative de mise � jour de %s\""
+msgstr "Base de données ancienne, tentative de mise à jour de %s\""
#: ftparchive/cachedb.cc:72
msgid ""
"DB format is invalid. If you upgraded from a older version of apt, please "
"remove and re-create the database."
msgstr ""
-"Le format de la base de donn�es n'est pas valable. Si vous mettez APT � "
-"jour, veuillez supprimer puis recr�er la base de donn�es."
+"Le format de la base de données n'est pas valable. Si vous mettez APT à "
+"jour, veuillez supprimer puis recréer la base de données."
#: ftparchive/cachedb.cc:77
#, c-format
msgid "Unable to open DB file %s: %s"
-msgstr "Impossible d'ouvrir le fichier de base de donn�es %s�: %s"
+msgstr "Impossible d'ouvrir le fichier de base de données %s : %s"
#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190
#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117 methods/gpgv.cc:272
@@ -476,7 +476,7 @@ msgstr "Impossible de statuer %s"
#: ftparchive/cachedb.cc:238
msgid "Archive has no control record"
-msgstr "L'archive n'a pas d'enregistrement de contr�le"
+msgstr "L'archive n'a pas d'enregistrement de contrôle"
#: ftparchive/cachedb.cc:444
msgid "Unable to get a cursor"
@@ -485,33 +485,33 @@ msgstr "Impossible d'obtenir un curseur"
#: ftparchive/writer.cc:75
#, c-format
msgid "W: Unable to read directory %s\n"
-msgstr "A�: Impossible de lire le contenu du r�pertoire %s\n"
+msgstr "A : Impossible de lire le contenu du répertoire %s\n"
#: ftparchive/writer.cc:80
#, c-format
msgid "W: Unable to stat %s\n"
-msgstr "A�: Impossible de statuer %s\n"
+msgstr "A : Impossible de statuer %s\n"
#: ftparchive/writer.cc:131
msgid "E: "
-msgstr "E�: "
+msgstr "E : "
#: ftparchive/writer.cc:133
msgid "W: "
-msgstr "A�: "
+msgstr "A : "
#: ftparchive/writer.cc:140
msgid "E: Errors apply to file "
-msgstr "E�: des erreurs sont survenues sur le fichier "
+msgstr "E : des erreurs sont survenues sur le fichier "
#: ftparchive/writer.cc:157 ftparchive/writer.cc:187
#, c-format
msgid "Failed to resolve %s"
-msgstr "Impossible de r�soudre %s"
+msgstr "Impossible de résoudre %s"
#: ftparchive/writer.cc:169
msgid "Tree walking failed"
-msgstr "�chec du parcours de l'arbre"
+msgstr "Échec du parcours de l'arbre"
#: ftparchive/writer.cc:194
#, c-format
@@ -521,7 +521,7 @@ msgstr "Impossible d'ouvrir %s"
#: ftparchive/writer.cc:253
#, c-format
msgid " DeLink %s [%s]\n"
-msgstr " D�lier %s [%s]\n"
+msgstr " Délier %s [%s]\n"
#: ftparchive/writer.cc:261
#, c-format
@@ -531,12 +531,12 @@ msgstr "Impossible de lire le lien %s"
#: ftparchive/writer.cc:265
#, c-format
msgid "Failed to unlink %s"
-msgstr "Impossible de d�lier %s"
+msgstr "Impossible de délier %s"
#: ftparchive/writer.cc:272
#, c-format
msgid "*** Failed to link %s to %s"
-msgstr "*** Impossible de lier %s � %s"
+msgstr "*** Impossible de lier %s à %s"
#: ftparchive/writer.cc:282
#, c-format
@@ -545,12 +545,12 @@ msgstr " Seuil de delink de %so atteint.\n"
#: ftparchive/writer.cc:386
msgid "Archive had no package field"
-msgstr "L'archive ne poss�de pas de champ de paquet"
+msgstr "L'archive ne possède pas de champ de paquet"
#: ftparchive/writer.cc:394 ftparchive/writer.cc:609
#, c-format
msgid " %s has no override entry\n"
-msgstr "%s ne poss�de pas d'entr�e ��override��\n"
+msgstr "%s ne possède pas d'entrée « override »\n"
#: ftparchive/writer.cc:439 ftparchive/writer.cc:697
#, c-format
@@ -560,12 +560,12 @@ msgstr " le responsable de %s est %s et non %s\n"
#: ftparchive/writer.cc:619
#, c-format
msgid " %s has no source override entry\n"
-msgstr " %s ne poss�de pas d'entr�e ��source override��\n"
+msgstr " %s ne possède pas d'entrée « source override »\n"
#: ftparchive/writer.cc:623
#, c-format
msgid " %s has no binary override entry either\n"
-msgstr " %s ne poss�de pas �galement pas d'entr�e ��binary override��\n"
+msgstr " %s ne possède pas également pas d'entrée « binary override »\n"
#: ftparchive/contents.cc:317
#, c-format
@@ -574,7 +574,7 @@ msgstr "Erreur interne, ne peut localiser la partie %s"
#: ftparchive/contents.cc:353 ftparchive/contents.cc:384
msgid "realloc - Failed to allocate memory"
-msgstr "realloc - �chec de l'allocation de m�moire"
+msgstr "realloc - Échec de l'allocation de mémoire"
#: ftparchive/override.cc:34 ftparchive/override.cc:142
#, c-format
@@ -584,69 +584,69 @@ msgstr "Impossible d'ouvrir %s"
#: ftparchive/override.cc:60 ftparchive/override.cc:166
#, c-format
msgid "Malformed override %s line %lu #1"
-msgstr "Entr�e ��override�� %s mal form�e ligne %lu n��1"
+msgstr "Entrée « override » %s mal formée ligne %lu n° 1"
#: ftparchive/override.cc:74 ftparchive/override.cc:178
#, c-format
msgid "Malformed override %s line %lu #2"
-msgstr "Entr�e ��override�� %s mal form�e %lu n��2"
+msgstr "Entrée « override » %s mal formée %lu n° 2"
#: ftparchive/override.cc:88 ftparchive/override.cc:191
#, c-format
msgid "Malformed override %s line %lu #3"
-msgstr "Entr�e ��override�� %s mal form�e %lu n��3"
+msgstr "Entrée « override » %s mal formée %lu n° 3"
#: ftparchive/override.cc:127 ftparchive/override.cc:201
#, c-format
msgid "Failed to read the override file %s"
-msgstr "Impossible de lire le fichier d'��override�� %s"
+msgstr "Impossible de lire le fichier d'« override » %s"
#: ftparchive/multicompress.cc:71
#, c-format
msgid "Unknown compression algorithm '%s'"
-msgstr "Algorithme de compression ��%s�� inconnu"
+msgstr "Algorithme de compression « %s » inconnu"
#: ftparchive/multicompress.cc:101
#, c-format
msgid "Compressed output %s needs a compression set"
-msgstr "La sortie compress�e %s a besoin d'un ensemble de compression"
+msgstr "La sortie compressée %s a besoin d'un ensemble de compression"
#: ftparchive/multicompress.cc:168 methods/rsh.cc:91
msgid "Failed to create IPC pipe to subprocess"
-msgstr "Impossible de cr�er le tube IPC sur le sous-processus"
+msgstr "Impossible de créer le tube IPC sur le sous-processus"
#: ftparchive/multicompress.cc:194
msgid "Failed to create FILE*"
-msgstr "Impossible de cr�er FILE*"
+msgstr "Impossible de créer FILE*"
#: ftparchive/multicompress.cc:197
msgid "Failed to fork"
-msgstr "�chec du fork"
+msgstr "Échec du fork"
#: ftparchive/multicompress.cc:211
msgid "Compress child"
-msgstr "Fils compress�"
+msgstr "Fils compressé"
#: ftparchive/multicompress.cc:234
#, c-format
msgid "Internal error, failed to create %s"
-msgstr "Erreur interne, impossible de cr�er %s"
+msgstr "Erreur interne, impossible de créer %s"
#: ftparchive/multicompress.cc:285
msgid "Failed to create subprocess IPC"
-msgstr "Impossible de cr�er un sous-processus IPC"
+msgstr "Impossible de créer un sous-processus IPC"
#: ftparchive/multicompress.cc:320
msgid "Failed to exec compressor "
-msgstr "Impossible d'ex�cuter la compression "
+msgstr "Impossible d'exécuter la compression "
#: ftparchive/multicompress.cc:359
msgid "decompressor"
-msgstr "d�compacteur"
+msgstr "décompacteur"
#: ftparchive/multicompress.cc:402
msgid "IO to subprocess/file failed"
-msgstr "�chec d'entr�e/sortie du sous-processus sur le fichier"
+msgstr "Échec d'entrée/sortie du sous-processus sur le fichier"
#: ftparchive/multicompress.cc:454
msgid "Failed to read while computing MD5"
@@ -655,7 +655,7 @@ msgstr "Impossible de lire lors du calcul de la somme MD5"
#: ftparchive/multicompress.cc:471
#, c-format
msgid "Problem unlinking %s"
-msgstr "Probl�me en d�liant %s"
+msgstr "Problème en déliant %s"
#: ftparchive/multicompress.cc:486 apt-inst/extract.cc:185
#, c-format
@@ -666,24 +666,24 @@ msgstr "Impossible de changer le nom %s en %s"
msgid "Y"
msgstr "O"
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1673
#, c-format
msgid "Regex compilation error - %s"
msgstr "Erreur de compilation de l'expression rationnelle - %s"
#: cmdline/apt-get.cc:238
msgid "The following packages have unmet dependencies:"
-msgstr "Les paquets suivants contiennent des d�pendances non satisfaites�:"
+msgstr "Les paquets suivants contiennent des dépendances non satisfaites :"
#: cmdline/apt-get.cc:328
#, c-format
msgid "but %s is installed"
-msgstr "mais %s est install�"
+msgstr "mais %s est installé"
#: cmdline/apt-get.cc:330
#, c-format
msgid "but %s is to be installed"
-msgstr "mais %s devra �tre install�"
+msgstr "mais %s devra être installé"
#: cmdline/apt-get.cc:337
msgid "but it is not installable"
@@ -695,11 +695,11 @@ msgstr "mais c'est un paquet virtuel"
#: cmdline/apt-get.cc:342
msgid "but it is not installed"
-msgstr "mais il n'est pas install�"
+msgstr "mais il n'est pas installé"
#: cmdline/apt-get.cc:342
msgid "but it is not going to be installed"
-msgstr "mais ne sera pas install�"
+msgstr "mais ne sera pas installé"
#: cmdline/apt-get.cc:347
msgid " or"
@@ -707,27 +707,27 @@ msgstr " ou"
#: cmdline/apt-get.cc:376
msgid "The following NEW packages will be installed:"
-msgstr "Les NOUVEAUX paquets suivants seront install�s�:"
+msgstr "Les NOUVEAUX paquets suivants seront installés :"
#: cmdline/apt-get.cc:402
msgid "The following packages will be REMOVED:"
-msgstr "Les paquets suivants seront ENLEV�S�:"
+msgstr "Les paquets suivants seront ENLEVÉS :"
#: cmdline/apt-get.cc:424
msgid "The following packages have been kept back:"
-msgstr "Les paquets suivants ont �t� conserv�s�:"
+msgstr "Les paquets suivants ont été conservés :"
#: cmdline/apt-get.cc:445
msgid "The following packages will be upgraded:"
-msgstr "Les paquets suivants seront mis � jour�:"
+msgstr "Les paquets suivants seront mis à jour :"
#: cmdline/apt-get.cc:466
msgid "The following packages will be DOWNGRADED:"
-msgstr "Les paquets suivants seront mis � une VERSION INF�RIEURE�:"
+msgstr "Les paquets suivants seront mis à une VERSION INFÉRIEURE :"
#: cmdline/apt-get.cc:486
msgid "The following held packages will be changed:"
-msgstr "Les paquets retenus suivants seront chang�s�:"
+msgstr "Les paquets retenus suivants seront changés :"
#: cmdline/apt-get.cc:539
#, c-format
@@ -739,50 +739,50 @@ msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
-"ATTENTION�: Les paquets essentiels suivants vont �tre enlev�s.\n"
-"Vous NE devez PAS faire ceci, � moins de savoir exactement ce\n"
-"que vous �tes en train de faire."
+"ATTENTION : Les paquets essentiels suivants vont être enlevés.\n"
+"Vous NE devez PAS faire ceci, à moins de savoir exactement ce\n"
+"que vous êtes en train de faire."
#: cmdline/apt-get.cc:578
#, c-format
msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu mis � jour, %lu nouvellement install�s, "
+msgstr "%lu mis à jour, %lu nouvellement installés, "
#: cmdline/apt-get.cc:582
#, c-format
msgid "%lu reinstalled, "
-msgstr "%lu r�install�s, "
+msgstr "%lu réinstallés, "
#: cmdline/apt-get.cc:584
#, c-format
msgid "%lu downgraded, "
-msgstr "%lu remis � une version inf�rieure, "
+msgstr "%lu remis à une version inférieure, "
#: cmdline/apt-get.cc:586
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu � enlever et %lu non mis � jour.\n"
+msgstr "%lu à enlever et %lu non mis à jour.\n"
#: cmdline/apt-get.cc:590
#, c-format
msgid "%lu not fully installed or removed.\n"
-msgstr "%lu partiellement install�s ou enlev�s.\n"
+msgstr "%lu partiellement installés ou enlevés.\n"
#: cmdline/apt-get.cc:664
msgid "Correcting dependencies..."
-msgstr "Correction des d�pendances..."
+msgstr "Correction des dépendances..."
#: cmdline/apt-get.cc:667
msgid " failed."
-msgstr " a �chou�."
+msgstr " a échoué."
#: cmdline/apt-get.cc:670
msgid "Unable to correct dependencies"
-msgstr "Impossible de corriger les d�pendances"
+msgstr "Impossible de corriger les dépendances"
#: cmdline/apt-get.cc:673
msgid "Unable to minimize the upgrade set"
-msgstr "Impossible de minimiser le nombre des paquets mis � jour"
+msgstr "Impossible de minimiser le nombre des paquets mis à jour"
#: cmdline/apt-get.cc:675
msgid " Done"
@@ -790,85 +790,85 @@ msgstr " Fait"
#: cmdline/apt-get.cc:679
msgid "You might want to run `apt-get -f install' to correct these."
-msgstr "Vous pouvez lancer ��apt-get -f install�� pour corriger ces probl�mes."
+msgstr "Vous pouvez lancer « apt-get -f install » pour corriger ces problèmes."
#: cmdline/apt-get.cc:682
msgid "Unmet dependencies. Try using -f."
-msgstr "D�pendances manquantes. Essayez d'utiliser l'option -f."
+msgstr "Dépendances manquantes. Essayez d'utiliser l'option -f."
#: cmdline/apt-get.cc:704
msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "ATTENTION�: les paquets suivants n'ont pas �t� authentifi�s."
+msgstr "ATTENTION : les paquets suivants n'ont pas été authentifiés."
#: cmdline/apt-get.cc:708
msgid "Authentication warning overridden.\n"
-msgstr "Avertissement d'authentification ignor�.\n"
+msgstr "Avertissement d'authentification ignoré.\n"
#: cmdline/apt-get.cc:715
msgid "Install these packages without verification [y/N]? "
-msgstr "Faut-il installer ces paquets sans v�rification (o/N)�? "
+msgstr "Faut-il installer ces paquets sans vérification (o/N) ? "
#: cmdline/apt-get.cc:717
msgid "Some packages could not be authenticated"
-msgstr "Certains paquets n'ont pas pu �tre authentifi�s"
+msgstr "Certains paquets n'ont pas pu être authentifiés"
#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873
msgid "There are problems and -y was used without --force-yes"
-msgstr "Il y a des probl�mes et -y a �t� employ� sans --force-yes"
+msgstr "Il y a des problèmes et -y a été employé sans --force-yes"
#: cmdline/apt-get.cc:770
msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr "Erreur interne, ��InstallPackages�� appel� avec des paquets cass�s."
+msgstr "Erreur interne, « InstallPackages » appelé avec des paquets cassés."
#: cmdline/apt-get.cc:779
msgid "Packages need to be removed but remove is disabled."
msgstr ""
-"Les paquets doivent �tre enlev�s mais la d�sinstallation est d�sactiv�e."
+"Les paquets doivent être enlevés mais la désinstallation est désactivée."
#: cmdline/apt-get.cc:790
msgid "Internal error, Ordering didn't finish"
-msgstr "Erreur interne. Le tri a �t� interrompu."
+msgstr "Erreur interne. Le tri a été interrompu."
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2011 cmdline/apt-get.cc:2044
msgid "Unable to lock the download directory"
-msgstr "Impossible de verrouiller le r�pertoire de t�l�chargement"
+msgstr "Impossible de verrouiller le répertoire de téléchargement"
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2092 cmdline/apt-get.cc:2333
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
-msgstr "La liste des sources ne peut �tre lue."
+msgstr "La liste des sources ne peut être lue."
#: cmdline/apt-get.cc:831
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr ""
-"�trangement, les tailles ne correspondent pas. Veuillez le signaler par "
-"courriel � apt@packages.debian.org."
+"Étrangement, les tailles ne correspondent pas. Veuillez le signaler par "
+"courriel à apt@packages.debian.org."
#: cmdline/apt-get.cc:836
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
-msgstr "Il est n�cessaire de prendre %so/%so dans les archives.\n"
+msgstr "Il est nécessaire de prendre %so/%so dans les archives.\n"
#: cmdline/apt-get.cc:839
#, c-format
msgid "Need to get %sB of archives.\n"
-msgstr "Il est n�cessaire de prendre %so dans les archives.\n"
+msgstr "Il est nécessaire de prendre %so dans les archives.\n"
#: cmdline/apt-get.cc:844
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr ""
-"Apr�s d�paquetage, %so d'espace disque suppl�mentaires seront utilis�s.\n"
+"Après dépaquetage, %so d'espace disque supplémentaires seront utilisés.\n"
#: cmdline/apt-get.cc:847
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
-msgstr "Apr�s d�paquetage, %so d'espace disque seront lib�r�s.\n"
+msgstr "Après dépaquetage, %so d'espace disque seront libérés.\n"
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2186
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2187
#, c-format
msgid "Couldn't determine free space in %s"
-msgstr "Impossible de d�terminer l'espace disponible sur %s"
+msgstr "Impossible de déterminer l'espace disponible sur %s"
#: cmdline/apt-get.cc:864
#, c-format
@@ -878,7 +878,7 @@ msgstr "Pas assez d'espace disponible sur %s"
#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899
msgid "Trivial Only specified but this is not a trivial operation."
msgstr ""
-"L'option --trivial-only a �t� indiqu�e mais il ne s'agit pas d'une op�ration "
+"L'option --trivial-only a été indiquée mais il ne s'agit pas d'une opération "
"triviale."
# The space before the exclamation mark must not be a non-breaking space; this
@@ -894,9 +894,9 @@ msgid ""
"To continue type in the phrase '%s'\n"
" ?] "
msgstr ""
-"Vous �tes sur le point de faire quelque chose de potentiellement dangereux\n"
-"Pour continuer, tapez la phrase ��%s��\n"
-"�?]"
+"Vous êtes sur le point de faire quelque chose de potentiellement dangereux\n"
+"Pour continuer, tapez la phrase « %s »\n"
+" ?]"
#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
msgid "Abort."
@@ -904,33 +904,33 @@ msgstr "Annulation."
#: cmdline/apt-get.cc:904
msgid "Do you want to continue [Y/n]? "
-msgstr "Souhaitez-vous continuer [O/n]�? "
+msgstr "Souhaitez-vous continuer [O/n] ? "
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2229
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2230
#, c-format
msgid "Failed to fetch %s %s\n"
-msgstr "Impossible de r�cup�rer %s %s\n"
+msgstr "Impossible de récupérer %s %s\n"
#: cmdline/apt-get.cc:994
msgid "Some files failed to download"
-msgstr "Certains fichiers n'ont pu �tre t�l�charg�s."
+msgstr "Certains fichiers n'ont pu être téléchargés."
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2238
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2239
msgid "Download complete and in download only mode"
-msgstr "T�l�chargement achev� et dans le mode t�l�chargement uniquement"
+msgstr "Téléchargement achevé et dans le mode téléchargement uniquement"
#: cmdline/apt-get.cc:1001
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
msgstr ""
-"Impossible de r�cup�rer quelques archives, peut-�tre devrez-vous lancer apt-"
-"get update ou essayer avec --fix-missing�?"
+"Impossible de récupérer quelques archives, peut-être devrez-vous lancer apt-"
+"get update ou essayer avec --fix-missing ?"
#: cmdline/apt-get.cc:1005
msgid "--fix-missing and media swapping is not currently supported"
msgstr ""
-"l'option --fix-missing et l'�change de support ne sont pas encore reconnus."
+"l'option --fix-missing et l'échange de support ne sont pas encore reconnus."
#: cmdline/apt-get.cc:1010
msgid "Unable to correct missing packages."
@@ -943,30 +943,30 @@ msgstr "Annulation de l'installation."
#: cmdline/apt-get.cc:1045
#, c-format
msgid "Note, selecting %s instead of %s\n"
-msgstr "Note, s�lection de %s au lieu de %s\n"
+msgstr "Note, sélection de %s au lieu de %s\n"
#: cmdline/apt-get.cc:1055
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "Passe %s, il est d�j� install� et la mise � jour n'est pas pr�vue.\n"
+msgstr "Passe %s, il est déjà installé et la mise à jour n'est pas prévue.\n"
#: cmdline/apt-get.cc:1073
#, c-format
msgid "Package %s is not installed, so not removed\n"
-msgstr "Le paquet %s n'est pas install�, et ne peut donc �tre supprim�\n"
+msgstr "Le paquet %s n'est pas installé, et ne peut donc être supprimé\n"
#: cmdline/apt-get.cc:1084
#, c-format
msgid "Package %s is a virtual package provided by:\n"
-msgstr "Le paquet %s est un paquet virtuel fourni par�:\n"
+msgstr "Le paquet %s est un paquet virtuel fourni par :\n"
#: cmdline/apt-get.cc:1096
msgid " [Installed]"
-msgstr " [Install�]"
+msgstr " [Installé]"
#: cmdline/apt-get.cc:1101
msgid "You should explicitly select one to install."
-msgstr "Vous devez explicitement s�lectionner un paquet � installer."
+msgstr "Vous devez explicitement sélectionner un paquet à installer."
#: cmdline/apt-get.cc:1106
#, c-format
@@ -976,13 +976,13 @@ msgid ""
"is only available from another source\n"
msgstr ""
"Aucune version du paquet %s n'est disponible, mais il existe dans la base\n"
-"de donn�es. Cela signifie en g�n�ral que le paquet est manquant, qu'il est "
-"devenu obsol�te\n"
+"de données. Cela signifie en général que le paquet est manquant, qu'il est "
+"devenu obsolète\n"
"ou qu'il n'est disponible que sur une autre source\n"
#: cmdline/apt-get.cc:1125
msgid "However the following packages replace it:"
-msgstr "Cependant les paquets suivants le remplacent�:"
+msgstr "Cependant les paquets suivants le remplacent :"
#: cmdline/apt-get.cc:1128
#, c-format
@@ -993,22 +993,22 @@ msgstr "Aucun paquet ne correspond au paquet %s"
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr ""
-"La r�installation de %s est impossible, il ne peut pas �tre t�l�charg�.\n"
+"La réinstallation de %s est impossible, il ne peut pas être téléchargé.\n"
#: cmdline/apt-get.cc:1156
#, c-format
msgid "%s is already the newest version.\n"
-msgstr "%s est d�j� la plus r�cente version disponible.\n"
+msgstr "%s est déjà la plus récente version disponible.\n"
#: cmdline/apt-get.cc:1185
#, c-format
msgid "Release '%s' for '%s' was not found"
-msgstr "La version ��%s�� de ��%s�� est introuvable"
+msgstr "La version « %s » de « %s » est introuvable"
#: cmdline/apt-get.cc:1187
#, c-format
msgid "Version '%s' for '%s' was not found"
-msgstr "La version ��%s�� de ��%s�� n'a pu �tre trouv�e"
+msgstr "La version « %s » de « %s » n'a pu être trouvée"
#: cmdline/apt-get.cc:1193
#, c-format
@@ -1017,271 +1017,271 @@ msgstr "Version choisie %s (%s) pour %s\n"
#: cmdline/apt-get.cc:1330
msgid "The update command takes no arguments"
-msgstr "La commande de mise � jour ne prend pas d'argument"
+msgstr "La commande de mise à jour ne prend pas d'argument"
#: cmdline/apt-get.cc:1343
msgid "Unable to lock the list directory"
-msgstr "Impossible de verrouiller le r�pertoire de liste"
+msgstr "Impossible de verrouiller le répertoire de liste"
#: cmdline/apt-get.cc:1410 cmdline/apt-get.cc:1412
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
msgstr ""
-"Le t�l�chargement de quelques fichiers d'index a �chou�, ils ont �t� "
-"ignor�s, ou les anciens ont �t� utilis�s � la place."
+"Le téléchargement de quelques fichiers d'index a échoué, ils ont été "
+"ignorés, ou les anciens ont été utilisés à la place."
#: cmdline/apt-get.cc:1433
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
-"Aucune suppression n'est sens�e se produire�:�impossible de lancer "
-"��Autoremover��"
+"Aucune suppression n'est sensée se produire : impossible de lancer "
+"« Autoremover »"
#: cmdline/apt-get.cc:1465
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr ""
-"Les paquets suivants ont �t� install�s automatiquement et ne sont plus "
-"n�cessaires�:"
+"Les paquets suivants ont été installés automatiquement et ne sont plus "
+"nécessaires :"
#: cmdline/apt-get.cc:1467
msgid "Use 'apt-get autoremove' to remove them."
-msgstr "Veuillez utiliser ��apt-get autoremove�� pour les supprimer."
+msgstr "Veuillez utiliser « apt-get autoremove » pour les supprimer."
#: cmdline/apt-get.cc:1472
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-"Il semble que l'outil de suppression automatique (��Autoremover��) ait\n"
-"supprim� quelque chose, ce qui est inattendu. Veuillez envoyer un\n"
-"rapport de bogue pour le paquet ��apt��."
+"Il semble que l'outil de suppression automatique (« Autoremover ») ait\n"
+"supprimé quelque chose, ce qui est inattendu. Veuillez envoyer un\n"
+"rapport de bogue pour le paquet « apt »."
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1754
msgid "The following information may help to resolve the situation:"
-msgstr "L'information suivante devrait vous aider � r�soudre la situation�: "
+msgstr "L'information suivante devrait vous aider à résoudre la situation : "
#: cmdline/apt-get.cc:1479
msgid "Internal Error, AutoRemover broke stuff"
msgstr ""
-"Erreur interne, l'outil de suppression automatique a cass� quelque chose."
+"Erreur interne, l'outil de suppression automatique a cassé quelque chose."
#: cmdline/apt-get.cc:1498
msgid "Internal error, AllUpgrade broke stuff"
-msgstr "Erreur interne, AllUpgrade a cass� le boulot�!"
+msgstr "Erreur interne, AllUpgrade a cassé le boulot !"
-#: cmdline/apt-get.cc:1544
+#: cmdline/apt-get.cc:1545
#, c-format
msgid "Couldn't find task %s"
-msgstr "Impossible de trouver la t�che %s"
+msgstr "Impossible de trouver la tâche %s"
-#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
+#: cmdline/apt-get.cc:1660 cmdline/apt-get.cc:1696
#, c-format
msgid "Couldn't find package %s"
msgstr "Impossible de trouver le paquet %s"
-#: cmdline/apt-get.cc:1682
+#: cmdline/apt-get.cc:1683
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
-msgstr "Note, s�lectionne %s pour l'expression rationnelle ��%s��\n"
+msgstr "Note, sélectionne %s pour l'expression rationnelle « %s »\n"
-#: cmdline/apt-get.cc:1712
+#: cmdline/apt-get.cc:1713
#, c-format
msgid "%s set to manual installed.\n"
-msgstr "%s pass� en ��install� manuellement��.\n"
+msgstr "%s passé en « installé manuellement ».\n"
-#: cmdline/apt-get.cc:1725
+#: cmdline/apt-get.cc:1726
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
-"Vous pouvez lancer ��apt-get -f install�� pour corriger ces probl�mes�:"
+"Vous pouvez lancer « apt-get -f install » pour corriger ces problèmes :"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1729
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
msgstr ""
-"D�pendances non satisfaites. Essayez ��apt-get -f install�� sans paquet\n"
+"Dépendances non satisfaites. Essayez « apt-get -f install » sans paquet\n"
"(ou indiquez une solution)."
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1741
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
"distribution that some required packages have not yet been created\n"
"or been moved out of Incoming."
msgstr ""
-"Certains paquets ne peuvent �tre install�s. Ceci peut signifier\n"
-"que vous avez demand� l'impossible, ou bien, si vous utilisez\n"
+"Certains paquets ne peuvent être installés. Ceci peut signifier\n"
+"que vous avez demandé l'impossible, ou bien, si vous utilisez\n"
"la distribution unstable, que certains paquets n'ont pas encore\n"
-"�t� cr��s ou ne sont pas sortis d'Incoming."
+"été créés ou ne sont pas sortis d'Incoming."
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1749
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
"that package should be filed."
msgstr ""
-"Puisque vous n'avez demand� qu'une seule op�ration, le paquet n'est\n"
+"Puisque vous n'avez demandé qu'une seule opération, le paquet n'est\n"
"probablement pas installable et vous devriez envoyer un rapport de bogue."
-#: cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1757
msgid "Broken packages"
-msgstr "Paquets d�fectueux"
+msgstr "Paquets défectueux"
-#: cmdline/apt-get.cc:1785
+#: cmdline/apt-get.cc:1786
msgid "The following extra packages will be installed:"
-msgstr "Les paquets suppl�mentaires suivants seront install�s�: "
+msgstr "Les paquets supplémentaires suivants seront installés : "
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Suggested packages:"
-msgstr "Paquets sugg�r�s�:"
+msgstr "Paquets suggérés :"
-#: cmdline/apt-get.cc:1875
+#: cmdline/apt-get.cc:1876
msgid "Recommended packages:"
-msgstr "Paquets recommand�s�:"
+msgstr "Paquets recommandés :"
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1904
msgid "Calculating upgrade... "
-msgstr "Calcul de la mise � jour... "
+msgstr "Calcul de la mise à jour... "
-#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1907 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
-msgstr "�chec"
+msgstr "Échec"
-#: cmdline/apt-get.cc:1911
+#: cmdline/apt-get.cc:1912
msgid "Done"
msgstr "Fait"
-#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
+#: cmdline/apt-get.cc:1979 cmdline/apt-get.cc:1987
msgid "Internal error, problem resolver broke stuff"
msgstr ""
-"Erreur interne, la tentative de r�solution du probl�me a cass� certaines "
+"Erreur interne, la tentative de résolution du problème a cassé certaines "
"parties"
-#: cmdline/apt-get.cc:2086
+#: cmdline/apt-get.cc:2087
msgid "Must specify at least one package to fetch source for"
-msgstr "Vous devez sp�cifier au moins un paquet source"
+msgstr "Vous devez spécifier au moins un paquet source"
-#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2350
+#: cmdline/apt-get.cc:2117 cmdline/apt-get.cc:2351
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Impossible de trouver une source de paquet pour %s"
-#: cmdline/apt-get.cc:2165
+#: cmdline/apt-get.cc:2166
#, c-format
msgid "Skipping already downloaded file '%s'\n"
-msgstr "Saut du t�l�chargement du fichier ��%s��, d�j� t�l�charg�\n"
+msgstr "Saut du téléchargement du fichier « %s », déjà téléchargé\n"
-#: cmdline/apt-get.cc:2189
+#: cmdline/apt-get.cc:2190
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Pas assez d'espace disponible sur %s"
-#: cmdline/apt-get.cc:2194
+#: cmdline/apt-get.cc:2195
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
-msgstr "N�cessit� de prendre %so/%so dans les sources.\n"
+msgstr "Nécessité de prendre %so/%so dans les sources.\n"
-#: cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2198
#, c-format
msgid "Need to get %sB of source archives.\n"
-msgstr "N�cessit� de prendre %so dans les sources.\n"
+msgstr "Nécessité de prendre %so dans les sources.\n"
-#: cmdline/apt-get.cc:2203
+#: cmdline/apt-get.cc:2204
#, c-format
msgid "Fetch source %s\n"
-msgstr "R�cup�ration des sources %s\n"
+msgstr "Récupération des sources %s\n"
-#: cmdline/apt-get.cc:2234
+#: cmdline/apt-get.cc:2235
msgid "Failed to fetch some archives."
-msgstr "�chec lors de la r�cup�ration de quelques archives."
+msgstr "Échec lors de la récupération de quelques archives."
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2263
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr "Saut du d�compactage des paquets sources d�j� d�compact�s dans %s\n"
+msgstr "Saut du décompactage des paquets sources déjà décompactés dans %s\n"
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2275
#, c-format
msgid "Unpack command '%s' failed.\n"
-msgstr "La commande de d�compactage ��%s�� a �chou�.\n"
+msgstr "La commande de décompactage « %s » a échoué.\n"
-#: cmdline/apt-get.cc:2275
+#: cmdline/apt-get.cc:2276
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr "Veuillez v�rifier si le paquet dpkg-dev est install�.\n"
+msgstr "Veuillez vérifier si le paquet dpkg-dev est installé.\n"
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2293
#, c-format
msgid "Build command '%s' failed.\n"
-msgstr "La commande de construction ��%s�� a �chou�.\n"
+msgstr "La commande de construction « %s » a échoué.\n"
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:2312
msgid "Child process failed"
-msgstr "�chec du processus fils"
+msgstr "Échec du processus fils"
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2328
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-"Il faut sp�cifier au moins un paquet pour v�rifier les d�pendances de "
+"Il faut spécifier au moins un paquet pour vérifier les dépendances de "
"construction"
-#: cmdline/apt-get.cc:2355
+#: cmdline/apt-get.cc:2356
#, c-format
msgid "Unable to get build-dependency information for %s"
-msgstr "Impossible d'obtenir les d�pendances de construction pour %s"
+msgstr "Impossible d'obtenir les dépendances de construction pour %s"
-#: cmdline/apt-get.cc:2375
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "%s has no build depends.\n"
-msgstr "%s n'a pas de d�pendance de construction.\n"
+msgstr "%s n'a pas de dépendance de construction.\n"
-#: cmdline/apt-get.cc:2427
+#: cmdline/apt-get.cc:2428
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-"La d�pendance %s vis-�-vis de %s ne peut �tre satisfaite car le paquet %s ne "
-"peut �tre trouv�"
+"La dépendance %s vis-à-vis de %s ne peut être satisfaite car le paquet %s ne "
+"peut être trouvé"
-#: cmdline/apt-get.cc:2479
+#: cmdline/apt-get.cc:2480
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
"package %s can satisfy version requirements"
msgstr ""
-"La d�pendance %s vis-�-vis de %s ne peut �tre satisfaite car aucune version "
-"du paquet %s ne peut satisfaire � la version requise"
+"La dépendance %s vis-à-vis de %s ne peut être satisfaite car aucune version "
+"du paquet %s ne peut satisfaire à la version requise"
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2515
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-"Impossible de satisfaire la d�pendance %s pour %s�: le paquet install� %s "
-"est trop r�cent"
+"Impossible de satisfaire la dépendance %s pour %s : le paquet installé %s "
+"est trop récent"
-#: cmdline/apt-get.cc:2539
+#: cmdline/apt-get.cc:2540
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "Impossible de satisfaire les d�pendances %s pour %s�: %s"
+msgstr "Impossible de satisfaire les dépendances %s pour %s : %s"
-#: cmdline/apt-get.cc:2553
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
-"Les d�pendances de compilation pour %s ne peuvent pas �tre satisfaites."
+"Les dépendances de compilation pour %s ne peuvent pas être satisfaites."
-#: cmdline/apt-get.cc:2557
+#: cmdline/apt-get.cc:2558
msgid "Failed to process build dependencies"
-msgstr "Impossible d'activer les d�pendances de construction"
+msgstr "Impossible d'activer les dépendances de construction"
-#: cmdline/apt-get.cc:2589
+#: cmdline/apt-get.cc:2590
msgid "Supported modules:"
-msgstr "Modules reconnus�:"
+msgstr "Modules reconnus :"
-#: cmdline/apt-get.cc:2630
+#: cmdline/apt-get.cc:2631
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1323,45 +1323,45 @@ msgid ""
"pages for more information and options.\n"
" This APT has Super Cow Powers.\n"
msgstr ""
-"Usage�: apt-get [options] commandes\n"
+"Usage : apt-get [options] commandes\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
" apt-get [options] source pkg1 [pkg2 ...]\n"
"\n"
-"apt-get est une interface simple en ligne de commande servant �\n"
-"t�l�charger et � installer les paquets. Les commandes les plus\n"
-"fr�quemment employ�es sont update et install.\n"
+"apt-get est une interface simple en ligne de commande servant à\n"
+"télécharger et à installer les paquets. Les commandes les plus\n"
+"fréquemment employées sont update et install.\n"
"\n"
-"Commandes�:\n"
-" update - R�cup�re les nouvelles listes de paquets\n"
-" upgrade - R�alise une mise � jour\n"
+"Commandes :\n"
+" update - Récupère les nouvelles listes de paquets\n"
+" upgrade - Réalise une mise à jour\n"
" install - Installe de nouveaux paquets (pkg1 est libc6 et non libc6.deb)\n"
" remove - Supprime des paquets\n"
-" source - T�l�charge les archives de sources\n"
+" source - Télécharge les archives de sources\n"
" build-dep - Configure build-dependencies pour les paquets sources\n"
-" dist-upgrade - Met � jour la distribution, reportez-vous � apt-get(8)\n"
-" dselect-upgrade - Suit les s�lections de dselect\n"
-" clean - Supprime dans le cache local tous les fichiers t�l�charg�s\n"
+" dist-upgrade - Met à jour la distribution, reportez-vous à apt-get(8)\n"
+" dselect-upgrade - Suit les sélections de dselect\n"
+" clean - Supprime dans le cache local tous les fichiers téléchargés\n"
" autoclean - Supprime dans le cache local les fichiers inutiles\n"
-" check - V�rifie qu'il n'y a pas de rupture de d�pendances\n"
+" check - Vérifie qu'il n'y a pas de rupture de dépendances\n"
"\n"
-"Options�:\n"
+"Options :\n"
" -h Ce texte d'aide\n"
" -q Message de sortie enregistrable - aucun indicateur de progression\n"
-" -qq Aucun message de sortie, except�s les messages d'erreur\n"
-" -d Simple t�l�chargement - n'installe pas ou ne d�compacte pas les "
+" -qq Aucun message de sortie, exceptés les messages d'erreur\n"
+" -d Simple téléchargement - n'installe pas ou ne décompacte pas les "
"archives\n"
-" -s N'agit pas. R�alise uniquement une simulation de commande\n"
-" -y R�pond oui � toutes les questions et n'interroge pas l'utilisateur\n"
-" -f Tente de poursuivre si le contr�le d'int�grit� �choue\n"
+" -s N'agit pas. Réalise uniquement une simulation de commande\n"
+" -y Répond oui à toutes les questions et n'interroge pas l'utilisateur\n"
+" -f Tente de poursuivre si le contrôle d'intégrité échoue\n"
" -m Tente de poursuivre si les archives ne sont pas localisables\n"
-" -u Affiche une liste des paquets mis � jour\n"
-" -b Construit la source du paquet apr�s l'avoir r�cup�r�e\n"
-" -V Affiche les num�ros des versions de fa�on d�taill�e\n"
+" -u Affiche une liste des paquets mis à jour\n"
+" -b Construit la source du paquet après l'avoir récupérée\n"
+" -V Affiche les numéros des versions de façon détaillée\n"
" -c=? Lit ce fichier de configuration\n"
" -o=? Place une option de configuration arbitraire, ex. -o dir::cache=/tmp\n"
"Reportez-vous aux pages de manuels d'apt-get(8), sources.list(5) et\n"
"apt.conf(5) pour plus d'informations et d'option.\n"
-" Cet APT a les ��Super Cow Powers��\n"
+" Cet APT a les « Super Cow Powers »\n"
#: cmdline/acqprogress.cc:55
msgid "Hit "
@@ -1369,7 +1369,7 @@ msgstr "Atteint "
#: cmdline/acqprogress.cc:79
msgid "Get:"
-msgstr "R�ception de�: "
+msgstr "Réception de : "
#: cmdline/acqprogress.cc:110
msgid "Ign "
@@ -1382,7 +1382,7 @@ msgstr "Err "
#: cmdline/acqprogress.cc:135
#, c-format
msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr "%so r�ceptionn�s en %s (%so/s)\n"
+msgstr "%so réceptionnés en %s (%so/s)\n"
#: cmdline/acqprogress.cc:225
#, c-format
@@ -1396,13 +1396,13 @@ msgid ""
" '%s'\n"
"in the drive '%s' and press enter\n"
msgstr ""
-"Changement de support�: veuillez ins�rer le disque\n"
-"��%s��\n"
-"dans le lecteur ��%s�� et appuyez sur la touche Entr�e\n"
+"Changement de support : veuillez insérer le disque\n"
+"« %s »\n"
+"dans le lecteur « %s » et appuyez sur la touche Entrée\n"
#: cmdline/apt-sortpkgs.cc:86
msgid "Unknown package record!"
-msgstr "Enregistrement de paquet inconnu�!"
+msgstr "Enregistrement de paquet inconnu !"
#: cmdline/apt-sortpkgs.cc:150
msgid ""
@@ -1417,49 +1417,49 @@ msgid ""
" -c=? Read this configuration file\n"
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-"Usage�: apt-sortpkgs [options] fichier1 [fichier2 ...]\n"
+"Usage : apt-sortpkgs [options] fichier1 [fichier2 ...]\n"
"\n"
"apt-sortpkgs est un outil simple pour trier les paquets. L'option -s est\n"
-"employ�e pour indiquer le type de fichier dont il s'agit.\n"
+"employée pour indiquer le type de fichier dont il s'agit.\n"
"\n"
-"Options�:\n"
+"Options :\n"
" -h Ce texte d'aide\n"
" -s Trie le fichier source\n"
" -c=? Lit ce fichier de configuration\n"
-" -o=? Place une option de configuration arbitraire, p.�ex. -o dir::cache=/"
+" -o=? Place une option de configuration arbitraire, p. ex. -o dir::cache=/"
"tmp\n"
#: dselect/install:32
msgid "Bad default setting!"
-msgstr "Mauvais param�tre par d�faut�!"
+msgstr "Mauvais paramètre par défaut !"
#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93
#: dselect/install:104 dselect/update:45
msgid "Press enter to continue."
-msgstr "Veuillez appuyer sur Entr�e pour continuer."
+msgstr "Veuillez appuyer sur Entrée pour continuer."
#: dselect/install:100
msgid "Some errors occurred while unpacking. I'm going to configure the"
msgstr ""
-"Quelques erreurs sont apparues lors du d�compactage. Nous allons configurer "
+"Quelques erreurs sont apparues lors du décompactage. Nous allons configurer "
"les"
#: dselect/install:101
msgid "packages that were installed. This may result in duplicate errors"
-msgstr "paquets qui ont �t� install�s. Il peut en r�sulter d'autres erreurs"
+msgstr "paquets qui ont été installés. Il peut en résulter d'autres erreurs"
#: dselect/install:102
msgid "or errors caused by missing dependencies. This is OK, only the errors"
msgstr ""
-"ou des erreurs provoqu�es par les d�pendances manquantes. C'est b�nin, "
+"ou des erreurs provoquées par les dépendances manquantes. C'est bénin, "
"seules les erreurs"
#: dselect/install:103
msgid ""
"above this message are important. Please fix them and run [I]nstall again"
msgstr ""
-"pr�c�dant ce message sont importantes. Veuillez les corriger et\n"
-"d�marrer l'[I]nstallation une nouvelle fois."
+"précédant ce message sont importantes. Veuillez les corriger et\n"
+"démarrer l'[I]nstallation une nouvelle fois."
#: dselect/update:30
msgid "Merging available information"
@@ -1467,11 +1467,11 @@ msgstr "Fusion des informations disponibles"
#: apt-inst/contrib/extracttar.cc:114
msgid "Failed to create pipes"
-msgstr "�chec de cr�ation de tubes"
+msgstr "Échec de création de tubes"
#: apt-inst/contrib/extracttar.cc:141
msgid "Failed to exec gzip "
-msgstr "Impossible d'ex�cuter gzip "
+msgstr "Impossible d'exécuter gzip "
#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204
msgid "Corrupted archive"
@@ -1479,12 +1479,12 @@ msgstr "Archive corrompue"
#: apt-inst/contrib/extracttar.cc:193
msgid "Tar checksum failed, archive corrupted"
-msgstr "�chec dans la somme de contr�le de tar, l'archive est corrompue"
+msgstr "Échec dans la somme de contrôle de tar, l'archive est corrompue"
#: apt-inst/contrib/extracttar.cc:296
#, c-format
msgid "Unknown TAR header type %u, member %s"
-msgstr "Type d'en-t�te %u inconnu pour TAR, partie %s"
+msgstr "Type d'en-tête %u inconnu pour TAR, partie %s"
#: apt-inst/contrib/arfile.cc:70
msgid "Invalid archive signature"
@@ -1492,11 +1492,11 @@ msgstr "Signature d'archive invalide"
#: apt-inst/contrib/arfile.cc:78
msgid "Error reading archive member header"
-msgstr "Erreur de lecture de l'en-t�te du membre d'archive"
+msgstr "Erreur de lecture de l'en-tête du membre d'archive"
#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102
msgid "Invalid archive member header"
-msgstr "En-t�te du membre d'archive non-valide"
+msgstr "En-tête du membre d'archive non-valide"
#: apt-inst/contrib/arfile.cc:128
msgid "Archive is too short"
@@ -1504,19 +1504,19 @@ msgstr "L'archive est trop petite"
#: apt-inst/contrib/arfile.cc:132
msgid "Failed to read the archive headers"
-msgstr "�chec de la lecture des en-t�tes d'archive"
+msgstr "Échec de la lecture des en-têtes d'archive"
#: apt-inst/filelist.cc:380
msgid "DropNode called on still linked node"
-msgstr "DropNode appel� sur un n�ud toujours li�"
+msgstr "DropNode appelé sur un nœud toujours lié"
#: apt-inst/filelist.cc:412
msgid "Failed to locate the hash element!"
-msgstr "Impossible de situer l'�l�ment hach�!"
+msgstr "Impossible de situer l'élément haché !"
#: apt-inst/filelist.cc:459
msgid "Failed to allocate diversion"
-msgstr "�chec lors de l'allocation de la d�viation"
+msgstr "Échec lors de l'allocation de la déviation"
#: apt-inst/filelist.cc:464
msgid "Internal error in AddDiversion"
@@ -1525,12 +1525,12 @@ msgstr "Erreur interne dans AddDiversion"
#: apt-inst/filelist.cc:477
#, c-format
msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "Essaye d'�craser une d�viation, %s -> %s et %s/%s"
+msgstr "Essaye d'écraser une déviation, %s -> %s et %s/%s"
#: apt-inst/filelist.cc:506
#, c-format
msgid "Double add of diversion %s -> %s"
-msgstr "Addition double d'une d�viation %s -> %s"
+msgstr "Addition double d'une déviation %s -> %s"
#: apt-inst/filelist.cc:549
#, c-format
@@ -1540,12 +1540,12 @@ msgstr "Fichier de configuration en double %s/%s"
#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49
#, c-format
msgid "Failed to write file %s"
-msgstr "Erreur d'�criture du fichier %s"
+msgstr "Erreur d'écriture du fichier %s"
#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100
#, c-format
msgid "Failed to close file %s"
-msgstr "�chec de cl�ture du fichier %s"
+msgstr "Échec de clôture du fichier %s"
#: apt-inst/extract.cc:93 apt-inst/extract.cc:164
#, c-format
@@ -1555,30 +1555,30 @@ msgstr "Le chemin %s est trop long"
#: apt-inst/extract.cc:124
#, c-format
msgid "Unpacking %s more than once"
-msgstr "Veuillez d�compresser %s plus d'une fois"
+msgstr "Veuillez décompresser %s plus d'une fois"
#: apt-inst/extract.cc:134
#, c-format
msgid "The directory %s is diverted"
-msgstr "Le r�pertoire %s est d�tourn�"
+msgstr "Le répertoire %s est détourné"
#: apt-inst/extract.cc:144
#, c-format
msgid "The package is trying to write to the diversion target %s/%s"
-msgstr "Le paquet est en train d'essayer d'�crire sur la cible d�tourn�e %s/%s"
+msgstr "Le paquet est en train d'essayer d'écrire sur la cible détournée %s/%s"
#: apt-inst/extract.cc:154 apt-inst/extract.cc:297
msgid "The diversion path is too long"
-msgstr "Le chemin de d�viation est trop long"
+msgstr "Le chemin de déviation est trop long"
#: apt-inst/extract.cc:240
#, c-format
msgid "The directory %s is being replaced by a non-directory"
-msgstr "Le r�pertoire %s va �tre remplac� par un non-r�pertoire"
+msgstr "Le répertoire %s va être remplacé par un non-répertoire"
#: apt-inst/extract.cc:280
msgid "Failed to locate node in its hash bucket"
-msgstr "�chec pour localiser le n�ud dans la table de hachage"
+msgstr "Échec pour localiser le nœud dans la table de hachage"
#: apt-inst/extract.cc:284
msgid "The path is too long"
@@ -1587,12 +1587,12 @@ msgstr "Le chemin est trop long"
#: apt-inst/extract.cc:414
#, c-format
msgid "Overwrite package match with no version for %s"
-msgstr "�crase la correspondance de paquet sans version pour %s "
+msgstr "Écrase la correspondance de paquet sans version pour %s "
#: apt-inst/extract.cc:431
#, c-format
msgid "File %s/%s overwrites the one in the package %s"
-msgstr "Le fichier %s/%s �crase celui inclus dans le paquet %s"
+msgstr "Le fichier %s/%s écrase celui inclus dans le paquet %s"
#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748
#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
@@ -1614,7 +1614,7 @@ msgstr "Impossible de supprimer %s"
#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
#, c-format
msgid "Unable to create %s"
-msgstr "Impossible de cr�er %s"
+msgstr "Impossible de créer %s"
#: apt-inst/deb/dpkgdb.cc:114
#, c-format
@@ -1624,7 +1624,7 @@ msgstr "Impossible de statuer pour %sinfo"
#: apt-inst/deb/dpkgdb.cc:119
msgid "The info and temp directories need to be on the same filesystem"
msgstr ""
-"Les r�pertoires info et temp doivent se trouver sur le m�me syst�me de "
+"Les répertoires info et temp doivent se trouver sur le même système de "
"fichiers"
#. Build the status cache
@@ -1637,7 +1637,7 @@ msgstr "Lecture des listes de paquets"
#: apt-inst/deb/dpkgdb.cc:176
#, c-format
msgid "Failed to change to the admin dir %sinfo"
-msgstr "Impossible de changer pour le r�pertoire d'administration %sinfo"
+msgstr "Impossible de changer pour le répertoire d'administration %sinfo"
#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351
#: apt-inst/deb/dpkgdb.cc:444
@@ -1655,116 +1655,117 @@ msgid ""
"then make it empty and immediately re-install the same version of the "
"package!"
msgstr ""
-"Impossible d'ouvrir le fichier de liste ��%sinfo/%s��. Si vous ne parvenez "
-"pas � restaurer ce fichier, veuillez le vider et r�installer imm�diatement "
-"la m�me version du paquet�!"
+"Impossible d'ouvrir le fichier de liste « %sinfo/%s ». Si vous ne parvenez "
+"pas à restaurer ce fichier, veuillez le vider et réinstaller immédiatement "
+"la même version du paquet !"
#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
#, c-format
msgid "Failed reading the list file %sinfo/%s"
-msgstr "�chec de la lecture du fichier de liste %sinfo/%s"
+msgstr "Échec de la lecture du fichier de liste %sinfo/%s"
#: apt-inst/deb/dpkgdb.cc:262
msgid "Internal error getting a node"
-msgstr "Erreur interne lors de l'obtention d'un N�ud"
+msgstr "Erreur interne lors de l'obtention d'un Nœud"
#: apt-inst/deb/dpkgdb.cc:305
#, c-format
msgid "Failed to open the diversions file %sdiversions"
-msgstr "Impossible d'ouvrir le fichier des d�viations %sdiversions "
+msgstr "Impossible d'ouvrir le fichier des déviations %sdiversions "
#: apt-inst/deb/dpkgdb.cc:320
msgid "The diversion file is corrupted"
-msgstr "Le fichier des d�viations est corrompu"
+msgstr "Le fichier des déviations est corrompu"
#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332
#: apt-inst/deb/dpkgdb.cc:337
#, c-format
msgid "Invalid line in the diversion file: %s"
-msgstr "Ligne invalide dans le fichier des d�viations�: %s"
+msgstr "Ligne invalide dans le fichier des déviations : %s"
#: apt-inst/deb/dpkgdb.cc:358
msgid "Internal error adding a diversion"
-msgstr "Erreur interne en ajoutant une d�viation"
+msgstr "Erreur interne en ajoutant une déviation"
#: apt-inst/deb/dpkgdb.cc:379
msgid "The pkg cache must be initialized first"
-msgstr "Le cache des paquets doit �tre initialis� en premier"
+msgstr "Le cache des paquets doit être initialisé en premier"
#: apt-inst/deb/dpkgdb.cc:439
#, c-format
msgid "Failed to find a Package: header, offset %lu"
-msgstr "Impossible de trouver un en-t�te ��Package:��, d�calage %lu"
+msgstr "Impossible de trouver un en-tête « Package: », décalage %lu"
#: apt-inst/deb/dpkgdb.cc:461
#, c-format
msgid "Bad ConfFile section in the status file. Offset %lu"
-msgstr "Mauvaise section ��ConfFile�� dans le fichier ��status��. D�calage %lu"
+msgstr "Mauvaise section « ConfFile » dans le fichier « status ». Décalage %lu"
#: apt-inst/deb/dpkgdb.cc:466
#, c-format
msgid "Error parsing MD5. Offset %lu"
-msgstr "Erreur lors du traitement de la somme MD5. D�calage %lu"
+msgstr "Erreur lors du traitement de la somme MD5. Décalage %lu"
#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43
#, c-format
msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "Ce n'est pas une archive DEB valide, partie ��%s�� manquante"
+msgstr "Ce n'est pas une archive DEB valide, partie « %s » manquante"
-#: apt-inst/deb/debfile.cc:48
+#: apt-inst/deb/debfile.cc:50
#, c-format
-msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
+msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
msgstr ""
-"Ce n'est pas une archive DEB valide, elle n'a pas de membre ��%s�� ou ��%s��"
+"Ce n'est pas une archive DEB valide, elle n'a pas de membre « %s », «% s » "
+"ou « %s »"
-#: apt-inst/deb/debfile.cc:108
+#: apt-inst/deb/debfile.cc:110
#, c-format
msgid "Couldn't change to %s"
-msgstr "Impossible d'acc�der � %s"
+msgstr "Impossible d'accéder à %s"
-#: apt-inst/deb/debfile.cc:134
+#: apt-inst/deb/debfile.cc:140
msgid "Internal error, could not locate member"
msgstr "Erreur interne, ne peut localiser le membre"
-#: apt-inst/deb/debfile.cc:167
+#: apt-inst/deb/debfile.cc:173
msgid "Failed to locate a valid control file"
-msgstr "Impossible de localiser un fichier de contr�le valide"
+msgstr "Impossible de localiser un fichier de contrôle valide"
-#: apt-inst/deb/debfile.cc:252
+#: apt-inst/deb/debfile.cc:258
msgid "Unparsable control file"
-msgstr "Fichier de contr�le non traitable"
+msgstr "Fichier de contrôle non traitable"
#: methods/cdrom.cc:114
#, c-format
msgid "Unable to read the cdrom database %s"
-msgstr "Impossible de lire la base de donn�es %s du c�d�rom"
+msgstr "Impossible de lire la base de données %s du cédérom"
#: methods/cdrom.cc:123
msgid ""
"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
"cannot be used to add new CD-ROMs"
msgstr ""
-"Veuillez utiliser apt-cdrom afin de faire reconna�tre ce c�d�rom par votre "
-"APT. apt-get update ne peut �tre employ� pour ajouter de nouveaux c�d�roms"
+"Veuillez utiliser apt-cdrom afin de faire reconnaître ce cédérom par votre "
+"APT. apt-get update ne peut être employé pour ajouter de nouveaux cédéroms"
#: methods/cdrom.cc:131
msgid "Wrong CD-ROM"
-msgstr "Mauvais c�d�rom"
+msgstr "Mauvais cédérom"
#: methods/cdrom.cc:166
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr ""
-"Impossible de d�monter le c�d�rom dans %s, il doit toujours �tre en cours "
+"Impossible de démonter le cédérom dans %s, il doit toujours être en cours "
"d'utilisation."
#: methods/cdrom.cc:171
msgid "Disk not found."
-msgstr "Disque non trouv�."
+msgstr "Disque non trouvé."
#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
-msgstr "Fichier non trouv�"
+msgstr "Fichier non trouvé"
#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141
#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243
@@ -1778,7 +1779,7 @@ msgstr "Impossible de modifier l'heure "
#: methods/file.cc:44
msgid "Invalid URI, local URIS must not start with //"
-msgstr "Liens invalides, les liens locaux ne doivent pas d�buter avec //"
+msgstr "Liens invalides, les liens locaux ne doivent pas débuter avec //"
#. Login must be before getpeername otherwise dante won't work.
#: methods/ftp.cc:162
@@ -1787,53 +1788,53 @@ msgstr "Connexion en cours"
#: methods/ftp.cc:168
msgid "Unable to determine the peer name"
-msgstr "Impossible de d�terminer le nom de la machine distante"
+msgstr "Impossible de déterminer le nom de la machine distante"
#: methods/ftp.cc:173
msgid "Unable to determine the local name"
-msgstr "Impossible de d�terminer le nom local"
+msgstr "Impossible de déterminer le nom local"
#: methods/ftp.cc:204 methods/ftp.cc:232
#, c-format
msgid "The server refused the connection and said: %s"
-msgstr "Le serveur a refus� notre connexion et a r�pondu�: %s"
+msgstr "Le serveur a refusé notre connexion et a répondu : %s"
#: methods/ftp.cc:210
#, c-format
msgid "USER failed, server said: %s"
-msgstr "USER incorrect, le serveur a r�pondu�: %s"
+msgstr "USER incorrect, le serveur a répondu : %s"
#: methods/ftp.cc:217
#, c-format
msgid "PASS failed, server said: %s"
-msgstr "PASS incorrect, le serveur a r�pondu�: %s"
+msgstr "PASS incorrect, le serveur a répondu : %s"
#: methods/ftp.cc:237
msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
msgstr ""
-"Un serveur proxy a �t� sp�cifi�, mais aucun script de connexion, Acquire::"
+"Un serveur proxy a été spécifié, mais aucun script de connexion, Acquire::"
"ftp::ProxyLogin est vide."
#: methods/ftp.cc:265
#, c-format
msgid "Login script command '%s' failed, server said: %s"
msgstr ""
-"La commande ��%s�� du script de connexion a �chou�, le serveur a r�pondu�: %s"
+"La commande « %s » du script de connexion a échoué, le serveur a répondu : %s"
#: methods/ftp.cc:291
#, c-format
msgid "TYPE failed, server said: %s"
-msgstr "�chec de TYPE, le serveur a r�pondu�: %s"
+msgstr "Échec de TYPE, le serveur a répondu : %s"
#: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226
msgid "Connection timeout"
-msgstr "D�passement du d�lai de connexion"
+msgstr "Dépassement du délai de connexion"
#: methods/ftp.cc:335
msgid "Server closed the connection"
-msgstr "Le serveur a ferm� la connexion"
+msgstr "Le serveur a fermé la connexion"
#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:469 methods/rsh.cc:190
msgid "Read error"
@@ -1841,7 +1842,7 @@ msgstr "Erreur de lecture"
#: methods/ftp.cc:345 methods/rsh.cc:197
msgid "A response overflowed the buffer."
-msgstr "Une r�ponse a fait d�border le tampon."
+msgstr "Une réponse a fait déborder le tampon."
#: methods/ftp.cc:362 methods/ftp.cc:374
msgid "Protocol corruption"
@@ -1849,16 +1850,16 @@ msgstr "Corruption du protocole"
#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:508 methods/rsh.cc:232
msgid "Write error"
-msgstr "Erreur d'�criture"
+msgstr "Erreur d'écriture"
#: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729
msgid "Could not create a socket"
-msgstr "Impossible de cr�er un connecteur"
+msgstr "Impossible de créer un connecteur"
#: methods/ftp.cc:698
msgid "Could not connect data socket, connection timed out"
msgstr ""
-"Impossible de se connecter sur le port de donn�es, d�lai de connexion d�pass�"
+"Impossible de se connecter sur le port de données, délai de connexion dépassé"
#: methods/ftp.cc:704
msgid "Could not connect passive socket."
@@ -1866,19 +1867,19 @@ msgstr "Impossible de se connecter au port en mode passif."
#: methods/ftp.cc:722
msgid "getaddrinfo was unable to get a listening socket"
-msgstr "gettaddrinfo n'a pu obtenir un port d'�coute"
+msgstr "gettaddrinfo n'a pu obtenir un port d'écoute"
#: methods/ftp.cc:736
msgid "Could not bind a socket"
-msgstr "Impossible de se connecter � un port"
+msgstr "Impossible de se connecter à un port"
#: methods/ftp.cc:740
msgid "Could not listen on the socket"
-msgstr "Impossible d'�couter sur le port"
+msgstr "Impossible d'écouter sur le port"
#: methods/ftp.cc:747
msgid "Could not determine the socket's name"
-msgstr "Impossible de d�terminer le nom du port"
+msgstr "Impossible de déterminer le nom du port"
#: methods/ftp.cc:779
msgid "Unable to send PORT command"
@@ -1892,11 +1893,11 @@ msgstr "Famille d'adresses %u inconnue (AF_*)"
#: methods/ftp.cc:798
#, c-format
msgid "EPRT failed, server said: %s"
-msgstr "EPRT a �chou�, le serveur a r�pondu�: %s"
+msgstr "EPRT a échoué, le serveur a répondu : %s"
#: methods/ftp.cc:818
msgid "Data socket connect timed out"
-msgstr "D�lai de connexion au port de donn�es d�pass�"
+msgstr "Délai de connexion au port de données dépassé"
#: methods/ftp.cc:825
msgid "Unable to accept connection"
@@ -1904,26 +1905,26 @@ msgstr "Impossible d'accepter une connexion"
#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
msgid "Problem hashing file"
-msgstr "Probl�me de hachage du fichier"
+msgstr "Problème de hachage du fichier"
#: methods/ftp.cc:877
#, c-format
msgid "Unable to fetch file, server said '%s'"
-msgstr "Impossible de r�cup�rer le fichier, le serveur a r�pondu ��%s��"
+msgstr "Impossible de récupérer le fichier, le serveur a répondu « %s »"
#: methods/ftp.cc:892 methods/rsh.cc:322
msgid "Data socket timed out"
-msgstr "Pas de r�ponse du port donn�es dans les d�lais"
+msgstr "Pas de réponse du port données dans les délais"
#: methods/ftp.cc:922
#, c-format
msgid "Data transfer failed, server said '%s'"
-msgstr "Le transfert de donn�es a �chou�, le serveur a r�pondu ��%s��"
+msgstr "Le transfert de données a échoué, le serveur a répondu « %s »"
#. Get the files information
#: methods/ftp.cc:997
msgid "Query"
-msgstr "Requ�te"
+msgstr "Requête"
#: methods/ftp.cc:1109
msgid "Unable to invoke "
@@ -1932,110 +1933,110 @@ msgstr "Impossible d'invoquer "
#: methods/connect.cc:64
#, c-format
msgid "Connecting to %s (%s)"
-msgstr "Connexion � %s (%s)"
+msgstr "Connexion à %s (%s)"
#: methods/connect.cc:71
#, c-format
msgid "[IP: %s %s]"
-msgstr "[IP�: %s %s]"
+msgstr "[IP : %s %s]"
#: methods/connect.cc:80
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
-msgstr "Impossible de cr�er de connexion pour %s (f=%u t=%u p=%u)"
+msgstr "Impossible de créer de connexion pour %s (f=%u t=%u p=%u)"
#: methods/connect.cc:86
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
-msgstr "Impossible d'initialiser la connexion � %s:�%s (%s)."
+msgstr "Impossible d'initialiser la connexion à %s: %s (%s)."
#: methods/connect.cc:93
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr "Connexion � %s:�%s (%s) impossible, d�lai de connexion d�pass�"
+msgstr "Connexion à %s: %s (%s) impossible, délai de connexion dépassé"
#: methods/connect.cc:108
#, c-format
msgid "Could not connect to %s:%s (%s)."
-msgstr "Connexion � %s:�%s (%s) impossible."
+msgstr "Connexion à %s: %s (%s) impossible."
#. 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
#, c-format
msgid "Connecting to %s"
-msgstr "Connexion � %s"
+msgstr "Connexion à %s"
#: methods/connect.cc:167
#, c-format
msgid "Could not resolve '%s'"
-msgstr "Ne parvient pas � r�soudre ��%s��"
+msgstr "Ne parvient pas à résoudre « %s »"
#: methods/connect.cc:173
#, c-format
msgid "Temporary failure resolving '%s'"
-msgstr "Erreur temporaire de r�solution de ��%s��"
+msgstr "Erreur temporaire de résolution de « %s »"
#: methods/connect.cc:176
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i)"
msgstr ""
-"Quelque chose d'impr�visible est survenu lors de la d�termination de ��%s:%"
-"s�� (%i)"
+"Quelque chose d'imprévisible est survenu lors de la détermination de « %s:%"
+"s » (%i)"
#: methods/connect.cc:223
#, c-format
msgid "Unable to connect to %s %s:"
-msgstr "Impossible de se connecter � %s %s�:"
+msgstr "Impossible de se connecter à %s %s :"
#: methods/gpgv.cc:65
#, c-format
msgid "Couldn't access keyring: '%s'"
-msgstr "Impossible d'acc�der au porte-cl�s�:���%s��"
+msgstr "Impossible d'accéder au porte-clés : « %s »"
#: methods/gpgv.cc:100
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr ""
-"E: liste de param�tres trop longue pour Acquire::gpgv::Options. Abandon."
+"E: liste de paramètres trop longue pour Acquire::gpgv::Options. Abandon."
#: methods/gpgv.cc:204
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
-"Erreur interne�: signature correcte, mais il est impossible de d�terminer "
-"l'empreinte de la cl�."
+"Erreur interne : signature correcte, mais il est impossible de déterminer "
+"l'empreinte de la clé."
#: methods/gpgv.cc:209
msgid "At least one invalid signature was encountered."
-msgstr "Au moins une signature non valable a �t� rencontr�e."
+msgstr "Au moins une signature non valable a été rencontrée."
#: methods/gpgv.cc:213
#, c-format
msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
msgstr ""
-"Impossible d'ex�cuter ��%s�� pour contr�ler la signature\n"
-"(veuillez v�rifier si gnupg est install�)."
+"Impossible d'exécuter « %s » pour contrôler la signature\n"
+"(veuillez vérifier si gnupg est installé)."
#: methods/gpgv.cc:218
msgid "Unknown error executing gpgv"
-msgstr "Erreur inconnue � l'ex�cution de gpgv"
+msgstr "Erreur inconnue à l'exécution de gpgv"
#: methods/gpgv.cc:249
msgid "The following signatures were invalid:\n"
-msgstr "Les signatures suivantes ne sont pas valables�:\n"
+msgstr "Les signatures suivantes ne sont pas valables :\n"
#: methods/gpgv.cc:256
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
msgstr ""
-"Les signatures suivantes n'ont pas pu �tre v�rifi�es car la cl� publique "
-"n'est pas disponible�:\n"
+"Les signatures suivantes n'ont pas pu être vérifiées car la clé publique "
+"n'est pas disponible :\n"
#: methods/gzip.cc:64
#, c-format
msgid "Couldn't open pipe for %s"
-msgstr "Ne parvient pas � ouvrir le tube pour %s"
+msgstr "Ne parvient pas à ouvrir le tube pour %s"
#: methods/gzip.cc:109
#, c-format
@@ -2044,32 +2045,32 @@ msgstr "Erreur de lecture du processus %s"
#: methods/http.cc:377
msgid "Waiting for headers"
-msgstr "Attente des fichiers d'en-t�te"
+msgstr "Attente des fichiers d'en-tête"
#: methods/http.cc:523
#, c-format
msgid "Got a single header line over %u chars"
-msgstr "J'ai une simple ligne d'en-t�te au-dessus du caract�re %u"
+msgstr "J'ai une simple ligne d'en-tête au-dessus du caractère %u"
#: methods/http.cc:531
msgid "Bad header line"
-msgstr "Mauvaise ligne d'en-t�te"
+msgstr "Mauvaise ligne d'en-tête"
#: methods/http.cc:550 methods/http.cc:557
msgid "The HTTP server sent an invalid reply header"
-msgstr "Le serveur http a envoy� une r�ponse dont l'en-t�te est invalide"
+msgstr "Le serveur http a envoyé une réponse dont l'en-tête est invalide"
#: methods/http.cc:586
msgid "The HTTP server sent an invalid Content-Length header"
-msgstr "Le serveur http a envoy� un en-t�te ��Content-Length�� invalide"
+msgstr "Le serveur http a envoyé un en-tête « Content-Length » invalide"
#: methods/http.cc:601
msgid "The HTTP server sent an invalid Content-Range header"
-msgstr "Le serveur http a envoy� un en-t�te ��Content-Range�� invalide"
+msgstr "Le serveur http a envoyé un en-tête « Content-Range » invalide"
#: methods/http.cc:603
msgid "This HTTP server has broken range support"
-msgstr "Ce serveur http poss�de un support des limites non-valide"
+msgstr "Ce serveur http possède un support des limites non-valide"
#: methods/http.cc:627
msgid "Unknown date format"
@@ -2077,62 +2078,62 @@ msgstr "Format de date inconnu"
#: methods/http.cc:774
msgid "Select failed"
-msgstr "S�lection d�faillante"
+msgstr "Sélection défaillante"
#: methods/http.cc:779
msgid "Connection timed out"
-msgstr "D�lai de connexion d�pass�"
+msgstr "Délai de connexion dépassé"
#: methods/http.cc:802
msgid "Error writing to output file"
-msgstr "Erreur d'�criture du fichier de sortie"
+msgstr "Erreur d'écriture du fichier de sortie"
#: methods/http.cc:833
msgid "Error writing to file"
-msgstr "Erreur d'�criture sur un fichier"
+msgstr "Erreur d'écriture sur un fichier"
#: methods/http.cc:861
msgid "Error writing to the file"
-msgstr "Erreur d'�criture sur le fichier"
+msgstr "Erreur d'écriture sur le fichier"
#: methods/http.cc:875
msgid "Error reading from server. Remote end closed connection"
-msgstr "Erreur de lecture depuis le serveur distant et cl�ture de la connexion"
+msgstr "Erreur de lecture depuis le serveur distant et clôture de la connexion"
#: methods/http.cc:877
msgid "Error reading from server"
msgstr "Erreur de lecture du serveur"
-#: methods/http.cc:1108
+#: methods/http.cc:1104
msgid "Bad header data"
-msgstr "Mauvais en-t�te de donn�e"
+msgstr "Mauvais en-tête de donnée"
-#: methods/http.cc:1125
+#: methods/http.cc:1121 methods/http.cc:1176
msgid "Connection failed"
-msgstr "�chec de la connexion"
+msgstr "Échec de la connexion"
-#: methods/http.cc:1216
+#: methods/http.cc:1228
msgid "Internal error"
msgstr "Erreur interne"
#: apt-pkg/contrib/mmap.cc:78
msgid "Can't mmap an empty file"
-msgstr "Impossible de mapper un fichier vide en m�moire"
+msgstr "Impossible de mapper un fichier vide en mémoire"
#: apt-pkg/contrib/mmap.cc:83
#, c-format
msgid "Couldn't make mmap of %lu bytes"
-msgstr "Impossible de r�aliser un mapping de %lu octets en m�moire"
+msgstr "Impossible de réaliser un mapping de %lu octets en mémoire"
#: apt-pkg/contrib/strutl.cc:978
#, c-format
msgid "Selection %s not found"
-msgstr "La s�lection %s n'a pu �tre trouv�e"
+msgstr "La sélection %s n'a pu être trouvée"
#: apt-pkg/contrib/configuration.cc:434
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
-msgstr "Type d'abr�viation non reconnue�: ��%c��"
+msgstr "Type d'abréviation non reconnue : « %c »"
#: apt-pkg/contrib/configuration.cc:492
#, c-format
@@ -2141,55 +2142,55 @@ msgstr "Ouverture du fichier de configuration %s"
#: apt-pkg/contrib/configuration.cc:510
#, c-format
-msgid "Line %d too long (max %lu)"
-msgstr "La ligne %d est trop longue (maxi %lu)"
+msgid "Line %d too long (max %u)"
+msgstr "Ligne %d trop longue (maxi %u)"
#: apt-pkg/contrib/configuration.cc:606
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
-msgstr "Erreur syntaxique %s:%u�: le bloc commence sans aucun nom."
+msgstr "Erreur syntaxique %s:%u : le bloc commence sans aucun nom."
#: apt-pkg/contrib/configuration.cc:625
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
-msgstr "Erreur syntaxique %s:%u�: balise mal form�e"
+msgstr "Erreur syntaxique %s:%u : balise mal formée"
#: apt-pkg/contrib/configuration.cc:642
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
-msgstr "Erreur syntaxique %s:%u�: valeur suivie de choses illicites"
+msgstr "Erreur syntaxique %s:%u : valeur suivie de choses illicites"
#: apt-pkg/contrib/configuration.cc:682
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr ""
-"Erreur syntaxique %s:%u�: ces directives ne peuvent �tre appliqu�es qu'au "
+"Erreur syntaxique %s:%u : ces directives ne peuvent être appliquées qu'au "
"niveau le plus haut"
#: apt-pkg/contrib/configuration.cc:689
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
-msgstr "Erreur syntaxique %s:%u:�trop de niveaux d'imbrication d'includes"
+msgstr "Erreur syntaxique %s:%u: trop de niveaux d'imbrication d'includes"
#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698
#, c-format
msgid "Syntax error %s:%u: Included from here"
-msgstr "Erreur syntaxique %s:%u�: inclus � partir d'ici"
+msgstr "Erreur syntaxique %s:%u : inclus à partir d'ici"
#: apt-pkg/contrib/configuration.cc:702
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "Erreur syntaxique %s:%u�: directive ��%s�� non tol�r�e"
+msgstr "Erreur syntaxique %s:%u : directive « %s » non tolérée"
#: apt-pkg/contrib/configuration.cc:736
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
-msgstr "Erreur syntaxique %s:%u�: valeur aberrante � la fin du fichier"
+msgstr "Erreur syntaxique %s:%u : valeur aberrante à la fin du fichier"
#: apt-pkg/contrib/progress.cc:152
#, c-format
msgid "%c%s... Error!"
-msgstr "%c%s... Erreur�!"
+msgstr "%c%s... Erreur !"
#: apt-pkg/contrib/progress.cc:154
#, c-format
@@ -2199,7 +2200,7 @@ msgstr "%c%s... Fait"
#: apt-pkg/contrib/cmndline.cc:77
#, c-format
msgid "Command line option '%c' [from %s] is not known."
-msgstr "L'option ��%c�� de la ligne de commande [d'origine %s] est inconnue."
+msgstr "L'option « %c » de la ligne de commande [d'origine %s] est inconnue."
#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111
#: apt-pkg/contrib/cmndline.cc:119
@@ -2210,27 +2211,27 @@ msgstr "L'option %s de la ligne de commande n'est pas reconnue"
#: apt-pkg/contrib/cmndline.cc:124
#, c-format
msgid "Command line option %s is not boolean"
-msgstr "L'option %s de la ligne de commande n'est pas une valeur bool�enne"
+msgstr "L'option %s de la ligne de commande n'est pas une valeur booléenne"
#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184
#, c-format
msgid "Option %s requires an argument."
-msgstr "L'option %s n�cessite un argument."
+msgstr "L'option %s nécessite un argument."
#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204
#, c-format
msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr "Option %s�: l'item configuration doit �tre sp�cifi�e avec un =<val>."
+msgstr "Option %s : l'item configuration doit être spécifiée avec un =<val>."
#: apt-pkg/contrib/cmndline.cc:234
#, c-format
msgid "Option %s requires an integer argument, not '%s'"
-msgstr "L'option %s prend un nombre entier en argument, et non ��%s��"
+msgstr "L'option %s prend un nombre entier en argument, et non « %s »"
#: apt-pkg/contrib/cmndline.cc:265
#, c-format
msgid "Option '%s' is too long"
-msgstr "L'option ��%s�� est trop longue"
+msgstr "L'option « %s » est trop longue"
#: apt-pkg/contrib/cmndline.cc:298
#, c-format
@@ -2240,7 +2241,7 @@ msgstr "La signification %s n'est pas comprise, veuillez essayer vrai ou faux."
#: apt-pkg/contrib/cmndline.cc:348
#, c-format
msgid "Invalid operation %s"
-msgstr "L'op�ration %s n'est pas valable"
+msgstr "L'opération %s n'est pas valable"
#: apt-pkg/contrib/cdromutl.cc:52
#, c-format
@@ -2250,16 +2251,16 @@ msgstr "Impossible de localiser le point de montage %s"
#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40
#, c-format
msgid "Unable to change to %s"
-msgstr "Impossible d'acc�der � %s"
+msgstr "Impossible d'accéder à %s"
#: apt-pkg/contrib/cdromutl.cc:187
msgid "Failed to stat the cdrom"
-msgstr "Impossible d'acc�der au c�d�rom."
+msgstr "Impossible d'accéder au cédérom."
#: apt-pkg/contrib/fileutl.cc:80
#, c-format
msgid "Not using locking for read only lock file %s"
-msgstr "Verrou non utilis� pour le fichier %s en lecture seule"
+msgstr "Verrou non utilisé pour le fichier %s en lecture seule"
#: apt-pkg/contrib/fileutl.cc:85
#, c-format
@@ -2269,7 +2270,7 @@ msgstr "Impossible d'ouvrir le fichier verrou %s"
#: apt-pkg/contrib/fileutl.cc:103
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
-msgstr "Verrou non utilis� pour le fichier %s se situant sur une partition nfs"
+msgstr "Verrou non utilisé pour le fichier %s se situant sur une partition nfs"
#: apt-pkg/contrib/fileutl.cc:107
#, c-format
@@ -2279,22 +2280,22 @@ msgstr "Impossible de verrouiller %s"
#: apt-pkg/contrib/fileutl.cc:375
#, c-format
msgid "Waited for %s but it wasn't there"
-msgstr "A attendu %s mais il n'�tait pas pr�sent"
+msgstr "A attendu %s mais il n'était pas présent"
#: apt-pkg/contrib/fileutl.cc:385
#, c-format
msgid "Sub-process %s received a segmentation fault."
-msgstr "Le sous-processus %s a commis une violation d'acc�s m�moire"
+msgstr "Le sous-processus %s a commis une violation d'accès mémoire"
#: apt-pkg/contrib/fileutl.cc:388
#, c-format
msgid "Sub-process %s returned an error code (%u)"
-msgstr "Le sous-processus %s a renvoy� un code d'erreur (%u)"
+msgstr "Le sous-processus %s a renvoyé un code d'erreur (%u)"
#: apt-pkg/contrib/fileutl.cc:390
#, c-format
msgid "Sub-process %s exited unexpectedly"
-msgstr "Le sous-processus %s s'est arr�t� pr�matur�ment"
+msgstr "Le sous-processus %s s'est arrêté prématurément"
#: apt-pkg/contrib/fileutl.cc:434
#, c-format
@@ -2304,24 +2305,24 @@ msgstr "Impossible de verrouiller %s"
#: apt-pkg/contrib/fileutl.cc:490
#, c-format
msgid "read, still have %lu to read but none left"
-msgstr "lu(s), %lu restant � lire, mais rien n'est disponible"
+msgstr "lu(s), %lu restant à lire, mais rien n'est disponible"
#: apt-pkg/contrib/fileutl.cc:520
#, c-format
msgid "write, still have %lu to write but couldn't"
-msgstr "�crit(s), %lu restant � �crire, mais l'�criture est impossible"
+msgstr "écrit(s), %lu restant à écrire, mais l'écriture est impossible"
#: apt-pkg/contrib/fileutl.cc:595
msgid "Problem closing the file"
-msgstr "Probl�me de fermeture du fichier"
+msgstr "Problème de fermeture du fichier"
#: apt-pkg/contrib/fileutl.cc:601
msgid "Problem unlinking the file"
-msgstr "Probl�me d'effacement du fichier"
+msgstr "Problème d'effacement du fichier"
#: apt-pkg/contrib/fileutl.cc:612
msgid "Problem syncing the file"
-msgstr "Probl�me de synchronisation du fichier"
+msgstr "Problème de synchronisation du fichier"
#: apt-pkg/pkgcache.cc:132
msgid "Empty package cache"
@@ -2338,23 +2339,23 @@ msgstr "Le fichier de cache des paquets a une version incompatible"
#: apt-pkg/pkgcache.cc:148
#, c-format
msgid "This APT does not support the versioning system '%s'"
-msgstr "Cet APT ne supporte pas le syst�me de version ��%s��"
+msgstr "Cet APT ne supporte pas le système de version « %s »"
#: apt-pkg/pkgcache.cc:153
msgid "The package cache was built for a different architecture"
-msgstr "Le cache des paquets a �t� construit pour une architecture diff�rente"
+msgstr "Le cache des paquets a été construit pour une architecture différente"
#: apt-pkg/pkgcache.cc:224
msgid "Depends"
-msgstr "D�pend"
+msgstr "Dépend"
#: apt-pkg/pkgcache.cc:224
msgid "PreDepends"
-msgstr "Pr�-D�pend"
+msgstr "Pré-Dépend"
#: apt-pkg/pkgcache.cc:224
msgid "Suggests"
-msgstr "Sugg�re"
+msgstr "Suggère"
#: apt-pkg/pkgcache.cc:225
msgid "Recommends"
@@ -2370,7 +2371,7 @@ msgstr "Remplace"
#: apt-pkg/pkgcache.cc:226
msgid "Obsoletes"
-msgstr "Rend obsol�te"
+msgstr "Rend obsolète"
#: apt-pkg/pkgcache.cc:226
msgid "Breaks"
@@ -2382,7 +2383,7 @@ msgstr "important"
#: apt-pkg/pkgcache.cc:237
msgid "required"
-msgstr "n�cessaire"
+msgstr "nécessaire"
#: apt-pkg/pkgcache.cc:237
msgid "standard"
@@ -2394,33 +2395,33 @@ msgstr "optionnel"
#: apt-pkg/pkgcache.cc:238
msgid "extra"
-msgstr "suppl�mentaire"
+msgstr "supplémentaire"
-#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129
+#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
msgid "Building dependency tree"
-msgstr "Construction de l'arbre des d�pendances"
+msgstr "Construction de l'arbre des dépendances"
-#: apt-pkg/depcache.cc:101
+#: apt-pkg/depcache.cc:122
msgid "Candidate versions"
msgstr "Versions possibles"
-#: apt-pkg/depcache.cc:130
+#: apt-pkg/depcache.cc:151
msgid "Dependency generation"
-msgstr "G�n�ration des d�pendances"
+msgstr "Génération des dépendances"
-#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174
+#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
msgid "Reading state information"
-msgstr "Lecture des informations d'�tat"
+msgstr "Lecture des informations d'état"
-#: apt-pkg/depcache.cc:198
+#: apt-pkg/depcache.cc:219
#, c-format
msgid "Failed to open StateFile %s"
-msgstr "Impossible d'ouvrir le fichier d'�tat %s"
+msgstr "Impossible d'ouvrir le fichier d'état %s"
-#: apt-pkg/depcache.cc:204
+#: apt-pkg/depcache.cc:225
#, c-format
msgid "Failed to write temporary StateFile %s"
-msgstr "Erreur d'�criture du fichier d'�tat temporaire %s"
+msgstr "Erreur d'écriture du fichier d'état temporaire %s"
#: apt-pkg/tagfile.cc:102
#, c-format
@@ -2435,29 +2436,29 @@ msgstr "Impossible de traiter le fichier %s (2)"
#: apt-pkg/sourcelist.cc:90
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Ligne %lu mal form�e dans le fichier de source %s (URI)"
+msgstr "Ligne %lu mal formée dans le fichier de source %s (URI)"
#: apt-pkg/sourcelist.cc:92
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Ligne %lu mal form�e dans la liste de sources %s (distribution)"
+msgstr "Ligne %lu mal formée dans la liste de sources %s (distribution)"
#: apt-pkg/sourcelist.cc:95
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "Ligne %lu mal form�e dans la liste des sources %s (analyse de l'URI)"
+msgstr "Ligne %lu mal formée dans la liste des sources %s (analyse de l'URI)"
#: apt-pkg/sourcelist.cc:101
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr ""
-"Ligne %lu mal form�e dans la liste des sources %s (distribution absolue)"
+"Ligne %lu mal formée dans la liste des sources %s (distribution absolue)"
#: apt-pkg/sourcelist.cc:108
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr ""
-"Ligne %lu mal form�e dans la liste des sources %s (analyse de distribution)"
+"Ligne %lu mal formée dans la liste des sources %s (analyse de distribution)"
#: apt-pkg/sourcelist.cc:199
#, c-format
@@ -2472,19 +2473,19 @@ msgstr "La ligne %u du fichier des listes de sources %s est trop longue."
#: apt-pkg/sourcelist.cc:236
#, c-format
msgid "Malformed line %u in source list %s (type)"
-msgstr "Ligne %u mal form�e dans la liste des sources %s (type)"
+msgstr "Ligne %u mal formée dans la liste des sources %s (type)"
#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr ""
-"Le type ��%s�� est inconnu sur la ligne %u dans la liste des sources %s"
+"Le type « %s » est inconnu sur la ligne %u dans la liste des sources %s"
#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr ""
-"Ligne %u mal form�e dans la liste des sources %s (identifiant du fournisseur)"
+"Ligne %u mal formée dans la liste des sources %s (identifiant du fournisseur)"
#: apt-pkg/packagemanager.cc:399
#, c-format
@@ -2493,22 +2494,22 @@ msgid ""
"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 ""
-"Cette installation va temporairement n�cessiter l'enl�vement du paquet "
+"Cette installation va temporairement nécessiter l'enlèvement du paquet "
"essentiel %s en raison d'une boucle entre les champs Conflicts et Pre-"
-"Depends. C'est souvent une mauvaise chose, mais si vous souhaitez r�ellement "
+"Depends. C'est souvent une mauvaise chose, mais si vous souhaitez réellement "
"le faire, activez l'option APT::Force-LoopBreak."
#: apt-pkg/pkgrecords.cc:32
#, c-format
msgid "Index file type '%s' is not supported"
-msgstr "Le type de fichier d'index ��%s�� n'est pas accept�"
+msgstr "Le type de fichier d'index « %s » n'est pas accepté"
#: apt-pkg/algorithms.cc:247
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr ""
-"Le paquet %s doit �tre r�install�, mais je ne parviens pas � trouver son "
+"Le paquet %s doit être réinstallé, mais je ne parviens pas à trouver son "
"archive."
#: apt-pkg/algorithms.cc:1103
@@ -2516,62 +2517,62 @@ msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
msgstr ""
-"Erreur, pkgProblemResolver::Resolve a g�n�r� des ruptures, ce qui a pu �tre "
-"caus� par les paquets devant �tre gard�s en l'�tat."
+"Erreur, pkgProblemResolver::Resolve a généré des ruptures, ce qui a pu être "
+"causé par les paquets devant être gardés en l'état."
#: apt-pkg/algorithms.cc:1105
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
-"Impossible de corriger les probl�mes, des paquets d�fecteux sont en mode "
-"��garder en l'�tat��."
+"Impossible de corriger les problèmes, des paquets défecteux sont en mode "
+"« garder en l'état »."
#: apt-pkg/acquire.cc:59
#, c-format
msgid "Lists directory %spartial is missing."
-msgstr "Le r�pertoire %spartial pour les listes n'existe pas."
+msgstr "Le répertoire %spartial pour les listes n'existe pas."
#: apt-pkg/acquire.cc:63
#, c-format
msgid "Archive directory %spartial is missing."
-msgstr "Le r�pertoire d'archive %spartial n'existe pas."
+msgstr "Le répertoire d'archive %spartial n'existe pas."
#. only show the ETA if it makes sense
#. two days
#: apt-pkg/acquire.cc:827
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "T�l�chargement du fichier %li de %li (%s restant)"
+msgstr "Téléchargement du fichier %li de %li (%s restant)"
#: apt-pkg/acquire.cc:829
#, c-format
msgid "Retrieving file %li of %li"
-msgstr "T�l�chargement du fichier %li de %li"
+msgstr "Téléchargement du fichier %li de %li"
#: apt-pkg/acquire-worker.cc:110
#, c-format
msgid "The method driver %s could not be found."
-msgstr "Le pilote pour la m�thode %s n'a pu �tre trouv�."
+msgstr "Le pilote pour la méthode %s n'a pu être trouvé."
#: apt-pkg/acquire-worker.cc:159
#, c-format
msgid "Method %s did not start correctly"
-msgstr "La m�thode %s n'a pas d�marr� correctement"
+msgstr "La méthode %s n'a pas démarré correctement"
-#: apt-pkg/acquire-worker.cc:381
+#: apt-pkg/acquire-worker.cc:396
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
-"Veuillez ins�rer le disque ��%s�� dans le lecteur ��%s�� et appuyez sur la "
-"touche Entr�e."
+"Veuillez insérer le disque « %s » dans le lecteur « %s » et appuyez sur la "
+"touche Entrée."
-#: apt-pkg/init.cc:126
+#: apt-pkg/init.cc:124
#, c-format
msgid "Packaging system '%s' is not supported"
-msgstr "Le syst�me de paquet ��%s�� n'est pas support�"
+msgstr "Le système de paquet « %s » n'est pas supporté"
-#: apt-pkg/init.cc:142
+#: apt-pkg/init.cc:140
msgid "Unable to determine a suitable packaging system type"
-msgstr "Impossible de d�terminer un type du syst�me de paquets ad�quat"
+msgstr "Impossible de déterminer un type du système de paquets adéquat"
#: apt-pkg/clean.cc:57
#, c-format
@@ -2581,36 +2582,36 @@ msgstr "Impossible de localiser %s."
#: apt-pkg/srcrecords.cc:44
msgid "You must put some 'source' URIs in your sources.list"
msgstr ""
-"Vous devez ins�rer quelques adresses ��sources�� dans votre sources.list"
+"Vous devez insérer quelques adresses « sources » dans votre sources.list"
#: apt-pkg/cachefile.cc:69
msgid "The package lists or status file could not be parsed or opened."
msgstr ""
-"Les listes de paquets ou le fichier ��status�� ne peuvent �tre analys�s ou "
+"Les listes de paquets ou le fichier « status » ne peuvent être analysés ou "
"lus."
#: apt-pkg/cachefile.cc:73
msgid "You may want to run apt-get update to correct these problems"
-msgstr "Vous pouvez lancer ��apt-get update�� pour corriger ces probl�mes."
+msgstr "Vous pouvez lancer « apt-get update » pour corriger ces problèmes."
#: apt-pkg/policy.cc:267
msgid "Invalid record in the preferences file, no Package header"
msgstr ""
-"Enregistrement invalide dans votre fichier ��pr�f�rences��, aucune entr�e "
-"��Package��."
+"Enregistrement invalide dans votre fichier « préférences », aucune entrée "
+"« Package »."
#: apt-pkg/policy.cc:289
#, c-format
msgid "Did not understand pin type %s"
-msgstr "�tiquette %s inconnue"
+msgstr "Étiquette %s inconnue"
#: apt-pkg/policy.cc:297
msgid "No priority (or zero) specified for pin"
-msgstr "Aucune priorit� (ou z�ro) n'a �t� sp�cifi�e pour l'�tiquette"
+msgstr "Aucune priorité (ou zéro) n'a été spécifiée pour l'étiquette"
#: apt-pkg/pkgcachegen.cc:72
msgid "Cache has an incompatible versioning system"
-msgstr "Le cache poss�de un syst�me de version incompatible"
+msgstr "Le cache possède un système de version incompatible"
#: apt-pkg/pkgcachegen.cc:115
#, c-format
@@ -2660,25 +2661,25 @@ msgstr "Erreur apparue lors du traitement de %s (NewFileDesc2)"
#: apt-pkg/pkgcachegen.cc:251
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr ""
-"Vous avez d�pass� le nombre de noms de paquets que cette version d'APT est "
+"Vous avez dépassé le nombre de noms de paquets que cette version d'APT est "
"capable de traiter."
#: apt-pkg/pkgcachegen.cc:254
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr ""
-"Vous avez d�pass� le nombre de versions que cette version d'APT est capable "
+"Vous avez dépassé le nombre de versions que cette version d'APT est capable "
"de traiter."
#: apt-pkg/pkgcachegen.cc:257
msgid "Wow, you exceeded the number of descriptions this APT is capable of."
msgstr ""
-"Vous avez d�pass� le nombre de descriptions que cette version d'APT est "
+"Vous avez dépassé le nombre de descriptions que cette version d'APT est "
"capable de traiter."
#: apt-pkg/pkgcachegen.cc:260
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr ""
-"Vous avez d�pass� le nombre de d�pendances que cette version d'APT est "
+"Vous avez dépassé le nombre de dépendances que cette version d'APT est "
"capable de traiter."
#: apt-pkg/pkgcachegen.cc:288
@@ -2695,7 +2696,7 @@ msgstr "Erreur apparue lors du traitement de %s (CollectFileProvides)"
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
-"Le paquet %s %s n'a pu �tre trouv� lors du traitement des d�pendances des "
+"Le paquet %s %s n'a pu être trouvé lors du traitement des dépendances des "
"fichiers"
#: apt-pkg/pkgcachegen.cc:678
@@ -2705,58 +2706,61 @@ msgstr "Impossible de localiser la liste des paquets sources %s"
#: apt-pkg/pkgcachegen.cc:763
msgid "Collecting File Provides"
-msgstr "Assemblage des fichiers list�s dans les champs Provides"
+msgstr "Assemblage des fichiers listés dans les champs Provides"
#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897
msgid "IO Error saving source cache"
msgstr ""
-"Erreur d'entr�e/sortie lors de la sauvegarde du fichier de cache des sources"
+"Erreur d'entrée/sortie lors de la sauvegarde du fichier de cache des sources"
#: apt-pkg/acquire-item.cc:127
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "impossible de changer le nom, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:401
msgid "MD5Sum mismatch"
-msgstr "Somme de contr�le MD5 incoh�rente"
+msgstr "Somme de contrôle MD5 incohérente"
+
+#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1405
+msgid "Hash Sum mismatch"
+msgstr "Somme de contrôle de hachage incohérente"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1097
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-"Aucune cl� publique n'est disponible pour la/les cl�(s) suivante(s)�:\n"
+"Aucune clé publique n'est disponible pour la/les clé(s) suivante(s) :\n"
-#: apt-pkg/acquire-item.cc:1219
+#: apt-pkg/acquire-item.cc:1210
#, 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 ""
-"Je ne suis pas parvenu � localiser un fichier du paquet %s. Ceci signifie "
+"Je ne suis pas parvenu à localiser un fichier du paquet %s. Ceci signifie "
"sans doute que vous devrez corriger ce paquet manuellement (absence "
"d'architecture)."
-#: apt-pkg/acquire-item.cc:1278
+#: apt-pkg/acquire-item.cc:1269
#, 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 ""
-"Je ne suis pas parvenu � localiser un fichier du paquet %s. Ceci signifie "
+"Je ne suis pas parvenu à localiser un fichier du paquet %s. Ceci signifie "
"que vous devrez corriger manuellement ce paquet."
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1310
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-"Les fichiers d'index des paquets sont corrompus. Aucun champ ��Filename:�� "
+"Les fichiers d'index des paquets sont corrompus. Aucun champ « Filename: » "
"pour le paquet %s."
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1397
msgid "Size mismatch"
-msgstr "Taille incoh�rente"
+msgstr "Taille incohérente"
#: apt-pkg/vendorlist.cc:66
#, c-format
@@ -2769,8 +2773,8 @@ msgid ""
"Using CD-ROM mount point %s\n"
"Mounting CD-ROM\n"
msgstr ""
-"Utilisation du point de montage %s pour le c�d�rom\n"
-"Montage du c�d�rom\n"
+"Utilisation du point de montage %s pour le cédérom\n"
+"Montage du cédérom\n"
#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:620
msgid "Identifying.. "
@@ -2779,16 +2783,16 @@ msgstr "Identification..."
#: apt-pkg/cdrom.cc:563
#, c-format
msgid "Stored label: %s \n"
-msgstr "�tiquette stock�e�: %s\n"
+msgstr "Étiquette stockée : %s\n"
#: apt-pkg/cdrom.cc:583
#, c-format
msgid "Using CD-ROM mount point %s\n"
-msgstr "Utilisation du point de montage %s pour le c�d�rom\n"
+msgstr "Utilisation du point de montage %s pour le cédérom\n"
#: apt-pkg/cdrom.cc:601
msgid "Unmounting CD-ROM\n"
-msgstr "D�montage du c�d�rom\n"
+msgstr "Démontage du cédérom\n"
#: apt-pkg/cdrom.cc:605
msgid "Waiting for disc...\n"
@@ -2797,11 +2801,11 @@ msgstr "Attente du disque...\n"
#. Mount the new CDROM
#: apt-pkg/cdrom.cc:613
msgid "Mounting CD-ROM...\n"
-msgstr "Montage du c�d�rom...\n"
+msgstr "Montage du cédérom...\n"
#: apt-pkg/cdrom.cc:631
msgid "Scanning disc for index files..\n"
-msgstr "Examen du disque � la recherche de fichiers d'index...\n"
+msgstr "Examen du disque à la recherche de fichiers d'index...\n"
#: apt-pkg/cdrom.cc:671
#, c-format
@@ -2809,13 +2813,13 @@ msgid ""
"Found %i package indexes, %i source indexes, %i translation indexes and %i "
"signatures\n"
msgstr ""
-"%i index de paquets trouv�s, %i index de sources, %i index de traductions et "
+"%i index de paquets trouvés, %i index de sources, %i index de traductions et "
"%i signatures\n"
#: apt-pkg/cdrom.cc:708
#, c-format
msgid "Found label '%s'\n"
-msgstr "�tiquette ��%s�� trouv�e\n"
+msgstr "Étiquette « %s » trouvée\n"
#: apt-pkg/cdrom.cc:737
msgid "That is not a valid name, try again.\n"
@@ -2827,8 +2831,8 @@ msgid ""
"This disc is called: \n"
"'%s'\n"
msgstr ""
-"Ce disque s'appelle�:\n"
-"��%s��\n"
+"Ce disque s'appelle :\n"
+"« %s »\n"
#: apt-pkg/cdrom.cc:757
msgid "Copying package lists..."
@@ -2836,87 +2840,97 @@ msgstr "Copie des listes de paquets..."
#: apt-pkg/cdrom.cc:783
msgid "Writing new source list\n"
-msgstr "�criture de la nouvelle liste de sources\n"
+msgstr "Écriture de la nouvelle liste de sources\n"
#: apt-pkg/cdrom.cc:792
msgid "Source list entries for this disc are:\n"
-msgstr "Les entr�es de listes de sources pour ce disque sont�:\n"
+msgstr "Les entrées de listes de sources pour ce disque sont :\n"
#: apt-pkg/cdrom.cc:834
msgid "Unmounting CD-ROM...\n"
-msgstr "D�montage du c�d�rom...\n"
+msgstr "Démontage du cédérom...\n"
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
#, c-format
msgid "Wrote %i records.\n"
-msgstr "%i enregistrements �crits.\n"
+msgstr "%i enregistrements écrits.\n"
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
#, c-format
msgid "Wrote %i records with %i missing files.\n"
-msgstr "%i enregistrements �crits avec %i fichiers manquants.\n"
+msgstr "%i enregistrements écrits avec %i fichiers manquants.\n"
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
-msgstr "%i enregistrements �crits avec %i fichiers qui ne correspondent pas\n"
+msgstr "%i enregistrements écrits avec %i fichiers qui ne correspondent pas\n"
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
-"%i enregistrements �crits avec %i fichiers manquants et %i qui ne "
+"%i enregistrements écrits avec %i fichiers manquants et %i qui ne "
"correspondent pas\n"
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:522
#, c-format
msgid "Preparing %s"
-msgstr "Pr�paration de %s"
+msgstr "Préparation de %s"
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:523
#, c-format
msgid "Unpacking %s"
-msgstr "D�compression de %s"
+msgstr "Décompression de %s"
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:528
#, c-format
msgid "Preparing to configure %s"
-msgstr "Pr�paration de la configuration de %s"
+msgstr "Préparation de la configuration de %s"
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:529
#, c-format
msgid "Configuring %s"
msgstr "Configuration de %s"
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:530
#, c-format
msgid "Installed %s"
-msgstr "%s install�"
+msgstr "%s installé"
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:535
#, c-format
msgid "Preparing for removal of %s"
-msgstr "Pr�paration de la suppression de %s"
+msgstr "Préparation de la suppression de %s"
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:536
#, c-format
msgid "Removing %s"
msgstr "Suppression de %s"
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:537
#, c-format
msgid "Removed %s"
-msgstr "%s supprim�"
+msgstr "%s supprimé"
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:542
#, c-format
msgid "Preparing to completely remove %s"
-msgstr "Pr�paration de la suppression compl�te de %s"
+msgstr "Préparation de la suppression complète de %s"
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:543
#, c-format
msgid "Completely removed %s"
-msgstr "%s compl�tement supprim�"
+msgstr "%s complètement supprimé"
+
+#: apt-pkg/deb/dpkgpm.cc:566
+#, c-format
+msgid "Directory '%s' missing"
+msgstr "Répertoire %s inexistant"
+
+#: apt-pkg/deb/dpkgpm.cc:709
+#, c-format
+msgid "openpty failed\n"
+msgstr "échec d'openpty\n"
#: methods/rred.cc:219
msgid "Could not patch file"
@@ -2924,4 +2938,4 @@ msgstr "Impossible de corriger le fichier"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
-msgstr "Connexion ferm�e pr�matur�ment"
+msgstr "Connexion fermée prématurément"
diff --git a/po/gl.po b/po/gl.po
index d410b9e02..9cf8b5f97 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-06 06:51+0200\n"
+"POT-Creation-Date: 2007-08-04 09:09+0200\n"
"PO-Revision-Date: 2007-06-18 15:26+0200\n"
"Last-Translator: Jacobo Tarrío <jtarrio@debian.org>\n"
"Language-Team: Galician <proxecto@trasno.net>\n"
@@ -157,9 +157,9 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2584 cmdline/apt-sortpkgs.cc:144
-#, c-format
-msgid "%s %s for %s %s compiled on %s %s\n"
+#: cmdline/apt-get.cc:2585 cmdline/apt-sortpkgs.cc:144
+#, fuzzy, c-format
+msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s para %s %s compilado en %s %s\n"
#: cmdline/apt-cache.cc:1721
@@ -662,7 +662,7 @@ msgstr "Non se puido cambiar o nome de %s a %s"
msgid "Y"
msgstr "S"
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1673
#, c-format
msgid "Regex compilation error - %s"
msgstr "Erro na compilación da expresión regular - %s"
@@ -823,11 +823,11 @@ msgstr "Hai que eliminar paquetes pero a eliminación está desactivada."
msgid "Internal error, Ordering didn't finish"
msgstr "Erro interno, a ordeación non rematou"
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2011 cmdline/apt-get.cc:2044
msgid "Unable to lock the download directory"
msgstr "Non se puido bloquear o directorio de descargas"
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2092 cmdline/apt-get.cc:2333
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr "Non se puido ler a lista de orixes."
@@ -857,7 +857,7 @@ msgstr "Despois de desempaquetar hanse ocupar %sB de disco adicionais.\n"
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Despois de desempaquetar hanse liberar %sB de disco.\n"
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2186
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2187
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Non se puido determinar o espazo libre en %s"
@@ -894,7 +894,7 @@ msgstr "Abortar."
msgid "Do you want to continue [Y/n]? "
msgstr "¿Quere continuar [S/n]? "
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2229
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2230
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Non se puido obter %s %s\n"
@@ -903,7 +903,7 @@ msgstr "Non se puido obter %s %s\n"
msgid "Some files failed to download"
msgstr "Non se puido descargar algúns ficheiros"
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2238
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2239
msgid "Download complete and in download only mode"
msgstr "Completouse a descarga no modo de só descargas"
@@ -1043,7 +1043,7 @@ msgstr ""
"Hum, semella que o autoeliminadir destruiu algo, o que non debería\n"
"ter ocorrido. Envíe un informe de erro sobre apt."
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1754
msgid "The following information may help to resolve the situation:"
msgstr "A seguinte información pode axudar a resolver a situación:"
@@ -1055,31 +1055,31 @@ msgstr "Erro interno, o autoeliminador rompeu cousas"
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Erro interno, AllUpgrade rompeu cousas"
-#: cmdline/apt-get.cc:1544
+#: cmdline/apt-get.cc:1545
#, c-format
msgid "Couldn't find task %s"
msgstr "Non se puido atopar a tarefa %s"
-#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
+#: cmdline/apt-get.cc:1660 cmdline/apt-get.cc:1696
#, c-format
msgid "Couldn't find package %s"
msgstr "Non se puido atopar o paquete %s"
-#: cmdline/apt-get.cc:1682
+#: cmdline/apt-get.cc:1683
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Nota, escóllese %s para a expresión regular \"%s\"\n"
-#: cmdline/apt-get.cc:1712
+#: cmdline/apt-get.cc:1713
#, c-format
msgid "%s set to manual installed.\n"
msgstr "%s cambiado a instalado manualmente.\n"
-#: cmdline/apt-get.cc:1725
+#: cmdline/apt-get.cc:1726
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Pode querer executar \"apt-get -f install\" corrixir isto:"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1729
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1087,7 +1087,7 @@ msgstr ""
"Dependencias incumpridas. Probe \"apt-get -f install\" sen paquetes (ou "
"especifique unha solución)."
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1741
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1098,7 +1098,7 @@ msgstr ""
"unha situación imposible ou, se emprega a distribución inestable, que\n"
"algúns paquetes solicitados aínda non se crearon ou moveron de Incoming."
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1749
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1107,118 +1107,118 @@ msgstr ""
"Xa que só solicitou unha soa operación, é bastante probable que o\n"
"paquete non sea instalable e que se deba informar dun erro no paquete."
-#: cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1757
msgid "Broken packages"
msgstr "Paquetes rotos"
-#: cmdline/apt-get.cc:1785
+#: cmdline/apt-get.cc:1786
msgid "The following extra packages will be installed:"
msgstr "Hanse instalar os seguintes paquetes extra:"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Suggested packages:"
msgstr "Paquetes suxiridos:"
-#: cmdline/apt-get.cc:1875
+#: cmdline/apt-get.cc:1876
msgid "Recommended packages:"
msgstr "Paquetes recomendados:"
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1904
msgid "Calculating upgrade... "
msgstr "A calcular a actualización... "
-#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1907 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Fallou"
-#: cmdline/apt-get.cc:1911
+#: cmdline/apt-get.cc:1912
msgid "Done"
msgstr "Rematado"
-#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
+#: cmdline/apt-get.cc:1979 cmdline/apt-get.cc:1987
msgid "Internal error, problem resolver broke stuff"
msgstr "Erro interno, o resolvedor interno rompeu cousas"
-#: cmdline/apt-get.cc:2086
+#: cmdline/apt-get.cc:2087
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Ten que especificar alomenos un paquete para lle descargar o código fonte"
-#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2350
+#: cmdline/apt-get.cc:2117 cmdline/apt-get.cc:2351
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Non se puido atopar un paquete fonte para %s"
-#: cmdline/apt-get.cc:2165
+#: cmdline/apt-get.cc:2166
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Omítese o ficheiro xa descargado \"%s\"\n"
-#: cmdline/apt-get.cc:2189
+#: cmdline/apt-get.cc:2190
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Non hai espazo libre de abondo en %s"
-#: cmdline/apt-get.cc:2194
+#: cmdline/apt-get.cc:2195
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Hai que recibir %sB/%sB de arquivos de fonte.\n"
-#: cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2198
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Hai que recibir %sB de arquivos de fonte.\n"
-#: cmdline/apt-get.cc:2203
+#: cmdline/apt-get.cc:2204
#, c-format
msgid "Fetch source %s\n"
msgstr "Obter fonte %s\n"
-#: cmdline/apt-get.cc:2234
+#: cmdline/apt-get.cc:2235
msgid "Failed to fetch some archives."
msgstr "Non se puido recibir algúns arquivos."
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2263
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Omítese o desempaquetamento do código fonte xa desempaquetado en %s\n"
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2275
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Fallou a orde de desempaquetamento \"%s\".\n"
-#: cmdline/apt-get.cc:2275
+#: cmdline/apt-get.cc:2276
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Comprobe que o paquete \"dpkg-dev\" estea instalado.\n"
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2293
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Fallou a codificación de %s.\n"
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:2312
msgid "Child process failed"
msgstr "O proceso fillo fallou"
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2328
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Ten que especificar alomenos un paquete para lle comprobar as dependencias "
"de compilación"
-#: cmdline/apt-get.cc:2355
+#: cmdline/apt-get.cc:2356
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Non se puido obter a información de dependencias de compilación de %s"
-#: cmdline/apt-get.cc:2375
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s non ten dependencias de compilación.\n"
-#: cmdline/apt-get.cc:2427
+#: cmdline/apt-get.cc:2428
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1227,7 +1227,7 @@ msgstr ""
"A dependencia \"%s\" de %s non se pode satisfacer porque non se pode atopar "
"o paquete %s"
-#: cmdline/apt-get.cc:2479
+#: cmdline/apt-get.cc:2480
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1236,32 +1236,32 @@ msgstr ""
"A dependencia \"%s\" de %s non se pode satisfacer porque ningunha versión "
"dispoñible do paquete %s satisfai os requirimentos de versión"
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2515
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Non se puido satisfacer a dependencia \"%s\" de %s: O paquete instalado %s é "
"novo de máis"
-#: cmdline/apt-get.cc:2539
+#: cmdline/apt-get.cc:2540
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Non se puido satisfacer a dependencia \"%s\" de %s: %s"
-#: cmdline/apt-get.cc:2553
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Non se puideron satisfacer as dependencias de compilación de %s."
-#: cmdline/apt-get.cc:2557
+#: cmdline/apt-get.cc:2558
msgid "Failed to process build dependencies"
msgstr "Non se puido procesar as dependencias de compilación"
-#: cmdline/apt-get.cc:2589
+#: cmdline/apt-get.cc:2590
msgid "Supported modules:"
msgstr "Módulos soportados:"
-#: cmdline/apt-get.cc:2630
+#: cmdline/apt-get.cc:2631
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1687,25 +1687,25 @@ msgstr "Erro ao analizar o MD5. Desprazamento %lu"
msgid "This is not a valid DEB archive, missing '%s' member"
msgstr "Este non é un arquivo DEB válido, falla o membro \"%s\""
-#: apt-inst/deb/debfile.cc:48
-#, c-format
-msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
+#: apt-inst/deb/debfile.cc:50
+#, fuzzy, c-format
+msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
msgstr "Este non é un arquivo DEB válido, non ten un membro \"%s\" ou \"%s\""
-#: apt-inst/deb/debfile.cc:108
+#: apt-inst/deb/debfile.cc:110
#, c-format
msgid "Couldn't change to %s"
msgstr "Non se puido cambiar a %s"
-#: apt-inst/deb/debfile.cc:134
+#: apt-inst/deb/debfile.cc:140
msgid "Internal error, could not locate member"
msgstr "Erro interno, non se puido atopar un membro"
-#: apt-inst/deb/debfile.cc:167
+#: apt-inst/deb/debfile.cc:173
msgid "Failed to locate a valid control file"
msgstr "Non se puido atopar un ficheiro de control válido"
-#: apt-inst/deb/debfile.cc:252
+#: apt-inst/deb/debfile.cc:258
msgid "Unparsable control file"
msgstr "Ficheiro de control non analizable"
@@ -2073,15 +2073,15 @@ msgstr "Erro ao ler do servidor. O extremo remoto pechou a conexión"
msgid "Error reading from server"
msgstr "Erro ao ler do servidor"
-#: methods/http.cc:1108
+#: methods/http.cc:1104
msgid "Bad header data"
msgstr "Datos da cabeceira incorrectos"
-#: methods/http.cc:1125
+#: methods/http.cc:1121 methods/http.cc:1176
msgid "Connection failed"
msgstr "A conexión fallou"
-#: methods/http.cc:1216
+#: methods/http.cc:1228
msgid "Internal error"
msgstr "Erro interno"
@@ -2110,8 +2110,8 @@ msgid "Opening configuration file %s"
msgstr "A abrir o ficheiro de configuración %s"
#: apt-pkg/contrib/configuration.cc:510
-#, c-format
-msgid "Line %d too long (max %lu)"
+#, fuzzy, c-format
+msgid "Line %d too long (max %u)"
msgstr "Liña %d longa de máis (máximo %lu)"
#: apt-pkg/contrib/configuration.cc:606
@@ -2365,28 +2365,28 @@ msgstr "opcional"
msgid "extra"
msgstr "extra"
-#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129
+#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
msgid "Building dependency tree"
msgstr "A construír a árbore de dependencias"
-#: apt-pkg/depcache.cc:101
+#: apt-pkg/depcache.cc:122
msgid "Candidate versions"
msgstr "Versións candidatas"
-#: apt-pkg/depcache.cc:130
+#: apt-pkg/depcache.cc:151
msgid "Dependency generation"
msgstr "Xeración de dependencias"
-#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174
+#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
msgid "Reading state information"
msgstr "A ler a información do estado"
-#: apt-pkg/depcache.cc:198
+#: apt-pkg/depcache.cc:219
#, c-format
msgid "Failed to open StateFile %s"
msgstr "Non se puido abrir o ficheiro de estado %s"
-#: apt-pkg/depcache.cc:204
+#: apt-pkg/depcache.cc:225
#, c-format
msgid "Failed to write temporary StateFile %s"
msgstr "Non se puido gravar o ficheiro de estado temporal %s"
@@ -2518,17 +2518,17 @@ msgstr "Non se puido atopar o controlador de métodos %s."
msgid "Method %s did not start correctly"
msgstr "O método %s non se iniciou correctamente"
-#: apt-pkg/acquire-worker.cc:381
+#: apt-pkg/acquire-worker.cc:396
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Introduza o disco etiquetado: \"%s\" na unidade \"%s\" e prema Intro."
-#: apt-pkg/init.cc:126
+#: apt-pkg/init.cc:124
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "O sistema de empaquetamento \"%s\" non está soportado"
-#: apt-pkg/init.cc:142
+#: apt-pkg/init.cc:140
msgid "Unable to determine a suitable packaging system type"
msgstr "Non se puido determinar un tipo de sistema de empaquetamento axeitado"
@@ -2664,17 +2664,21 @@ msgstr "Erro de E/S ao gravar a caché de fontes"
msgid "rename failed, %s (%s -> %s)."
msgstr "fallou o cambio de nome, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:401
msgid "MD5Sum mismatch"
msgstr "Os MD5Sum non coinciden"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1405
+#, fuzzy
+msgid "Hash Sum mismatch"
+msgstr "Os MD5Sum non coinciden"
+
+#: apt-pkg/acquire-item.cc:1097
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"Non hai unha clave pública dispoñible para os seguintes IDs de clave:\n"
-#: apt-pkg/acquire-item.cc:1219
+#: apt-pkg/acquire-item.cc:1210
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2683,7 +2687,7 @@ msgstr ""
"Non se puido atopar un ficheiro para o paquete %s. Isto pode significar que "
"ten que arranxar este paquete a man. (Falla a arquitectura)"
-#: apt-pkg/acquire-item.cc:1278
+#: apt-pkg/acquire-item.cc:1269
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2692,7 +2696,7 @@ msgstr ""
"Non se puido atopar un ficheiro para o paquete %s. Isto pode significar que "
"ten que arranxar este paquete a man."
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1310
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2700,7 +2704,7 @@ msgstr ""
"Os ficheiros de índices de paquetes están corrompidos. Non hai un campo "
"Filename: para o paquete %s."
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1397
msgid "Size mismatch"
msgstr "Os tamaños non coinciden"
@@ -2792,78 +2796,88 @@ msgstr "As entradas da lista de fontes deste disco son:\n"
msgid "Unmounting CD-ROM...\n"
msgstr "A desmontar o CD-ROM...\n"
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
#, c-format
msgid "Wrote %i records.\n"
msgstr "Graváronse %i rexistros.\n"
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Graváronse %i rexistros con %i ficheiros que fallan.\n"
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Graváronse %i rexistros con %i ficheiros que non coinciden\n"
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
"Graváronse %i rexistros con %i ficheiros que fallan e %i ficheiros que non "
"coinciden\n"
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:522
#, c-format
msgid "Preparing %s"
msgstr "A preparar %s"
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:523
#, c-format
msgid "Unpacking %s"
msgstr "A desempaquetar %s"
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:528
#, c-format
msgid "Preparing to configure %s"
msgstr "A se preparar para configurar %s"
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:529
#, c-format
msgid "Configuring %s"
msgstr "A configurar %s"
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:530
#, c-format
msgid "Installed %s"
msgstr "Instalouse %s"
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:535
#, c-format
msgid "Preparing for removal of %s"
msgstr "A se preparar para a eliminación de %s"
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:536
#, c-format
msgid "Removing %s"
msgstr "A eliminar %s"
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:537
#, c-format
msgid "Removed %s"
msgstr "Eliminouse %s"
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:542
#, c-format
msgid "Preparing to completely remove %s"
msgstr "A se preparar para eliminar %s completamente"
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:543
#, c-format
msgid "Completely removed %s"
msgstr "Eliminouse %s completamente"
+#: apt-pkg/deb/dpkgpm.cc:566
+#, fuzzy, c-format
+msgid "Directory '%s' missing"
+msgstr "O directorio de listas %spartial falla."
+
+#: apt-pkg/deb/dpkgpm.cc:709
+#, fuzzy, c-format
+msgid "openpty failed\n"
+msgstr "Fallou a chamada a select"
+
#: methods/rred.cc:219
msgid "Could not patch file"
msgstr "Non se puido parchear o ficheiro"
diff --git a/po/he.po b/po/he.po
index e4b153954..814d9031b 100644
--- a/po/he.po
+++ b/po/he.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.25\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-06 06:51+0200\n"
+"POT-Creation-Date: 2007-08-04 09:09+0200\n"
"PO-Revision-Date: 2004-06-10 19:58+0300\n"
"Last-Translator: Lior Kaplan <webmaster@guides.co.il>\n"
"Language-Team: Hebrew\n"
@@ -156,9 +156,9 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2584 cmdline/apt-sortpkgs.cc:144
-#, c-format
-msgid "%s %s for %s %s compiled on %s %s\n"
+#: cmdline/apt-get.cc:2585 cmdline/apt-sortpkgs.cc:144
+#, fuzzy, c-format
+msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s בשביל %s %s קומפל על %s %s\n"
#: cmdline/apt-cache.cc:1721
@@ -554,7 +554,7 @@ msgstr "כשלון בשינוי השם %s ל-%s"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1673
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
@@ -717,11 +717,11 @@ msgstr ""
msgid "Internal error, Ordering didn't finish"
msgstr ""
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2011 cmdline/apt-get.cc:2044
msgid "Unable to lock the download directory"
msgstr "לא מצליח לנעול את ספרית ההורדה."
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2092 cmdline/apt-get.cc:2333
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr "רשימת המקורות לא ניתנת לקריאה."
@@ -750,7 +750,7 @@ msgstr "אחרי פריסה %sB נוספים יהיו בשימוש.\n"
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "אחרי פריסה %sB נוספים ישוחררו.\n"
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2186
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2187
#, fuzzy, c-format
msgid "Couldn't determine free space in %s"
msgstr "אין לך מספיק מקום פנוי ב-%s."
@@ -785,7 +785,7 @@ msgstr "בטל."
msgid "Do you want to continue [Y/n]? "
msgstr "האם אתה רוצה להמשיך? [Y/n]"
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2229
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2230
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "כשלון בהבאת %s %s\n"
@@ -794,7 +794,7 @@ msgstr "כשלון בהבאת %s %s\n"
msgid "Some files failed to download"
msgstr "כשלון בהורדת חלק מהקבצים"
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2238
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2239
msgid "Download complete and in download only mode"
msgstr "ההורדה הסתיימה במסגרת מצב הורדה בלבד."
@@ -921,7 +921,7 @@ msgid ""
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1754
msgid "The following information may help to resolve the situation:"
msgstr ""
@@ -934,37 +934,37 @@ msgstr "שגיאה פנימית, כלשון ביצירת %s"
msgid "Internal error, AllUpgrade broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1544
+#: cmdline/apt-get.cc:1545
#, c-format
msgid "Couldn't find task %s"
msgstr ""
-#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
+#: cmdline/apt-get.cc:1660 cmdline/apt-get.cc:1696
#, c-format
msgid "Couldn't find package %s"
msgstr ""
-#: cmdline/apt-get.cc:1682
+#: cmdline/apt-get.cc:1683
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:1712
+#: cmdline/apt-get.cc:1713
#, fuzzy, c-format
msgid "%s set to manual installed.\n"
msgstr "אבל %s הולכת להיות מותקנת"
-#: cmdline/apt-get.cc:1725
+#: cmdline/apt-get.cc:1726
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1729
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
msgstr ""
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1741
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -972,160 +972,160 @@ msgid ""
"or been moved out of Incoming."
msgstr ""
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1749
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
"that package should be filed."
msgstr ""
-#: cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1757
msgid "Broken packages"
msgstr ""
-#: cmdline/apt-get.cc:1785
+#: cmdline/apt-get.cc:1786
msgid "The following extra packages will be installed:"
msgstr ""
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Suggested packages:"
msgstr ""
-#: cmdline/apt-get.cc:1875
+#: cmdline/apt-get.cc:1876
msgid "Recommended packages:"
msgstr ""
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1904
msgid "Calculating upgrade... "
msgstr ""
-#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1907 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr ""
-#: cmdline/apt-get.cc:1911
+#: cmdline/apt-get.cc:1912
msgid "Done"
msgstr ""
-#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
+#: cmdline/apt-get.cc:1979 cmdline/apt-get.cc:1987
#, fuzzy
msgid "Internal error, problem resolver broke stuff"
msgstr "שגיאה פנימית, כלשון ביצירת %s"
-#: cmdline/apt-get.cc:2086
+#: cmdline/apt-get.cc:2087
msgid "Must specify at least one package to fetch source for"
msgstr ""
-#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2350
+#: cmdline/apt-get.cc:2117 cmdline/apt-get.cc:2351
#, c-format
msgid "Unable to find a source package for %s"
msgstr ""
-#: cmdline/apt-get.cc:2165
+#: cmdline/apt-get.cc:2166
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:2189
+#: cmdline/apt-get.cc:2190
#, c-format
msgid "You don't have enough free space in %s"
msgstr ""
-#: cmdline/apt-get.cc:2194
+#: cmdline/apt-get.cc:2195
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2198
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:2203
+#: cmdline/apt-get.cc:2204
#, c-format
msgid "Fetch source %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2234
+#: cmdline/apt-get.cc:2235
msgid "Failed to fetch some archives."
msgstr ""
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2263
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2275
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2275
+#: cmdline/apt-get.cc:2276
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2293
#, c-format
msgid "Build command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:2312
msgid "Child process failed"
msgstr ""
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2328
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-#: cmdline/apt-get.cc:2355
+#: cmdline/apt-get.cc:2356
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
-#: cmdline/apt-get.cc:2375
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:2427
+#: cmdline/apt-get.cc:2428
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-#: cmdline/apt-get.cc:2479
+#: cmdline/apt-get.cc:2480
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
"package %s can satisfy version requirements"
msgstr ""
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2515
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-#: cmdline/apt-get.cc:2539
+#: cmdline/apt-get.cc:2540
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr ""
-#: cmdline/apt-get.cc:2553
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
-#: cmdline/apt-get.cc:2557
+#: cmdline/apt-get.cc:2558
msgid "Failed to process build dependencies"
msgstr ""
-#: cmdline/apt-get.cc:2589
+#: cmdline/apt-get.cc:2590
msgid "Supported modules:"
msgstr ""
-#: cmdline/apt-get.cc:2630
+#: cmdline/apt-get.cc:2631
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1491,25 +1491,25 @@ msgstr ""
msgid "This is not a valid DEB archive, missing '%s' member"
msgstr ""
-#: apt-inst/deb/debfile.cc:48
+#: apt-inst/deb/debfile.cc:50
#, c-format
-msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
+msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
msgstr ""
-#: apt-inst/deb/debfile.cc:108
+#: apt-inst/deb/debfile.cc:110
#, c-format
msgid "Couldn't change to %s"
msgstr ""
-#: apt-inst/deb/debfile.cc:134
+#: apt-inst/deb/debfile.cc:140
msgid "Internal error, could not locate member"
msgstr ""
-#: apt-inst/deb/debfile.cc:167
+#: apt-inst/deb/debfile.cc:173
msgid "Failed to locate a valid control file"
msgstr ""
-#: apt-inst/deb/debfile.cc:252
+#: apt-inst/deb/debfile.cc:258
msgid "Unparsable control file"
msgstr ""
@@ -1867,15 +1867,15 @@ msgstr ""
msgid "Error reading from server"
msgstr ""
-#: methods/http.cc:1108
+#: methods/http.cc:1104
msgid "Bad header data"
msgstr ""
-#: methods/http.cc:1125
+#: methods/http.cc:1121 methods/http.cc:1176
msgid "Connection failed"
msgstr ""
-#: methods/http.cc:1216
+#: methods/http.cc:1228
msgid "Internal error"
msgstr ""
@@ -1905,7 +1905,7 @@ msgstr ""
#: apt-pkg/contrib/configuration.cc:510
#, c-format
-msgid "Line %d too long (max %lu)"
+msgid "Line %d too long (max %u)"
msgstr ""
#: apt-pkg/contrib/configuration.cc:606
@@ -2158,28 +2158,28 @@ msgstr ""
msgid "extra"
msgstr ""
-#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129
+#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
msgid "Building dependency tree"
msgstr ""
-#: apt-pkg/depcache.cc:101
+#: apt-pkg/depcache.cc:122
msgid "Candidate versions"
msgstr ""
-#: apt-pkg/depcache.cc:130
+#: apt-pkg/depcache.cc:151
msgid "Dependency generation"
msgstr ""
-#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174
+#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
msgid "Reading state information"
msgstr ""
-#: apt-pkg/depcache.cc:198
+#: apt-pkg/depcache.cc:219
#, fuzzy, c-format
msgid "Failed to open StateFile %s"
msgstr "כשלון בפתיחת %s"
-#: apt-pkg/depcache.cc:204
+#: apt-pkg/depcache.cc:225
#, fuzzy, c-format
msgid "Failed to write temporary StateFile %s"
msgstr "כשלון בפענוח %s"
@@ -2305,17 +2305,17 @@ msgstr ""
msgid "Method %s did not start correctly"
msgstr ""
-#: apt-pkg/acquire-worker.cc:381
+#: apt-pkg/acquire-worker.cc:396
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
-#: apt-pkg/init.cc:126
+#: apt-pkg/init.cc:124
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr ""
-#: apt-pkg/init.cc:142
+#: apt-pkg/init.cc:140
msgid "Unable to determine a suitable packaging system type"
msgstr ""
@@ -2447,36 +2447,39 @@ msgstr ""
msgid "rename failed, %s (%s -> %s)."
msgstr ""
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:401
msgid "MD5Sum mismatch"
msgstr ""
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1405
+msgid "Hash Sum mismatch"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1097
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:1219
+#: apt-pkg/acquire-item.cc:1210
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package. (due to missing arch)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1278
+#: apt-pkg/acquire-item.cc:1269
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"manually fix this package."
msgstr ""
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1310
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1397
msgid "Size mismatch"
msgstr ""
@@ -2562,76 +2565,86 @@ msgstr ""
msgid "Unmounting CD-ROM...\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
#, c-format
msgid "Wrote %i records.\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:522
#, c-format
msgid "Preparing %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:523
#, c-format
msgid "Unpacking %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:528
#, c-format
msgid "Preparing to configure %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:529
#, c-format
msgid "Configuring %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:530
#, fuzzy, c-format
msgid "Installed %s"
msgstr "מותקן:"
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:535
#, c-format
msgid "Preparing for removal of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:536
#, c-format
msgid "Removing %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:537
#, c-format
msgid "Removed %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:542
#, c-format
msgid "Preparing to completely remove %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:543
#, c-format
msgid "Completely removed %s"
msgstr ""
+#: apt-pkg/deb/dpkgpm.cc:566
+#, c-format
+msgid "Directory '%s' missing"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:709
+#, fuzzy, c-format
+msgid "openpty failed\n"
+msgstr "כשלון."
+
#: methods/rred.cc:219
msgid "Could not patch file"
msgstr ""
diff --git a/po/hu.po b/po/hu.po
index 8ccde5c94..ba542001e 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: hu\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-06 06:51+0200\n"
+"POT-Creation-Date: 2007-08-04 09:09+0200\n"
"PO-Revision-Date: 2006-10-21 11:04+0100\n"
"Last-Translator: SZERVÁC Attila <sas@321.hu>\n"
"Language-Team: Hungarian <debian-l10n-hungarian>\n"
@@ -161,9 +161,9 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2584 cmdline/apt-sortpkgs.cc:144
-#, c-format
-msgid "%s %s for %s %s compiled on %s %s\n"
+#: cmdline/apt-get.cc:2585 cmdline/apt-sortpkgs.cc:144
+#, fuzzy, c-format
+msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s ehhez: %s %s fordítás ideje: %s %s\n"
#: cmdline/apt-cache.cc:1721
@@ -658,7 +658,7 @@ msgstr "Nem sikerült átnevezni %s-t erre: %s"
msgid "Y"
msgstr "I"
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1673
#, c-format
msgid "Regex compilation error - %s"
msgstr "Regex fordítási hiba - %s"
@@ -819,11 +819,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:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2011 cmdline/apt-get.cc:2044
msgid "Unable to lock the download directory"
msgstr "Nem tudom zárolni a letöltési könyvtárat"
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2092 cmdline/apt-get.cc:2333
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr "A források listája olvashatatlan."
@@ -852,7 +852,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:861 cmdline/apt-get.cc:2186
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2187
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Nem határozható meg a szabad hely itt: %s"
@@ -889,7 +889,7 @@ msgstr "Megszakítva."
msgid "Do you want to continue [Y/n]? "
msgstr "Folytatni akarod [Y/n]? "
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2229
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2230
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Sikertelen letöltés: %s %s\n"
@@ -898,7 +898,7 @@ 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:995 cmdline/apt-get.cc:2238
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2239
msgid "Download complete and in download only mode"
msgstr "A letöltés befejeződött a 'csak letöltés' módban"
@@ -1031,7 +1031,7 @@ msgid ""
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1754
msgid "The following information may help to resolve the situation:"
msgstr "Az alábbi információ segíthet megoldani a helyzetet:"
@@ -1044,31 +1044,31 @@ msgstr "Belső hiba, hibafeloldó gond"
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Belső hiba, AllUpgrade megsértett valamit"
-#: cmdline/apt-get.cc:1544
+#: cmdline/apt-get.cc:1545
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "Az alábbi csomag nem található: %s"
-#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
+#: cmdline/apt-get.cc:1660 cmdline/apt-get.cc:1696
#, c-format
msgid "Couldn't find package %s"
msgstr "Az alábbi csomag nem található: %s"
-#: cmdline/apt-get.cc:1682
+#: cmdline/apt-get.cc:1683
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Megjegyzés: %s kiválasztása %s reguláris kifejezéshez\n"
-#: cmdline/apt-get.cc:1712
+#: cmdline/apt-get.cc:1713
#, fuzzy, c-format
msgid "%s set to manual installed.\n"
msgstr "de csak %s telepíthető"
-#: cmdline/apt-get.cc:1725
+#: cmdline/apt-get.cc:1726
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:1728
+#: cmdline/apt-get.cc:1729
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1076,7 +1076,7 @@ msgstr ""
"Teljesítetlen függőségek. Próbáld az 'apt-get -f install'-t csomagok nélkül "
"(vagy telepítsd a függőségeket is!)."
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1741
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1088,7 +1088,7 @@ msgstr ""
"használod, akkor néhány igényelt csomag még nem készült el vagy ki\n"
"lett mozdítva az Incoming-ból."
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1749
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1098,118 +1098,118 @@ msgstr ""
"hogy a csomag egyszerűen nem telepíthető és egy hibajelentést kellene\n"
"kitölteni a csomaghoz."
-#: cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1757
msgid "Broken packages"
msgstr "Törött csomagok"
-#: cmdline/apt-get.cc:1785
+#: cmdline/apt-get.cc:1786
msgid "The following extra packages will be installed:"
msgstr "Az alábbi extra csomagok kerülnek telepítésre:"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Suggested packages:"
msgstr "Javasolt csomagok:"
-#: cmdline/apt-get.cc:1875
+#: cmdline/apt-get.cc:1876
msgid "Recommended packages:"
msgstr "Ajánlott csomagok:"
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1904
msgid "Calculating upgrade... "
msgstr "Frissítés kiszámítása... "
-#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1907 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Sikertelen"
-#: cmdline/apt-get.cc:1911
+#: cmdline/apt-get.cc:1912
msgid "Done"
msgstr "Kész"
-#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
+#: cmdline/apt-get.cc:1979 cmdline/apt-get.cc:1987
msgid "Internal error, problem resolver broke stuff"
msgstr "Belső hiba, hibafeloldó gond"
-#: cmdline/apt-get.cc:2086
+#: cmdline/apt-get.cc:2087
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Legalább egy csomagot meg kell adnod, aminek a forrását le kell tölteni"
-#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2350
+#: cmdline/apt-get.cc:2117 cmdline/apt-get.cc:2351
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Nem található forráscsomag ehhez: %s"
-#: cmdline/apt-get.cc:2165
+#: cmdline/apt-get.cc:2166
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "A már letöltött '%s' fájl kihagyása\n"
-#: cmdline/apt-get.cc:2189
+#: cmdline/apt-get.cc:2190
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Nincs elég szabad hely itt: %s"
-#: cmdline/apt-get.cc:2194
+#: cmdline/apt-get.cc:2195
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "%sB/%sB forrás-archívumot kell letölteni.\n"
-#: cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2198
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "%sB forrás-archívumot kell letölteni.\n"
-#: cmdline/apt-get.cc:2203
+#: cmdline/apt-get.cc:2204
#, c-format
msgid "Fetch source %s\n"
msgstr "Forrás letöltése: %s\n"
-#: cmdline/apt-get.cc:2234
+#: cmdline/apt-get.cc:2235
msgid "Failed to fetch some archives."
msgstr "Nem sikerült néhány archívumot letölteni."
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2263
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Egy már kibontott forrás kibontásának kihagyása itt: %s\n"
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2275
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "'%s' kibontási parancs nem sikerült.\n"
-#: cmdline/apt-get.cc:2275
+#: cmdline/apt-get.cc:2276
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Ellenőrizd, hogy a 'dpkg-dev' csomag telepítve van-e.\n"
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2293
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "'%s' elkészítési parancs nem sikerült.\n"
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:2312
msgid "Child process failed"
msgstr "Hiba a gyermekfolyamatnál"
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2328
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Legalább egy csomagot adj meg, aminek a fordítási függőségeit ellenőrizni "
"kell"
-#: cmdline/apt-get.cc:2355
+#: cmdline/apt-get.cc:2356
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Nem lehet %s fordítási-függőség információját beszerezni"
-#: cmdline/apt-get.cc:2375
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "%s has no build depends.\n"
msgstr "Nincs fordítási függősége a következőnek: %s.\n"
-#: cmdline/apt-get.cc:2427
+#: cmdline/apt-get.cc:2428
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1218,7 +1218,7 @@ msgstr ""
"%s függősége ennek: %s, ez nem elégíthető ki, mert a(z) %s csomag nem "
"található"
-#: cmdline/apt-get.cc:2479
+#: cmdline/apt-get.cc:2480
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1227,32 +1227,32 @@ msgstr ""
"%s függősége ennek: %s, ez nem elégíthető ki, mert a(z) %s csomagnak nincs a "
"verzió-követelményt kielégítő elérhető verziója."
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2515
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"%s függőséget %s csomaghoz nem lehet kielégíteni: %s telepített csomag túl "
"friss."
-#: cmdline/apt-get.cc:2539
+#: cmdline/apt-get.cc:2540
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "%s függőséget %s csomaghoz nem lehet kielégíteni: %s "
-#: cmdline/apt-get.cc:2553
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "%s építési függőségei nem elégíthetőek ki."
-#: cmdline/apt-get.cc:2557
+#: cmdline/apt-get.cc:2558
msgid "Failed to process build dependencies"
msgstr "Nem sikerült az építési függőségeket feldolgozni"
-#: cmdline/apt-get.cc:2589
+#: cmdline/apt-get.cc:2590
msgid "Supported modules:"
msgstr "Támogatott modulok:"
-#: cmdline/apt-get.cc:2630
+#: cmdline/apt-get.cc:2631
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1672,25 +1672,25 @@ msgstr "MD5 értelmezési hiba. Offszet %lu"
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"
-#: apt-inst/deb/debfile.cc:48
-#, c-format
-msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
+#: apt-inst/deb/debfile.cc:50
+#, fuzzy, c-format
+msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
msgstr "Ez nem egy érvényes DEB archív, nincs \"%s\" vagy \"%s\" tagja"
-#: apt-inst/deb/debfile.cc:108
+#: apt-inst/deb/debfile.cc:110
#, c-format
msgid "Couldn't change to %s"
msgstr "Nem lehet váltani ebbe: %s"
-#: apt-inst/deb/debfile.cc:134
+#: apt-inst/deb/debfile.cc:140
msgid "Internal error, could not locate member"
msgstr "Belső hiba, a tag nem található"
-#: apt-inst/deb/debfile.cc:167
+#: apt-inst/deb/debfile.cc:173
msgid "Failed to locate a valid control file"
msgstr "Nem található érvényes vezérlő fájl"
-#: apt-inst/deb/debfile.cc:252
+#: apt-inst/deb/debfile.cc:258
msgid "Unparsable control file"
msgstr "Értelmezhetetlen vezérlő fájl"
@@ -2051,15 +2051,15 @@ msgstr "Hiba a kiszolgálóról olvasáskor, a túloldal lezárta a kapcsolatot"
msgid "Error reading from server"
msgstr "Hiba a kiszolgálóról olvasáskor"
-#: methods/http.cc:1108
+#: methods/http.cc:1104
msgid "Bad header data"
msgstr "Rossz fejlécadat"
-#: methods/http.cc:1125
+#: methods/http.cc:1121 methods/http.cc:1176
msgid "Connection failed"
msgstr "Sikertelen kapcsolódás"
-#: methods/http.cc:1216
+#: methods/http.cc:1228
msgid "Internal error"
msgstr "Belső hiba"
@@ -2090,7 +2090,7 @@ msgstr "%s konfigurációs fájl megnyitása"
#: apt-pkg/contrib/configuration.cc:510
#, fuzzy, c-format
-msgid "Line %d too long (max %lu)"
+msgid "Line %d too long (max %u)"
msgstr "A(z) %d. sor túl hosszú (maximum %d)"
#: apt-pkg/contrib/configuration.cc:606
@@ -2344,29 +2344,29 @@ msgstr "opcionális"
msgid "extra"
msgstr "extra"
-#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129
+#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
msgid "Building dependency tree"
msgstr "Függőségi fa építése"
-#: apt-pkg/depcache.cc:101
+#: apt-pkg/depcache.cc:122
msgid "Candidate versions"
msgstr "Lehetséges verziók"
-#: apt-pkg/depcache.cc:130
+#: apt-pkg/depcache.cc:151
msgid "Dependency generation"
msgstr "Függőség-generálás"
-#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174
+#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
#, fuzzy
msgid "Reading state information"
msgstr "Elérhető információk egyesítése"
-#: apt-pkg/depcache.cc:198
+#: apt-pkg/depcache.cc:219
#, fuzzy, c-format
msgid "Failed to open StateFile %s"
msgstr "%s megnyitása sikertelen"
-#: apt-pkg/depcache.cc:204
+#: apt-pkg/depcache.cc:225
#, fuzzy, c-format
msgid "Failed to write temporary StateFile %s"
msgstr "%s fájl írása sikertelen"
@@ -2499,17 +2499,17 @@ msgstr "A(z) %s metódus vezérlő nem található."
msgid "Method %s did not start correctly"
msgstr "A(z) %s metódus nem indult el helyesen"
-#: apt-pkg/acquire-worker.cc:381
+#: apt-pkg/acquire-worker.cc:396
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Tedd be a(z) %s címkéjű lemezt a(z) %s meghajtóba és üss entert"
-#: apt-pkg/init.cc:126
+#: apt-pkg/init.cc:124
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "A(z) '%s' csomagrendszer nem támogatott"
-#: apt-pkg/init.cc:142
+#: apt-pkg/init.cc:140
msgid "Unable to determine a suitable packaging system type"
msgstr "A megfelelő csomagrendszer típus nem határozható meg"
@@ -2648,16 +2648,20 @@ 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:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:401
msgid "MD5Sum mismatch"
msgstr "Az MD5Sum nem megfelelő"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1405
+#, fuzzy
+msgid "Hash Sum mismatch"
+msgstr "Az MD5Sum nem megfelelő"
+
+#: apt-pkg/acquire-item.cc:1097
msgid "There is no public key available for the following key IDs:\n"
msgstr "Nincs elérhető nyilvános kulcs az alábbi kulcs azonosítókhoz:\n"
-#: apt-pkg/acquire-item.cc:1219
+#: apt-pkg/acquire-item.cc:1210
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2666,7 +2670,7 @@ 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:1278
+#: apt-pkg/acquire-item.cc:1269
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2675,14 +2679,14 @@ 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:1314
+#: apt-pkg/acquire-item.cc:1310
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"A csomagindex-fájlok megsérültek. Nincs Filename: mező a(z) %s csomaghoz."
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1397
msgid "Size mismatch"
msgstr "A méret nem megfelelő"
@@ -2773,76 +2777,86 @@ msgstr "E lemezhez tartozó forráslista-bejegyzések a következők:\n"
msgid "Unmounting CD-ROM...\n"
msgstr "CD-ROM leválasztása..."
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
#, c-format
msgid "Wrote %i records.\n"
msgstr "%i rekord kiírva.\n"
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "%i rekord kiírva, %i hiányzó fájllal.\n"
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "%i rekord kiírva %i hibásan párosított fájllal\n"
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "%i rekord kiírva %i hiányzó és %i hibásan párosított fájllal\n"
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:522
#, c-format
msgid "Preparing %s"
msgstr "%s előkészítése"
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:523
#, c-format
msgid "Unpacking %s"
msgstr "%s kicsomagolása"
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:528
#, c-format
msgid "Preparing to configure %s"
msgstr "%s konfigurálásának előkészítése"
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:529
#, c-format
msgid "Configuring %s"
msgstr "%s konfigurálása"
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:530
#, c-format
msgid "Installed %s"
msgstr "Telepített %s"
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:535
#, c-format
msgid "Preparing for removal of %s"
msgstr "%s eltávolításának előkészítése"
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:536
#, c-format
msgid "Removing %s"
msgstr "%s eltávolítása"
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:537
#, c-format
msgid "Removed %s"
msgstr "Eltávolított %s"
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:542
#, c-format
msgid "Preparing to completely remove %s"
msgstr "%s teljes eltávolítása előkészítése"
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:543
#, c-format
msgid "Completely removed %s"
msgstr "%s teljesen eltávolítva"
+#: apt-pkg/deb/dpkgpm.cc:566
+#, fuzzy, c-format
+msgid "Directory '%s' missing"
+msgstr "%spartial listakönyvtár hiányzik."
+
+#: apt-pkg/deb/dpkgpm.cc:709
+#, fuzzy, c-format
+msgid "openpty failed\n"
+msgstr "Sikertelen kiválasztás"
+
#: methods/rred.cc:219
msgid "Could not patch file"
msgstr "%s fájl foltozása sikertelen"
diff --git a/po/it.po b/po/it.po
index c095f9046..554d20886 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-06 06:51+0200\n"
+"POT-Creation-Date: 2007-08-04 09:09+0200\n"
"PO-Revision-Date: 2006-10-12 09:27+0200\n"
"Last-Translator: Samuele Giovanni Tonon <samu@debian.org>\n"
"Language-Team: Italian <it@li.org>\n"
@@ -157,9 +157,9 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2584 cmdline/apt-sortpkgs.cc:144
-#, c-format
-msgid "%s %s for %s %s compiled on %s %s\n"
+#: cmdline/apt-get.cc:2585 cmdline/apt-sortpkgs.cc:144
+#, fuzzy, c-format
+msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s per %s %s compilato il %s %s\n"
#: cmdline/apt-cache.cc:1721
@@ -657,7 +657,7 @@ msgstr "Impossibile rinominare %s in %s"
msgid "Y"
msgstr "S"
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1673
#, c-format
msgid "Regex compilation error - %s"
msgstr "Errore di compilazione della regex - %s"
@@ -821,11 +821,11 @@ msgstr "I pacchetti devono essere rimossi ma il remove � disabilitato."
msgid "Internal error, Ordering didn't finish"
msgstr "Errore interno, l'ordinamento non � terminato"
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2011 cmdline/apt-get.cc:2044
msgid "Unable to lock the download directory"
msgstr "Impossibile creare un lock sulla directory di download"
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2092 cmdline/apt-get.cc:2333
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr "La lista dei sorgenti non pu� essere letta."
@@ -856,7 +856,7 @@ msgstr "Dopo l'estrazione, verranno occupati %sB di spazio su disco.\n"
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Dopo l'estrazione, verranno liberati %sB di spazio su disco.\n"
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2186
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2187
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Impossibile determinare lo spazio libero su %s"
@@ -895,7 +895,7 @@ msgstr "Interrotto."
msgid "Do you want to continue [Y/n]? "
msgstr "Continuare [S/n]? "
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2229
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2230
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Impossibile ottenere %s %s\n"
@@ -904,7 +904,7 @@ msgstr "Impossibile ottenere %s %s\n"
msgid "Some files failed to download"
msgstr "Il download di alcuni file � fallito"
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2238
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2239
msgid "Download complete and in download only mode"
msgstr "Download completato e in modalit� download-only"
@@ -1040,7 +1040,7 @@ msgid ""
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1754
msgid "The following information may help to resolve the situation:"
msgstr "Le seguenti informazioni possono aiutare a risolvere la situazione: "
@@ -1053,32 +1053,32 @@ msgstr "Errore interno, problem resolver ha rotto qualcosa"
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Errore interno, AllUpgrade ha rotto qualcosa"
-#: cmdline/apt-get.cc:1544
+#: cmdline/apt-get.cc:1545
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "Impossibile trovare %s"
-#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
+#: cmdline/apt-get.cc:1660 cmdline/apt-get.cc:1696
#, c-format
msgid "Couldn't find package %s"
msgstr "Impossibile trovare %s"
-#: cmdline/apt-get.cc:1682
+#: cmdline/apt-get.cc:1683
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Nota, si sta selezionando %s per la regex '%s'\n"
-#: cmdline/apt-get.cc:1712
+#: cmdline/apt-get.cc:1713
#, fuzzy, c-format
msgid "%s set to manual installed.\n"
msgstr "ma %s sta per essere installato"
-#: cmdline/apt-get.cc:1725
+#: cmdline/apt-get.cc:1726
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
"� consigliabile eseguire 'apt-get -f install' per correggere questi problemi:"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1729
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1086,7 +1086,7 @@ msgstr ""
"Dipendenze non soddisfatte. Provare 'apt-get -f install' senza pacchetti (o "
"specificare una soluzione)."
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1741
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1098,7 +1098,7 @@ msgstr ""
"si sta usando la distribuzione \"unstable\", che alcuni pacchetti\n"
"richiesti non sono ancora stati creati o rimossi da incoming."
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1749
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1108,117 +1108,117 @@ msgstr ""
"il pacchetto semplicemente non sia installabile, si consiglia\n"
"di inviare un \"bug report\" per tale pacchetto."
-#: cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1757
msgid "Broken packages"
msgstr "Pacchetto non integro"
-#: cmdline/apt-get.cc:1785
+#: cmdline/apt-get.cc:1786
msgid "The following extra packages will be installed:"
msgstr "I seguenti pacchetti verranno inoltre installati:"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Suggested packages:"
msgstr "Pacchetti suggeriti:"
-#: cmdline/apt-get.cc:1875
+#: cmdline/apt-get.cc:1876
msgid "Recommended packages:"
msgstr "Pacchetti raccomandati:"
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1904
msgid "Calculating upgrade... "
msgstr "Calcolo dell'aggiornamento in corso... "
-#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1907 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Fallito"
-#: cmdline/apt-get.cc:1911
+#: cmdline/apt-get.cc:1912
msgid "Done"
msgstr "Fatto"
-#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
+#: cmdline/apt-get.cc:1979 cmdline/apt-get.cc:1987
msgid "Internal error, problem resolver broke stuff"
msgstr "Errore interno, problem resolver ha rotto qualcosa"
-#: cmdline/apt-get.cc:2086
+#: cmdline/apt-get.cc:2087
msgid "Must specify at least one package to fetch source for"
msgstr "Bisogna specificare almeno un pacchetto di cui scaricare il sorgente"
-#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2350
+#: cmdline/apt-get.cc:2117 cmdline/apt-get.cc:2351
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Impossibile trovare un pacchetto sorgente per %s"
-#: cmdline/apt-get.cc:2165
+#: cmdline/apt-get.cc:2166
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Si � saltato il file gi� scaricato '%s'\n"
-#: cmdline/apt-get.cc:2189
+#: cmdline/apt-get.cc:2190
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Lo spazio libero in %s non � sufficiente"
-#: cmdline/apt-get.cc:2194
+#: cmdline/apt-get.cc:2195
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "� necessario prendere %sB/%sB di sorgenti.\n"
-#: cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2198
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "� necessario prendere %sB di sorgenti\n"
-#: cmdline/apt-get.cc:2203
+#: cmdline/apt-get.cc:2204
#, c-format
msgid "Fetch source %s\n"
msgstr "Prelievo del sorgente %s\n"
-#: cmdline/apt-get.cc:2234
+#: cmdline/apt-get.cc:2235
msgid "Failed to fetch some archives."
msgstr "Non � stato possibile scaricare alcuni archivi."
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2263
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Si � saltata l'estrazione del sorgente gi� estratto in %s\n"
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2275
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Comando di estrazione '%s' fallito.\n"
-#: cmdline/apt-get.cc:2275
+#: cmdline/apt-get.cc:2276
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Verificare se il pacchetto 'dpkg-dev' � installato.\n"
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2293
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Comando di costruzione '%s' fallito.\n"
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:2312
msgid "Child process failed"
msgstr "Processo figlio fallito"
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2328
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Bisogna specificare almeno un pacchetto di cui controllare la generazione di "
"dipendenze"
-#: cmdline/apt-get.cc:2355
+#: cmdline/apt-get.cc:2356
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Impossibile ottenere informazioni di dipendenza di costruzione per %s"
-#: cmdline/apt-get.cc:2375
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s non ha dipendenze di costruzione.\n"
-#: cmdline/apt-get.cc:2427
+#: cmdline/apt-get.cc:2428
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1227,7 +1227,7 @@ msgstr ""
"%s dipendenze per %s non possono essere soddisfatte perch� non si trova il "
"pacchetto %s"
-#: cmdline/apt-get.cc:2479
+#: cmdline/apt-get.cc:2480
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1236,32 +1236,32 @@ msgstr ""
"%s dipendenze per %s non possono essere soddisfatte perch� nessuna versione "
"del pacchetto %s pu� soddisfare le richieste di versione"
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2515
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"La dipendenza %s per %s non � stata soddisfatta: il pacchetto installato %s "
"� troppo nuovo"
-#: cmdline/apt-get.cc:2539
+#: cmdline/apt-get.cc:2540
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "La dipendenza %s per %s: %s � fallita"
-#: cmdline/apt-get.cc:2553
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Non � stato possibile soddisfare le dipendenze di costruzione per %s."
-#: cmdline/apt-get.cc:2557
+#: cmdline/apt-get.cc:2558
msgid "Failed to process build dependencies"
msgstr "Il calcolo delle dipendenze per la costruzione � fallito"
-#: cmdline/apt-get.cc:2589
+#: cmdline/apt-get.cc:2590
msgid "Supported modules:"
msgstr "Moduli supportati:"
-#: cmdline/apt-get.cc:2630
+#: cmdline/apt-get.cc:2631
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1693,25 +1693,25 @@ msgstr "Errore nel parsing MD5. Offset %lu"
msgid "This is not a valid DEB archive, missing '%s' member"
msgstr "Questo non � un archivio DEB valido, member '%s' mancante"
-#: apt-inst/deb/debfile.cc:48
-#, c-format
-msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
+#: apt-inst/deb/debfile.cc:50
+#, fuzzy, c-format
+msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
msgstr "Questo non � un archivio DEB valido, campi '%s' o '%s' mancanti"
-#: apt-inst/deb/debfile.cc:108
+#: apt-inst/deb/debfile.cc:110
#, c-format
msgid "Couldn't change to %s"
msgstr "Impossibile cambiare su %s"
-#: apt-inst/deb/debfile.cc:134
+#: apt-inst/deb/debfile.cc:140
msgid "Internal error, could not locate member"
msgstr "Errore interno, impossibile localizzare il campo"
-#: apt-inst/deb/debfile.cc:167
+#: apt-inst/deb/debfile.cc:173
msgid "Failed to locate a valid control file"
msgstr "Impossibile localizzare un file control valido"
-#: apt-inst/deb/debfile.cc:252
+#: apt-inst/deb/debfile.cc:258
msgid "Unparsable control file"
msgstr "File control non corretto"
@@ -2080,15 +2080,15 @@ msgstr ""
msgid "Error reading from server"
msgstr "Errore nella lettura dal server"
-#: methods/http.cc:1108
+#: methods/http.cc:1104
msgid "Bad header data"
msgstr "Header dei dati malformato"
-#: methods/http.cc:1125
+#: methods/http.cc:1121 methods/http.cc:1176
msgid "Connection failed"
msgstr "Connessione fallita"
-#: methods/http.cc:1216
+#: methods/http.cc:1228
msgid "Internal error"
msgstr "Errore interno"
@@ -2118,7 +2118,7 @@ msgstr "Apertura del file di configurazione %s in corso"
#: apt-pkg/contrib/configuration.cc:510
#, fuzzy, c-format
-msgid "Line %d too long (max %lu)"
+msgid "Line %d too long (max %u)"
msgstr "Linea %d troppo lunga (max %d)"
#: apt-pkg/contrib/configuration.cc:606
@@ -2376,29 +2376,29 @@ msgstr "opzionale"
msgid "extra"
msgstr "extra"
-#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129
+#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
msgid "Building dependency tree"
msgstr "Generazione dell'albero delle dipendenze in corso"
-#: apt-pkg/depcache.cc:101
+#: apt-pkg/depcache.cc:122
msgid "Candidate versions"
msgstr "Versioni candidate"
-#: apt-pkg/depcache.cc:130
+#: apt-pkg/depcache.cc:151
msgid "Dependency generation"
msgstr "Generazione delle dipendenze"
-#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174
+#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
#, fuzzy
msgid "Reading state information"
msgstr "Aggiornamento delle informazioni disponibili"
-#: apt-pkg/depcache.cc:198
+#: apt-pkg/depcache.cc:219
#, fuzzy, c-format
msgid "Failed to open StateFile %s"
msgstr "Impossibile aprire %s"
-#: apt-pkg/depcache.cc:204
+#: apt-pkg/depcache.cc:225
#, fuzzy, c-format
msgid "Failed to write temporary StateFile %s"
msgstr "Impossibile scrivere il file %s"
@@ -2531,19 +2531,19 @@ msgstr "Non � stato possibile trovare un driver per il metodo %s."
msgid "Method %s did not start correctly"
msgstr "Il metodo %s non � partito correttamente"
-#: apt-pkg/acquire-worker.cc:381
+#: apt-pkg/acquire-worker.cc:396
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
"Per favore inserire il disco chiamato '%s' nel dispositivo '%s' e premere "
"invio."
-#: apt-pkg/init.cc:126
+#: apt-pkg/init.cc:124
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Il sistema di archiviazione (packaging) '%s' non � supportato"
-#: apt-pkg/init.cc:142
+#: apt-pkg/init.cc:140
msgid "Unable to determine a suitable packaging system type"
msgstr "Impossibile determinare un tipo di sistema appropriato di pacchetti"
@@ -2686,17 +2686,21 @@ msgstr "Errore di I/O nel salvataggio del cache sorgente"
msgid "rename failed, %s (%s -> %s)."
msgstr "rename() fallita: %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:401
msgid "MD5Sum mismatch"
msgstr "Somma MD5 non corrispondente"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1405
+#, fuzzy
+msgid "Hash Sum mismatch"
+msgstr "Somma MD5 non corrispondente"
+
+#: apt-pkg/acquire-item.cc:1097
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"Non esiste una chiave pubblica disponibile per i seguenti ID di chiave:\n"
-#: apt-pkg/acquire-item.cc:1219
+#: apt-pkg/acquire-item.cc:1210
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2706,7 +2710,7 @@ msgstr ""
"che bisogna correggere manualmente l'errore. (a causa di un'architettura "
"mancante)"
-#: apt-pkg/acquire-item.cc:1278
+#: apt-pkg/acquire-item.cc:1269
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2715,7 +2719,7 @@ msgstr ""
"Non � stato possibile trovare file per il pacchetto %s. Questo significa che "
"bisogna correggere manualmente l'errore."
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1310
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2723,7 +2727,7 @@ msgstr ""
"I file indice dei pacchetti sono corrotti. Non c'� un campo Filename: per il "
"pacchetto %s."
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1397
msgid "Size mismatch"
msgstr "Le Dimensioni non corrispondono"
@@ -2814,76 +2818,86 @@ msgstr "Le voci lista sorgenti per questo Disco sono:\n"
msgid "Unmounting CD-ROM...\n"
msgstr "Smontaggio CD-ROM in corso..."
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
#, c-format
msgid "Wrote %i records.\n"
msgstr "Scritti %i record.\n"
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Scritti %i record con %i file mancanti.\n"
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Scritti %i record con %i file senza match\n"
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "Scritti %i record con %i file mancanti e %i file senza match\n"
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:522
#, c-format
msgid "Preparing %s"
msgstr "Preparazione di %s in corso"
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:523
#, c-format
msgid "Unpacking %s"
msgstr "Scompattamento di %s in corso"
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:528
#, c-format
msgid "Preparing to configure %s"
msgstr "Preparazione alla configurazione di %s in corso"
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:529
#, c-format
msgid "Configuring %s"
msgstr "Configurazione di %s in corso"
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:530
#, c-format
msgid "Installed %s"
msgstr "%s Installato"
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:535
#, c-format
msgid "Preparing for removal of %s"
msgstr "Preparazione per la rimozione di %s in corso"
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:536
#, c-format
msgid "Removing %s"
msgstr "Rimozione di %s in corso"
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:537
#, c-format
msgid "Removed %s"
msgstr "%s rimosso"
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:542
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Preparazione alla rimozione totale di %s in corso"
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:543
#, c-format
msgid "Completely removed %s"
msgstr "Rimozione totale completata %s"
+#: apt-pkg/deb/dpkgpm.cc:566
+#, fuzzy, c-format
+msgid "Directory '%s' missing"
+msgstr "Manca la directory di liste %spartial."
+
+#: apt-pkg/deb/dpkgpm.cc:709
+#, fuzzy, c-format
+msgid "openpty failed\n"
+msgstr "Select fallito"
+
#: methods/rred.cc:219
msgid "Could not patch file"
msgstr "Impossibile aprire il file %s"
diff --git a/po/ja.po b/po/ja.po
index ab765b3fd..d4a7dda3c 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.6\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-06 06:51+0200\n"
+"POT-Creation-Date: 2007-08-04 09:09+0200\n"
"PO-Revision-Date: 2006-09-08 19:57+0900\n"
"Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
"Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
@@ -159,9 +159,9 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2584 cmdline/apt-sortpkgs.cc:144
-#, c-format
-msgid "%s %s for %s %s compiled on %s %s\n"
+#: cmdline/apt-get.cc:2585 cmdline/apt-sortpkgs.cc:144
+#, fuzzy, c-format
+msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s for %s %s コンパイル日時: %s %s\n"
#: cmdline/apt-cache.cc:1721
@@ -657,7 +657,7 @@ msgstr "%s を %s に名前変更できませんでした"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1673
#, c-format
msgid "Regex compilation error - %s"
msgstr "正規表現の展開エラー - %s"
@@ -820,11 +820,11 @@ msgstr "パッケージを削除しなければなりませんが、削除が無
msgid "Internal error, Ordering didn't finish"
msgstr "内部エラー、調整が終わっていません"
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2011 cmdline/apt-get.cc:2044
msgid "Unable to lock the download directory"
msgstr "ダウンロードディレクトリをロックできません"
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2092 cmdline/apt-get.cc:2333
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr "ソースのリストを読むことができません。"
@@ -854,7 +854,7 @@ msgstr "展開後に追加で %sB のディスク容量が消費されます。\
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "展開後に %sB のディスク容量が解放されます。\n"
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2186
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2187
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "%s の空き領域を測定できません"
@@ -891,7 +891,7 @@ msgstr "中断しました。"
msgid "Do you want to continue [Y/n]? "
msgstr "続行しますか [Y/n]? "
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2229
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2230
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "%s の取得に失敗しました %s\n"
@@ -900,7 +900,7 @@ msgstr "%s の取得に失敗しました %s\n"
msgid "Some files failed to download"
msgstr "いくつかのファイルの取得に失敗しました"
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2238
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2239
msgid "Download complete and in download only mode"
msgstr "ダウンロードオンリーモードでパッケージのダウンロードが完了しました"
@@ -1036,7 +1036,7 @@ msgid ""
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1754
msgid "The following information may help to resolve the situation:"
msgstr "以下の情報がこの問題を解決するために役立つかもしれません:"
@@ -1049,33 +1049,33 @@ msgstr "内部エラー、問題リゾルバが何かを破壊しました"
msgid "Internal error, AllUpgrade broke stuff"
msgstr "内部エラー、AllUpgrade が何かを破壊しました"
-#: cmdline/apt-get.cc:1544
+#: cmdline/apt-get.cc:1545
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "パッケージ %s が見つかりません"
-#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
+#: cmdline/apt-get.cc:1660 cmdline/apt-get.cc:1696
#, c-format
msgid "Couldn't find package %s"
msgstr "パッケージ %s が見つかりません"
-#: cmdline/apt-get.cc:1682
+#: cmdline/apt-get.cc:1683
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "注意: 正規表現 '%2$s' に対して %1$s を選択しました\n"
-#: cmdline/apt-get.cc:1712
+#: cmdline/apt-get.cc:1713
#, fuzzy, c-format
msgid "%s set to manual installed.\n"
msgstr "しかし、%s はインストールされようとしています"
-#: cmdline/apt-get.cc:1725
+#: cmdline/apt-get.cc:1726
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
"以下の問題を解決するために 'apt-get -f install' を実行する必要があるかもしれ"
"ません:"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1729
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1083,7 +1083,7 @@ msgstr ""
"未解決の依存関係です。'apt-get -f install' を実行してみてください (または解法"
"を明示してください)。"
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1741
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1095,7 +1095,7 @@ msgstr ""
"であれば) 必要なパッケージがまだ作成されていなかったり Incoming から移\n"
"動されていないことが考えられます。"
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1749
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1105,118 +1105,118 @@ msgstr ""
"可能性が高いです。そのため、このパッケージへのバグレポートを送ってくだ\n"
"さい。"
-#: cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1757
msgid "Broken packages"
msgstr "壊れたパッケージ"
-#: cmdline/apt-get.cc:1785
+#: cmdline/apt-get.cc:1786
msgid "The following extra packages will be installed:"
msgstr "以下の特別パッケージがインストールされます:"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Suggested packages:"
msgstr "提案パッケージ:"
-#: cmdline/apt-get.cc:1875
+#: cmdline/apt-get.cc:1876
msgid "Recommended packages:"
msgstr "推奨パッケージ:"
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1904
msgid "Calculating upgrade... "
msgstr "アップグレードパッケージを検出しています ... "
-#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1907 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "失敗"
-#: cmdline/apt-get.cc:1911
+#: cmdline/apt-get.cc:1912
msgid "Done"
msgstr "完了"
-#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
+#: cmdline/apt-get.cc:1979 cmdline/apt-get.cc:1987
msgid "Internal error, problem resolver broke stuff"
msgstr "内部エラー、問題リゾルバが何かを破壊しました"
-#: cmdline/apt-get.cc:2086
+#: cmdline/apt-get.cc:2087
msgid "Must specify at least one package to fetch source for"
msgstr ""
"ソースを取得するには少なくともひとつのパッケージ名を指定する必要があります"
-#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2350
+#: cmdline/apt-get.cc:2117 cmdline/apt-get.cc:2351
#, c-format
msgid "Unable to find a source package for %s"
msgstr "%s のソースパッケージが見つかりません"
-#: cmdline/apt-get.cc:2165
+#: cmdline/apt-get.cc:2166
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "すでにダウンロードされたファイル '%s' をスキップします\n"
-#: cmdline/apt-get.cc:2189
+#: cmdline/apt-get.cc:2190
#, c-format
msgid "You don't have enough free space in %s"
msgstr "%s に充分な空きスペースがありません"
-#: cmdline/apt-get.cc:2194
+#: cmdline/apt-get.cc:2195
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "%2$sB 中 %1$sB のソースアーカイブを取得する必要があります。\n"
-#: cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2198
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "%sB のソースアーカイブを取得する必要があります。\n"
-#: cmdline/apt-get.cc:2203
+#: cmdline/apt-get.cc:2204
#, c-format
msgid "Fetch source %s\n"
msgstr "ソース %s を取得\n"
-#: cmdline/apt-get.cc:2234
+#: cmdline/apt-get.cc:2235
msgid "Failed to fetch some archives."
msgstr "いくつかのアーカイブの取得に失敗しました。"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2263
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "すでに %s に展開されたソースがあるため、展開をスキップします\n"
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2275
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "展開コマンド '%s' が失敗しました。\n"
-#: cmdline/apt-get.cc:2275
+#: cmdline/apt-get.cc:2276
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
"'dpkg-dev' パッケージがインストールされていることを確認してください。\n"
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2293
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "ビルドコマンド '%s' が失敗しました。\n"
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:2312
msgid "Child process failed"
msgstr "子プロセスが失敗しました"
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2328
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"ビルド依存関係をチェックするパッケージを少なくとも 1 つ指定する必要があります"
-#: cmdline/apt-get.cc:2355
+#: cmdline/apt-get.cc:2356
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "%s のビルド依存情報を取得できません"
-#: cmdline/apt-get.cc:2375
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s にはビルド依存情報が指定されていません。\n"
-#: cmdline/apt-get.cc:2427
+#: cmdline/apt-get.cc:2428
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1225,7 +1225,7 @@ msgstr ""
"パッケージ %3$s が見つからないため、%2$s に対する %1$s の依存関係を満たすこと"
"ができません"
-#: cmdline/apt-get.cc:2479
+#: cmdline/apt-get.cc:2480
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1234,32 +1234,32 @@ msgstr ""
"入手可能な %3$s はいずれもバージョンについての要求を満たせないため、%2$s に対"
"する %1$s の依存関係を満たすことができません"
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2515
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"%2$s の依存関係 %1$s を満たすことができません: インストールされた %3$s パッ"
"ケージは新しすぎます"
-#: cmdline/apt-get.cc:2539
+#: cmdline/apt-get.cc:2540
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "%2$s の依存関係 %1$s を満たすことができません: %3$s"
-#: cmdline/apt-get.cc:2553
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "%s のビルド依存関係を満たすことができませんでした。"
-#: cmdline/apt-get.cc:2557
+#: cmdline/apt-get.cc:2558
msgid "Failed to process build dependencies"
msgstr "ビルド依存関係の処理に失敗しました"
-#: cmdline/apt-get.cc:2589
+#: cmdline/apt-get.cc:2590
msgid "Supported modules:"
msgstr "サポートされているモジュール:"
-#: cmdline/apt-get.cc:2630
+#: cmdline/apt-get.cc:2631
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1684,27 +1684,27 @@ msgstr "MD5 の解析エラー。オフセット %lu"
msgid "This is not a valid DEB archive, missing '%s' member"
msgstr "'%s' メンバーがないため、正しい DEB アーカイブではありません"
-#: apt-inst/deb/debfile.cc:48
-#, c-format
-msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
+#: apt-inst/deb/debfile.cc:50
+#, fuzzy, c-format
+msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
msgstr ""
"'%s' または '%s' メンバーがないため、これは正しい DEB アーカイブではありませ"
"ん"
-#: apt-inst/deb/debfile.cc:108
+#: apt-inst/deb/debfile.cc:110
#, c-format
msgid "Couldn't change to %s"
msgstr "%s に変更できませんでした"
-#: apt-inst/deb/debfile.cc:134
+#: apt-inst/deb/debfile.cc:140
msgid "Internal error, could not locate member"
msgstr "内部エラー、メンバーを特定できません"
-#: apt-inst/deb/debfile.cc:167
+#: apt-inst/deb/debfile.cc:173
msgid "Failed to locate a valid control file"
msgstr "正しいコントロールファイルを特定できませんでした"
-#: apt-inst/deb/debfile.cc:252
+#: apt-inst/deb/debfile.cc:258
msgid "Unparsable control file"
msgstr "解析できないコントロールファイル"
@@ -2066,15 +2066,15 @@ msgstr "リモート側で接続がクローズされてサーバからの読み
msgid "Error reading from server"
msgstr "サーバからの読み込みに失敗しました"
-#: methods/http.cc:1108
+#: methods/http.cc:1104
msgid "Bad header data"
msgstr "不正なヘッダです"
-#: methods/http.cc:1125
+#: methods/http.cc:1121 methods/http.cc:1176
msgid "Connection failed"
msgstr "接続失敗"
-#: methods/http.cc:1216
+#: methods/http.cc:1228
msgid "Internal error"
msgstr "内部エラー"
@@ -2104,7 +2104,7 @@ msgstr "設定ファイル %s をオープンできませんでした"
#: apt-pkg/contrib/configuration.cc:510
#, fuzzy, c-format
-msgid "Line %d too long (max %lu)"
+msgid "Line %d too long (max %u)"
msgstr "%d 行目が長すぎます (最大 %d)"
#: apt-pkg/contrib/configuration.cc:606
@@ -2357,29 +2357,29 @@ msgstr "任意"
msgid "extra"
msgstr "特別"
-#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129
+#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
msgid "Building dependency tree"
msgstr "依存関係ツリーを作成しています"
-#: apt-pkg/depcache.cc:101
+#: apt-pkg/depcache.cc:122
msgid "Candidate versions"
msgstr "候補バージョン"
-#: apt-pkg/depcache.cc:130
+#: apt-pkg/depcache.cc:151
msgid "Dependency generation"
msgstr "依存関係の生成"
-#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174
+#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
#, fuzzy
msgid "Reading state information"
msgstr "入手可能情報をマージしています"
-#: apt-pkg/depcache.cc:198
+#: apt-pkg/depcache.cc:219
#, fuzzy, c-format
msgid "Failed to open StateFile %s"
msgstr "%s のオープンに失敗しました"
-#: apt-pkg/depcache.cc:204
+#: apt-pkg/depcache.cc:225
#, fuzzy, c-format
msgid "Failed to write temporary StateFile %s"
msgstr "ファイル %s の書き込みに失敗しました"
@@ -2512,19 +2512,19 @@ msgstr "メソッドドライバ %s が見つかりません。"
msgid "Method %s did not start correctly"
msgstr "メソッド %s が正常に開始しませんでした"
-#: apt-pkg/acquire-worker.cc:381
+#: apt-pkg/acquire-worker.cc:396
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
"'%s' とラベルの付いたディスクをドライブ '%s' に入れて enter を押してくださ"
"い。"
-#: apt-pkg/init.cc:126
+#: apt-pkg/init.cc:124
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "パッケージングシステム '%s' はサポートされていません"
-#: apt-pkg/init.cc:142
+#: apt-pkg/init.cc:140
msgid "Unable to determine a suitable packaging system type"
msgstr "適切なパッケージシステムタイプを特定できません"
@@ -2663,16 +2663,20 @@ msgstr "ソースキャッシュの保存中に IO エラーが発生しまし�
msgid "rename failed, %s (%s -> %s)."
msgstr "名前の変更に失敗しました。%s (%s -> %s)"
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:401
msgid "MD5Sum mismatch"
msgstr "MD5Sum が適合しません"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1405
+#, fuzzy
+msgid "Hash Sum mismatch"
+msgstr "MD5Sum が適合しません"
+
+#: apt-pkg/acquire-item.cc:1097
msgid "There is no public key available for the following key IDs:\n"
msgstr "以下の鍵 ID に対して利用可能な公開鍵がありません:\n"
-#: apt-pkg/acquire-item.cc:1219
+#: apt-pkg/acquire-item.cc:1210
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2681,7 +2685,7 @@ msgstr ""
"パッケージ %s のファイルの位置を特定できません。おそらくこのパッケージを手動"
"で修正する必要があります (存在しないアーキテクチャのため)。"
-#: apt-pkg/acquire-item.cc:1278
+#: apt-pkg/acquire-item.cc:1269
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2690,7 +2694,7 @@ msgstr ""
"パッケージ %s のファイルの位置を特定できません。おそらくこのパッケージを手動"
"で修正する必要があります。"
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1310
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2698,7 +2702,7 @@ msgstr ""
"パッケージインデックスファイルが壊れています。パッケージ %s に Filename: "
"フィールドがありません。"
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1397
msgid "Size mismatch"
msgstr "サイズが適合しません"
@@ -2791,78 +2795,88 @@ msgstr "このディスクのソースリストのエントリ:\n"
msgid "Unmounting CD-ROM...\n"
msgstr "CD-ROM をアンマウントしています ..."
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
#, c-format
msgid "Wrote %i records.\n"
msgstr "%i レコードを書き込みました。\n"
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "%i レコードを書き込みました。%i 個のファイルが存在しません。\n"
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "%i レコードを書き込みました。%i 個の適合しないファイルがあります。\n"
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
"%i レコードを書き込みました。%i 個のファイルが見つからず、%i 個の適合しない"
"ファイルがあります。\n"
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:522
#, c-format
msgid "Preparing %s"
msgstr "%s を準備しています"
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:523
#, c-format
msgid "Unpacking %s"
msgstr "%s を展開しています"
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:528
#, c-format
msgid "Preparing to configure %s"
msgstr "%s の設定を準備しています"
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:529
#, c-format
msgid "Configuring %s"
msgstr "%s を設定しています"
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:530
#, c-format
msgid "Installed %s"
msgstr "%s をインストールしました"
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:535
#, c-format
msgid "Preparing for removal of %s"
msgstr "%s の削除を準備しています"
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:536
#, c-format
msgid "Removing %s"
msgstr "%s を削除しています"
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:537
#, c-format
msgid "Removed %s"
msgstr "%s を削除しました"
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:542
#, c-format
msgid "Preparing to completely remove %s"
msgstr "%s を完全に削除する準備をしています"
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:543
#, c-format
msgid "Completely removed %s"
msgstr "%s を完全に削除しました"
+#: apt-pkg/deb/dpkgpm.cc:566
+#, fuzzy, c-format
+msgid "Directory '%s' missing"
+msgstr "リストディレクトリ %spartial が見つかりません。"
+
+#: apt-pkg/deb/dpkgpm.cc:709
+#, fuzzy, c-format
+msgid "openpty failed\n"
+msgstr "select に失敗しました"
+
#: methods/rred.cc:219
msgid "Could not patch file"
msgstr "ファイルにパッチできませんでした"
diff --git a/po/ko.po b/po/ko.po
index 359816af1..50edaa8e8 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-06 06:51+0200\n"
+"POT-Creation-Date: 2007-08-04 09:09+0200\n"
"PO-Revision-Date: 2006-10-12 21:22-0400\n"
"Last-Translator: Sunjae Park <darehanl@gmail.com>\n"
"Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n"
@@ -156,9 +156,9 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2584 cmdline/apt-sortpkgs.cc:144
-#, c-format
-msgid "%s %s for %s %s compiled on %s %s\n"
+#: cmdline/apt-get.cc:2585 cmdline/apt-sortpkgs.cc:144
+#, fuzzy, c-format
+msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s (%s %s), 컴파일 시각 %s %s\n"
#: cmdline/apt-cache.cc:1721
@@ -654,7 +654,7 @@ msgstr "%s 파일의 이름을 %s(으)로 바꾸는 데 실패했습니다"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1673
#, c-format
msgid "Regex compilation error - %s"
msgstr "정규식 컴파일 오류 - %s"
@@ -816,11 +816,11 @@ msgstr "꾸러미를 지워야 하지만 지우기가 금지되어 있습니다.
msgid "Internal error, Ordering didn't finish"
msgstr "내부 오류. 순서변경작업이 끝나지 않았습니다"
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2011 cmdline/apt-get.cc:2044
msgid "Unable to lock the download directory"
msgstr "내려받기 디렉토리를 잠글 수 없습니다"
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2092 cmdline/apt-get.cc:2333
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr "소스 목록을 읽을 수 없습니다."
@@ -851,7 +851,7 @@ msgstr "압축을 풀면 %s바이트의 디스크 공간을 더 사용하게 됩
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "압축을 풀면 %s바이트의 디스크 공간이 비워집니다.\n"
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2186
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2187
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "%s의 여유 공간의 크기를 파악할 수 없습니다"
@@ -891,7 +891,7 @@ msgstr "중단."
msgid "Do you want to continue [Y/n]? "
msgstr "계속 하시겠습니까 [Y/n]? "
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2229
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2230
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "%s 파일을 받는 데 실패했습니다 %s\n"
@@ -900,7 +900,7 @@ msgstr "%s 파일을 받는 데 실패했습니다 %s\n"
msgid "Some files failed to download"
msgstr "일부 파일을 받는 데 실패했습니다"
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2238
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2239
msgid "Download complete and in download only mode"
msgstr "내려받기를 마쳤고 내려받기 전용 모드입니다"
@@ -1035,7 +1035,7 @@ msgid ""
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1754
msgid "The following information may help to resolve the situation:"
msgstr "이 상황을 해결하는 데 다음 정보가 도움이 될 수도 있습니다:"
@@ -1048,32 +1048,32 @@ msgstr "내부 오류, 문제 해결 프로그램이 사고쳤습니다"
msgid "Internal error, AllUpgrade broke stuff"
msgstr "내부 오류, AllUpgrade때문에 망가졌습니다"
-#: cmdline/apt-get.cc:1544
+#: cmdline/apt-get.cc:1545
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "%s 꾸러미를 찾을 수 없습니다"
-#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
+#: cmdline/apt-get.cc:1660 cmdline/apt-get.cc:1696
#, c-format
msgid "Couldn't find package %s"
msgstr "%s 꾸러미를 찾을 수 없습니다"
-#: cmdline/apt-get.cc:1682
+#: cmdline/apt-get.cc:1683
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "주의, 정규식 '%2$s'에 대하여 %1$s을(를) 선택합니다\n"
-#: cmdline/apt-get.cc:1712
+#: cmdline/apt-get.cc:1713
#, fuzzy, c-format
msgid "%s set to manual installed.\n"
msgstr "하지만 %s 꾸러미를 설치할 것입니다"
-#: cmdline/apt-get.cc:1725
+#: cmdline/apt-get.cc:1726
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "다음을 바로잡으려면 `apt-get -f install'을 실행해 보십시오:"
# FIXME: specify a solution? 무슨 솔루션?
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1729
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1081,7 +1081,7 @@ msgstr ""
"의존성이 맞지 않습니다. 꾸러미 없이 'apt-get -f install'을 시도해 보십시오 "
"(아니면 해결 방법을 지정하십시오)."
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1741
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1092,7 +1092,7 @@ msgstr ""
"불안정 배포판을 사용해서 일부 필요한 꾸러미를 아직 만들지 않았거나,\n"
"아직 Incoming에서 나오지 않은 경우일 수도 있습니다."
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1749
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1101,115 +1101,115 @@ msgstr ""
"한 가지 작업만을 요청하셨으므로, 아마도 이 꾸러미를 설치할 수\n"
"없는 경우일 것이고 이 꾸러미에 버그 보고서를 제출해야 합니다."
-#: cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1757
msgid "Broken packages"
msgstr "망가진 꾸러미"
-#: cmdline/apt-get.cc:1785
+#: cmdline/apt-get.cc:1786
msgid "The following extra packages will be installed:"
msgstr "다음 꾸러미를 더 설치할 것입니다:"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Suggested packages:"
msgstr "제안하는 꾸러미:"
-#: cmdline/apt-get.cc:1875
+#: cmdline/apt-get.cc:1876
msgid "Recommended packages:"
msgstr "추천하는 꾸러미:"
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1904
msgid "Calculating upgrade... "
msgstr "업그레이드를 계산하는 중입니다... "
-#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1907 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "실패"
-#: cmdline/apt-get.cc:1911
+#: cmdline/apt-get.cc:1912
msgid "Done"
msgstr "완료"
-#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
+#: cmdline/apt-get.cc:1979 cmdline/apt-get.cc:1987
msgid "Internal error, problem resolver broke stuff"
msgstr "내부 오류, 문제 해결 프로그램이 사고쳤습니다"
-#: cmdline/apt-get.cc:2086
+#: cmdline/apt-get.cc:2087
msgid "Must specify at least one package to fetch source for"
msgstr "해당되는 소스 꾸러미를 가져올 꾸러미를 최소한 하나 지정해야 합니다"
-#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2350
+#: cmdline/apt-get.cc:2117 cmdline/apt-get.cc:2351
#, c-format
msgid "Unable to find a source package for %s"
msgstr "%s의 소스 꾸러미를 찾을 수 없습니다"
-#: cmdline/apt-get.cc:2165
+#: cmdline/apt-get.cc:2166
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "이미 다운로드 받은 파일 '%s'은(는) 다시 받지 않고 건너 뜁니다.\n"
-#: cmdline/apt-get.cc:2189
+#: cmdline/apt-get.cc:2190
#, c-format
msgid "You don't have enough free space in %s"
msgstr "%s에 충분한 공간이 없습니다"
-#: cmdline/apt-get.cc:2194
+#: cmdline/apt-get.cc:2195
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "소스 아카이브를 %s바이트/%s바이트 받아야 합니다.\n"
-#: cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2198
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "소스 아카이브를 %s바이트 받아야 합니다.\n"
-#: cmdline/apt-get.cc:2203
+#: cmdline/apt-get.cc:2204
#, c-format
msgid "Fetch source %s\n"
msgstr "%s 소스를 가져옵니다\n"
-#: cmdline/apt-get.cc:2234
+#: cmdline/apt-get.cc:2235
msgid "Failed to fetch some archives."
msgstr "일부 아카이브를 가져오는 데 실패했습니다."
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2263
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "%s에 이미 풀려 있는 소스의 압축을 풀지 않고 건너 뜁니다.\n"
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2275
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "압축 풀기 명령 '%s' 실패.\n"
-#: cmdline/apt-get.cc:2275
+#: cmdline/apt-get.cc:2276
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "'dpkg-dev' 꾸러미가 설치되었는지를 확인해주십시오.\n"
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2293
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "빌드 명령 '%s' 실패.\n"
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:2312
msgid "Child process failed"
msgstr "하위 프로세스가 실패했습니다"
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2328
msgid "Must specify at least one package to check builddeps for"
msgstr "해당되는 빌드 의존성을 검사할 꾸러미를 최소한 하나 지정해야 합니다"
-#: cmdline/apt-get.cc:2355
+#: cmdline/apt-get.cc:2356
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "%s의 빌드 의존성 정보를 가져올 수 없습니다"
-#: cmdline/apt-get.cc:2375
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s 꾸러미에 빌드 의존성이 없습니다.\n"
-#: cmdline/apt-get.cc:2427
+#: cmdline/apt-get.cc:2428
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1218,7 +1218,7 @@ msgstr ""
"%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 꾸러미를 찾을 수 없습니"
"다"
-#: cmdline/apt-get.cc:2479
+#: cmdline/apt-get.cc:2480
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1227,32 +1227,32 @@ msgstr ""
"%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 꾸러미의 사용 가능한 버"
"전 중에서는 이 버전 요구사항을 만족시킬 수 없습니다"
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2515
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"%2$s에 대한 %1$s 의존성을 만족시키는 데 실패했습니다: 설치한 %3$s 꾸러미가 너"
"무 최근 버전입니다"
-#: cmdline/apt-get.cc:2539
+#: cmdline/apt-get.cc:2540
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "%2$s에 대한 %1$s 의존성을 만족시키는 데 실패했습니다: %3$s"
-#: cmdline/apt-get.cc:2553
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "%s의 빌드 의존성을 만족시키지 못했습니다."
-#: cmdline/apt-get.cc:2557
+#: cmdline/apt-get.cc:2558
msgid "Failed to process build dependencies"
msgstr "빌드 의존성을 처리하는 데 실패했습니다"
-#: cmdline/apt-get.cc:2589
+#: cmdline/apt-get.cc:2590
msgid "Supported modules:"
msgstr "지원하는 모듈:"
-#: cmdline/apt-get.cc:2630
+#: cmdline/apt-get.cc:2631
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1673,25 +1673,25 @@ msgstr "MD5 분석에 오류가 있습니다. 오프셋 %lu"
msgid "This is not a valid DEB archive, missing '%s' member"
msgstr "올바른 DEB 아카이브가 아닙니다. '%s' 멤버가 없습니다"
-#: apt-inst/deb/debfile.cc:48
-#, c-format
-msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
+#: apt-inst/deb/debfile.cc:50
+#, fuzzy, c-format
+msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
msgstr "올바른 DEB 아카이브가 아닙니다. '%s' 혹은 '%s' 멤버가 없습니다"
-#: apt-inst/deb/debfile.cc:108
+#: apt-inst/deb/debfile.cc:110
#, c-format
msgid "Couldn't change to %s"
msgstr "%s 디렉토리로 이동할 수 없습니다"
-#: apt-inst/deb/debfile.cc:134
+#: apt-inst/deb/debfile.cc:140
msgid "Internal error, could not locate member"
msgstr "내부 오류, 멤버를 찾을 수 없습니다"
-#: apt-inst/deb/debfile.cc:167
+#: apt-inst/deb/debfile.cc:173
msgid "Failed to locate a valid control file"
msgstr "올바른 control 파일을 찾는 데 실패했습니다"
-#: apt-inst/deb/debfile.cc:252
+#: apt-inst/deb/debfile.cc:258
msgid "Unparsable control file"
msgstr "control 파일을 파싱할 수 없습니다"
@@ -2051,15 +2051,15 @@ msgstr "서버에서 읽고 연결을 닫는 데 오류가 발생했습니다"
msgid "Error reading from server"
msgstr "서버에서 읽는 데 오류가 발생했습니다"
-#: methods/http.cc:1108
+#: methods/http.cc:1104
msgid "Bad header data"
msgstr "헤더 데이터가 잘못되었습니다"
-#: methods/http.cc:1125
+#: methods/http.cc:1121 methods/http.cc:1176
msgid "Connection failed"
msgstr "연결이 실패했습니다"
-#: methods/http.cc:1216
+#: methods/http.cc:1228
msgid "Internal error"
msgstr "내부 오류"
@@ -2089,7 +2089,7 @@ msgstr "설정 파일 %s 파일을 여는 중입니다"
#: apt-pkg/contrib/configuration.cc:510
#, fuzzy, c-format
-msgid "Line %d too long (max %lu)"
+msgid "Line %d too long (max %u)"
msgstr "%d번 줄이 너무 깁니다 (최대 %d)"
#: apt-pkg/contrib/configuration.cc:606
@@ -2342,29 +2342,29 @@ msgstr "옵션"
msgid "extra"
msgstr "별도"
-#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129
+#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
msgid "Building dependency tree"
msgstr "의존성 트리를 만드는 중입니다"
-#: apt-pkg/depcache.cc:101
+#: apt-pkg/depcache.cc:122
msgid "Candidate versions"
msgstr "후보 버전"
-#: apt-pkg/depcache.cc:130
+#: apt-pkg/depcache.cc:151
msgid "Dependency generation"
msgstr "의존성 만들기"
-#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174
+#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
#, fuzzy
msgid "Reading state information"
msgstr "이용 가능 꾸러미 정보를 합칩니다"
-#: apt-pkg/depcache.cc:198
+#: apt-pkg/depcache.cc:219
#, fuzzy, c-format
msgid "Failed to open StateFile %s"
msgstr "%s 파일을 여는 데 실패했습니다"
-#: apt-pkg/depcache.cc:204
+#: apt-pkg/depcache.cc:225
#, fuzzy, c-format
msgid "Failed to write temporary StateFile %s"
msgstr "%s 파일을 쓰는 데 실패했습니다"
@@ -2496,18 +2496,18 @@ msgstr "설치 방법 드라이버 %s을(를) 찾을 수 없습니다."
msgid "Method %s did not start correctly"
msgstr "설치 방법 %s이(가) 올바르게 시작하지 않았습니다"
-#: apt-pkg/acquire-worker.cc:381
+#: apt-pkg/acquire-worker.cc:396
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
"'%2$s' 드라이브에 '%1$s'(으)로 표기된 디스크를 삽입하고 엔터를 눌러주십시오."
-#: apt-pkg/init.cc:126
+#: apt-pkg/init.cc:124
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "꾸러미 시스템 '%s'을(를) 지원하지 않습니다"
-#: apt-pkg/init.cc:142
+#: apt-pkg/init.cc:140
msgid "Unable to determine a suitable packaging system type"
msgstr "올바른 꾸러미 시스템 타입을 알아낼 수 없습니다"
@@ -2640,16 +2640,20 @@ msgstr "소스 캐시를 저장하는 데 입출력 오류가 발생했습니다
msgid "rename failed, %s (%s -> %s)."
msgstr "이름 바꾸기가 실패했습니다. %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:401
msgid "MD5Sum mismatch"
msgstr "MD5Sum이 맞지 않습니다"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1405
+#, fuzzy
+msgid "Hash Sum mismatch"
+msgstr "MD5Sum이 맞지 않습니다"
+
+#: apt-pkg/acquire-item.cc:1097
msgid "There is no public key available for the following key IDs:\n"
msgstr "다음 키 ID의 공개키가 없습니다:\n"
-#: apt-pkg/acquire-item.cc:1219
+#: apt-pkg/acquire-item.cc:1210
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2658,7 +2662,7 @@ msgstr ""
"%s 꾸러미의 파일을 찾을 수 없습니다. 수동으로 이 꾸러미를 고쳐야 할 수도 있습"
"니다. (아키텍쳐가 빠졌기 때문입니다)"
-#: apt-pkg/acquire-item.cc:1278
+#: apt-pkg/acquire-item.cc:1269
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2667,14 +2671,14 @@ msgstr ""
"%s 꾸러미의 파일을 찾을 수 없습니다. 수동으로 이 꾸러미를 고쳐야 할 수도 있습"
"니다."
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1310
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"꾸러미 인덱스 파일이 손상되었습니다. %s 꾸러미에 Filename: 필드가 없습니다."
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1397
msgid "Size mismatch"
msgstr "크기가 맞지 않습니다"
@@ -2765,76 +2769,86 @@ msgstr "이 디스크의 소스 리스트 항목은 다음과 같습니다:\n"
msgid "Unmounting CD-ROM...\n"
msgstr "CD-ROM을 마운트 해제하는 중입니다..."
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
#, c-format
msgid "Wrote %i records.\n"
msgstr "레코드 %i개를 썼습니다.\n"
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "레코드 %i개를 파일 %i개가 빠진 상태로 썼습니다.\n"
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "레코드 %i개를 파일 %i개가 맞지 않은 상태로 썼습니다\n"
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "레코드 %i개를 파일 %i개가 빠지고 %i개가 맞지 않은 상태로 썼습니다\n"
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:522
#, c-format
msgid "Preparing %s"
msgstr "%s 준비 중"
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:523
#, c-format
msgid "Unpacking %s"
msgstr "%s을(를) 푸는 중입니다"
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:528
#, c-format
msgid "Preparing to configure %s"
msgstr "%s을(를) 설정할 준비를 하는 중입니다"
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:529
#, c-format
msgid "Configuring %s"
msgstr "%s 설정 중"
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:530
#, c-format
msgid "Installed %s"
msgstr "%s 설치했음"
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:535
#, c-format
msgid "Preparing for removal of %s"
msgstr "%s을(를) 삭제할 준비 중"
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:536
#, c-format
msgid "Removing %s"
msgstr "%s 지우는 중"
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:537
#, c-format
msgid "Removed %s"
msgstr "%s 지움"
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:542
#, c-format
msgid "Preparing to completely remove %s"
msgstr "%s을(를) 완전히 지울 준비를 하는 중입니다"
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:543
#, c-format
msgid "Completely removed %s"
msgstr "%s을(를) 완전히 지웠습니다"
+#: apt-pkg/deb/dpkgpm.cc:566
+#, fuzzy, c-format
+msgid "Directory '%s' missing"
+msgstr "목록 디렉토리 %spartial이 빠졌습니다."
+
+#: apt-pkg/deb/dpkgpm.cc:709
+#, fuzzy, c-format
+msgid "openpty failed\n"
+msgstr "select가 실패했습니다"
+
#: methods/rred.cc:219
msgid "Could not patch file"
msgstr "%s 파일을 열 수 없습니다"
diff --git a/po/ku.po b/po/ku.po
index b6b13c8b1..97195d2a3 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-06 06:51+0200\n"
+"POT-Creation-Date: 2007-08-04 09:09+0200\n"
"PO-Revision-Date: 2006-09-16 17:51+0100\n"
"Last-Translator: Erdal Ronahi <erdal.ronahi@gmail.com>\n"
"Language-Team: Kurdish <ku@li.org>\n"
@@ -158,9 +158,9 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2584 cmdline/apt-sortpkgs.cc:144
-#, c-format
-msgid "%s %s for %s %s compiled on %s %s\n"
+#: cmdline/apt-get.cc:2585 cmdline/apt-sortpkgs.cc:144
+#, fuzzy, c-format
+msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s ji bo %s %s komkirî di %s %s de\n"
#: cmdline/apt-cache.cc:1721
@@ -568,7 +568,7 @@ msgstr ""
msgid "Y"
msgstr "E"
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1673
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
@@ -727,11 +727,11 @@ msgstr ""
msgid "Internal error, Ordering didn't finish"
msgstr ""
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2011 cmdline/apt-get.cc:2044
msgid "Unable to lock the download directory"
msgstr "Pelrêça daxistinê nayê quflekirin"
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2092 cmdline/apt-get.cc:2333
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr ""
@@ -760,7 +760,7 @@ msgstr ""
msgid "After unpacking %sB disk space will be freed.\n"
msgstr ""
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2186
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2187
#, c-format
msgid "Couldn't determine free space in %s"
msgstr ""
@@ -794,7 +794,7 @@ msgstr ""
msgid "Do you want to continue [Y/n]? "
msgstr ""
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2229
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2230
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr ""
@@ -803,7 +803,7 @@ msgstr ""
msgid "Some files failed to download"
msgstr ""
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2238
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2239
msgid "Download complete and in download only mode"
msgstr ""
@@ -930,7 +930,7 @@ msgid ""
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1754
msgid "The following information may help to resolve the situation:"
msgstr ""
@@ -942,37 +942,37 @@ msgstr ""
msgid "Internal error, AllUpgrade broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1544
+#: cmdline/apt-get.cc:1545
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "Danegira %s nehate vekirin: %s"
-#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
+#: cmdline/apt-get.cc:1660 cmdline/apt-get.cc:1696
#, c-format
msgid "Couldn't find package %s"
msgstr ""
-#: cmdline/apt-get.cc:1682
+#: cmdline/apt-get.cc:1683
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:1712
+#: cmdline/apt-get.cc:1713
#, fuzzy, c-format
msgid "%s set to manual installed.\n"
msgstr "lê %s dê were sazkirin"
-#: cmdline/apt-get.cc:1725
+#: cmdline/apt-get.cc:1726
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1729
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
msgstr ""
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1741
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -980,159 +980,159 @@ msgid ""
"or been moved out of Incoming."
msgstr ""
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1749
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
"that package should be filed."
msgstr ""
-#: cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1757
msgid "Broken packages"
msgstr "Paketên şikestî"
-#: cmdline/apt-get.cc:1785
+#: cmdline/apt-get.cc:1786
msgid "The following extra packages will be installed:"
msgstr ""
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Suggested packages:"
msgstr "Paketên tên pêşniyaz kirin:"
-#: cmdline/apt-get.cc:1875
+#: cmdline/apt-get.cc:1876
msgid "Recommended packages:"
msgstr "Paketên tên tawsiyê kirin:"
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1904
msgid "Calculating upgrade... "
msgstr ""
-#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1907 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Serneket"
-#: cmdline/apt-get.cc:1911
+#: cmdline/apt-get.cc:1912
msgid "Done"
msgstr "Temam"
-#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
+#: cmdline/apt-get.cc:1979 cmdline/apt-get.cc:1987
msgid "Internal error, problem resolver broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:2086
+#: cmdline/apt-get.cc:2087
msgid "Must specify at least one package to fetch source for"
msgstr ""
-#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2350
+#: cmdline/apt-get.cc:2117 cmdline/apt-get.cc:2351
#, c-format
msgid "Unable to find a source package for %s"
msgstr ""
-#: cmdline/apt-get.cc:2165
+#: cmdline/apt-get.cc:2166
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:2189
+#: cmdline/apt-get.cc:2190
#, c-format
msgid "You don't have enough free space in %s"
msgstr ""
-#: cmdline/apt-get.cc:2194
+#: cmdline/apt-get.cc:2195
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2198
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:2203
+#: cmdline/apt-get.cc:2204
#, c-format
msgid "Fetch source %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2234
+#: cmdline/apt-get.cc:2235
msgid "Failed to fetch some archives."
msgstr ""
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2263
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2275
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2275
+#: cmdline/apt-get.cc:2276
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2293
#, c-format
msgid "Build command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:2312
msgid "Child process failed"
msgstr ""
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2328
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-#: cmdline/apt-get.cc:2355
+#: cmdline/apt-get.cc:2356
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
-#: cmdline/apt-get.cc:2375
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:2427
+#: cmdline/apt-get.cc:2428
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-#: cmdline/apt-get.cc:2479
+#: cmdline/apt-get.cc:2480
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
"package %s can satisfy version requirements"
msgstr ""
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2515
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-#: cmdline/apt-get.cc:2539
+#: cmdline/apt-get.cc:2540
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr ""
-#: cmdline/apt-get.cc:2553
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
-#: cmdline/apt-get.cc:2557
+#: cmdline/apt-get.cc:2558
msgid "Failed to process build dependencies"
msgstr ""
-#: cmdline/apt-get.cc:2589
+#: cmdline/apt-get.cc:2590
msgid "Supported modules:"
msgstr ""
-#: cmdline/apt-get.cc:2630
+#: cmdline/apt-get.cc:2631
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1504,25 +1504,25 @@ msgstr ""
msgid "This is not a valid DEB archive, missing '%s' member"
msgstr ""
-#: apt-inst/deb/debfile.cc:48
+#: apt-inst/deb/debfile.cc:50
#, c-format
-msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
+msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
msgstr ""
-#: apt-inst/deb/debfile.cc:108
+#: apt-inst/deb/debfile.cc:110
#, c-format
msgid "Couldn't change to %s"
msgstr ""
-#: apt-inst/deb/debfile.cc:134
+#: apt-inst/deb/debfile.cc:140
msgid "Internal error, could not locate member"
msgstr ""
-#: apt-inst/deb/debfile.cc:167
+#: apt-inst/deb/debfile.cc:173
msgid "Failed to locate a valid control file"
msgstr ""
-#: apt-inst/deb/debfile.cc:252
+#: apt-inst/deb/debfile.cc:258
msgid "Unparsable control file"
msgstr ""
@@ -1888,15 +1888,15 @@ msgstr ""
msgid "Error reading from server"
msgstr ""
-#: methods/http.cc:1108
+#: methods/http.cc:1104
msgid "Bad header data"
msgstr ""
-#: methods/http.cc:1125
+#: methods/http.cc:1121 methods/http.cc:1176
msgid "Connection failed"
msgstr ""
-#: methods/http.cc:1216
+#: methods/http.cc:1228
msgid "Internal error"
msgstr ""
@@ -1926,7 +1926,7 @@ msgstr ""
#: apt-pkg/contrib/configuration.cc:510
#, c-format
-msgid "Line %d too long (max %lu)"
+msgid "Line %d too long (max %u)"
msgstr ""
#: apt-pkg/contrib/configuration.cc:606
@@ -2180,29 +2180,29 @@ msgstr ""
msgid "extra"
msgstr ""
-#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129
+#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
msgid "Building dependency tree"
msgstr ""
-#: apt-pkg/depcache.cc:101
+#: apt-pkg/depcache.cc:122
#, fuzzy
msgid "Candidate versions"
msgstr " Berendam: "
-#: apt-pkg/depcache.cc:130
+#: apt-pkg/depcache.cc:151
msgid "Dependency generation"
msgstr ""
-#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174
+#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
msgid "Reading state information"
msgstr ""
-#: apt-pkg/depcache.cc:198
+#: apt-pkg/depcache.cc:219
#, fuzzy, c-format
msgid "Failed to open StateFile %s"
msgstr "%s venebû"
-#: apt-pkg/depcache.cc:204
+#: apt-pkg/depcache.cc:225
#, fuzzy, c-format
msgid "Failed to write temporary StateFile %s"
msgstr "%s ji hev nehate veçirandin"
@@ -2328,17 +2328,17 @@ msgstr ""
msgid "Method %s did not start correctly"
msgstr ""
-#: apt-pkg/acquire-worker.cc:381
+#: apt-pkg/acquire-worker.cc:396
#, fuzzy, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Dîsketê siwar bike û piştre bişkoja derbaskirinê bitikîne"
-#: apt-pkg/init.cc:126
+#: apt-pkg/init.cc:124
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr ""
-#: apt-pkg/init.cc:142
+#: apt-pkg/init.cc:140
msgid "Unable to determine a suitable packaging system type"
msgstr ""
@@ -2470,36 +2470,39 @@ msgstr ""
msgid "rename failed, %s (%s -> %s)."
msgstr ""
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:401
msgid "MD5Sum mismatch"
msgstr ""
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1405
+msgid "Hash Sum mismatch"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1097
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:1219
+#: apt-pkg/acquire-item.cc:1210
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package. (due to missing arch)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1278
+#: apt-pkg/acquire-item.cc:1269
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"manually fix this package."
msgstr ""
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1310
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1397
msgid "Size mismatch"
msgstr ""
@@ -2585,76 +2588,86 @@ msgstr ""
msgid "Unmounting CD-ROM...\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
#, c-format
msgid "Wrote %i records.\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:522
#, c-format
msgid "Preparing %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:523
#, c-format
msgid "Unpacking %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:528
#, c-format
msgid "Preparing to configure %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:529
#, c-format
msgid "Configuring %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:530
#, fuzzy, c-format
msgid "Installed %s"
msgstr " Sazkirî: "
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:535
#, c-format
msgid "Preparing for removal of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:536
#, c-format
msgid "Removing %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:537
#, c-format
msgid "Removed %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:542
#, c-format
msgid "Preparing to completely remove %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:543
#, c-format
msgid "Completely removed %s"
msgstr ""
+#: apt-pkg/deb/dpkgpm.cc:566
+#, c-format
+msgid "Directory '%s' missing"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:709
+#, fuzzy, c-format
+msgid "openpty failed\n"
+msgstr " neserketî."
+
#: methods/rred.cc:219
#, fuzzy
msgid "Could not patch file"
diff --git a/po/nb.po b/po/nb.po
index 1c29c8634..24f006c86 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-06 06:51+0200\n"
+"POT-Creation-Date: 2007-08-04 09:09+0200\n"
"PO-Revision-Date: 2006-10-16 00:35+0100\n"
"Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
"Language-Team: Norwegian Bokmal <i18n-nb@lister.ping.ui.no>\n"
@@ -168,9 +168,9 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2584 cmdline/apt-sortpkgs.cc:144
-#, c-format
-msgid "%s %s for %s %s compiled on %s %s\n"
+#: cmdline/apt-get.cc:2585 cmdline/apt-sortpkgs.cc:144
+#, fuzzy, c-format
+msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s for %s %s kompilert p� %s %s\n"
#: cmdline/apt-cache.cc:1721
@@ -667,7 +667,7 @@ msgstr "Klarte ikke � endre navnet p� %s til %s"
msgid "Y"
msgstr "J"
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1673
#, c-format
msgid "Regex compilation error - %s"
msgstr "Kompileringsfeil i regul�rt uttrykk - %s"
@@ -828,11 +828,11 @@ msgstr "Pakker trenges � fjernes, men funksjonen er sl�tt av."
msgid "Internal error, Ordering didn't finish"
msgstr "Intern feil, sortering fullf�rte ikke"
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2011 cmdline/apt-get.cc:2044
msgid "Unable to lock the download directory"
msgstr "Klarer ikke � l�se nedlastingsmappa"
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2092 cmdline/apt-get.cc:2333
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr "Kan ikke lese kildlista."
@@ -863,7 +863,7 @@ msgstr "Etter utpakking vil %sB ekstra diskplass bli brukt.\n"
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Etter utpakking vil %sB diskplass bli ledig.\n"
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2186
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2187
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Klarte ikke bestemme ledig plass i %s"
@@ -901,7 +901,7 @@ msgstr "Avbryter."
msgid "Do you want to continue [Y/n]? "
msgstr "Vil du fortsette [Y/n]? "
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2229
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2230
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Klarte ikke � skaffe %s %s\n"
@@ -910,7 +910,7 @@ msgstr "Klarte ikke � skaffe %s %s\n"
msgid "Some files failed to download"
msgstr "Noen av filene kunne ikke lastes ned"
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2238
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2239
msgid "Download complete and in download only mode"
msgstr "Nedlasting fullf�rt med innstillinga �bare nedlasting�"
@@ -1045,7 +1045,7 @@ msgid ""
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1754
msgid "The following information may help to resolve the situation:"
msgstr "F�lgende informasjon kan v�re til hjelp med � l�se problemet:"
@@ -1058,31 +1058,31 @@ msgstr "Intern feil, probleml�ser �dela noe"
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Intern feil - �AllUpgrade� �dela noe"
-#: cmdline/apt-get.cc:1544
+#: cmdline/apt-get.cc:1545
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "Klarte ikke � finne pakken %s"
-#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
+#: cmdline/apt-get.cc:1660 cmdline/apt-get.cc:1696
#, c-format
msgid "Couldn't find package %s"
msgstr "Klarte ikke � finne pakken %s"
-#: cmdline/apt-get.cc:1682
+#: cmdline/apt-get.cc:1683
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Merk, velger %s istedenfor det regul�re uttrykket �%s�\n"
-#: cmdline/apt-get.cc:1712
+#: cmdline/apt-get.cc:1713
#, fuzzy, c-format
msgid "%s set to manual installed.\n"
msgstr "men %s skal installeres"
-#: cmdline/apt-get.cc:1725
+#: cmdline/apt-get.cc:1726
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Du vil kanskje utf�re �apt-get -f install� for � rette p� disse:"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1729
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1090,7 +1090,7 @@ msgstr ""
"Uinnfridde avhengighetsforhold. Pr�v �apt-get -f install� uten pakker (eller "
"angi en l�sning)."
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1741
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1102,7 +1102,7 @@ msgstr ""
"at visse kjernepakker enn� ikke er laget eller flyttet ut av �Incoming� for\n"
"distribusjonen."
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1749
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1112,122 +1112,122 @@ msgstr ""
"at pakken helt enkelt ikke kan installeres, og du b�r fylle ut en "
"feilmelding."
-#: cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1757
msgid "Broken packages"
msgstr "�delagte pakker"
-#: cmdline/apt-get.cc:1785
+#: cmdline/apt-get.cc:1786
msgid "The following extra packages will be installed:"
msgstr "F�lgende ekstra pakker vil bli installert."
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Suggested packages:"
msgstr "Foresl�tte pakker:"
-#: cmdline/apt-get.cc:1875
+#: cmdline/apt-get.cc:1876
msgid "Recommended packages:"
msgstr "Anbefalte pakker"
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1904
msgid "Calculating upgrade... "
msgstr "Beregner oppgradering... "
-#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1907 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Mislyktes"
-#: cmdline/apt-get.cc:1911
+#: cmdline/apt-get.cc:1912
msgid "Done"
msgstr "Utf�rt"
-#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
+#: cmdline/apt-get.cc:1979 cmdline/apt-get.cc:1987
msgid "Internal error, problem resolver broke stuff"
msgstr "Intern feil, probleml�ser �dela noe"
-#: cmdline/apt-get.cc:2086
+#: cmdline/apt-get.cc:2087
msgid "Must specify at least one package to fetch source for"
msgstr "Du m� angi minst en pakke du vil ha kildekoden til"
-#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2350
+#: cmdline/apt-get.cc:2117 cmdline/apt-get.cc:2351
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Klarer ikke � finne en kildekodepakke for %s"
-#: cmdline/apt-get.cc:2165
+#: cmdline/apt-get.cc:2166
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Hopper over allerede nedlastet fil �%s�\n"
-#: cmdline/apt-get.cc:2189
+#: cmdline/apt-get.cc:2190
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Du har ikke nok ledig plass i %s"
-#: cmdline/apt-get.cc:2194
+#: cmdline/apt-get.cc:2195
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Trenger � skaffe %sB av %sB fra kildekodearkivet.\n"
-#: cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2198
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Trenger � skaffe %sB fra kildekodearkivet.\n"
-#: cmdline/apt-get.cc:2203
+#: cmdline/apt-get.cc:2204
#, c-format
msgid "Fetch source %s\n"
msgstr "Skaffer kildekode %s\n"
-#: cmdline/apt-get.cc:2234
+#: cmdline/apt-get.cc:2235
msgid "Failed to fetch some archives."
msgstr "Klarte ikke � skaffe alle arkivene."
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2263
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Omg�r utpakking av allerede utpakket kilde i %s\n"
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2275
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Utpakkingskommandoen �%s� mislyktes.\n"
-#: cmdline/apt-get.cc:2275
+#: cmdline/apt-get.cc:2276
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Sjekk om pakken �dpkg-dev� er installert.\n"
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2293
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Byggekommandoen �%s� mislyktes.\n"
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:2312
msgid "Child process failed"
msgstr "Barneprosessen mislyktes"
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2328
msgid "Must specify at least one package to check builddeps for"
msgstr "Du m� angi minst en pakke du vil sjekke �builddeps� for"
-#: cmdline/apt-get.cc:2355
+#: cmdline/apt-get.cc:2356
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Klarer ikke � skaffe informasjon om bygge-avhengighetene for %s"
-#: cmdline/apt-get.cc:2375
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s har ingen avhengigheter.\n"
-#: cmdline/apt-get.cc:2427
+#: cmdline/apt-get.cc:2428
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "Kravet %s for %s kan ikke oppfylles fordi pakken %s ikke finnes"
-#: cmdline/apt-get.cc:2479
+#: cmdline/apt-get.cc:2480
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1236,32 +1236,32 @@ msgstr ""
"Kravet %s for %s kan ikke oppfylles fordi det ikke finnes noen tilgjengelige "
"versjoner av pakken %s som oppfyller versjonskravene"
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2515
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Klarte ikke � tilfredsstille %s avhengighet for %s: den installerte pakken %"
"s er for ny"
-#: cmdline/apt-get.cc:2539
+#: cmdline/apt-get.cc:2540
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Klarte ikke � tilfredsstille %s avhengighet for %s: %s"
-#: cmdline/apt-get.cc:2553
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Klarte ikke � tilfredstille bygg-avhengighetene for %s."
-#: cmdline/apt-get.cc:2557
+#: cmdline/apt-get.cc:2558
msgid "Failed to process build dependencies"
msgstr "Klarte ikke � behandle forutsetningene for bygging"
-#: cmdline/apt-get.cc:2589
+#: cmdline/apt-get.cc:2590
msgid "Supported modules:"
msgstr "St�ttede moduler:"
-#: cmdline/apt-get.cc:2630
+#: cmdline/apt-get.cc:2631
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1686,26 +1686,26 @@ msgstr "Feil ved tolking av MD5. Offset %lu"
msgid "This is not a valid DEB archive, missing '%s' member"
msgstr "Dette er ikke et gyldig DEB-arkiv, mangler �%s�-medlemmet"
-#: apt-inst/deb/debfile.cc:48
-#, c-format
-msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
+#: apt-inst/deb/debfile.cc:50
+#, fuzzy, c-format
+msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
msgstr ""
"Dette er ikke et gyldig DEB-arkiv, det har ikke noe �%s�- eller �%s�-medlem"
-#: apt-inst/deb/debfile.cc:108
+#: apt-inst/deb/debfile.cc:110
#, c-format
msgid "Couldn't change to %s"
msgstr "Klarte ikke � bytte til %s"
-#: apt-inst/deb/debfile.cc:134
+#: apt-inst/deb/debfile.cc:140
msgid "Internal error, could not locate member"
msgstr "Intern feil, fant ikke medlem"
-#: apt-inst/deb/debfile.cc:167
+#: apt-inst/deb/debfile.cc:173
msgid "Failed to locate a valid control file"
msgstr "Fant ingen gyldig kontrollfil"
-#: apt-inst/deb/debfile.cc:252
+#: apt-inst/deb/debfile.cc:258
msgid "Unparsable control file"
msgstr "Kontrollfila kan ikke tolkes"
@@ -2070,15 +2070,15 @@ msgstr "Feil ved lesing fra tjeneren. Forbindelsen ble lukket i andre enden"
msgid "Error reading from server"
msgstr "Feil ved lesing fra tjeneren"
-#: methods/http.cc:1108
+#: methods/http.cc:1104
msgid "Bad header data"
msgstr "�delagte hodedata"
-#: methods/http.cc:1125
+#: methods/http.cc:1121 methods/http.cc:1176
msgid "Connection failed"
msgstr "Forbindelsen mislykkes"
-#: methods/http.cc:1216
+#: methods/http.cc:1228
msgid "Internal error"
msgstr "Intern feil"
@@ -2108,7 +2108,7 @@ msgstr "�pner oppsettsfila %s"
#: apt-pkg/contrib/configuration.cc:510
#, fuzzy, c-format
-msgid "Line %d too long (max %lu)"
+msgid "Line %d too long (max %u)"
msgstr "Linje %d er for lang (maks %d)"
#: apt-pkg/contrib/configuration.cc:606
@@ -2361,29 +2361,29 @@ msgstr "valgfri"
msgid "extra"
msgstr "tillegg"
-#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129
+#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
msgid "Building dependency tree"
msgstr "Skaper oversikt over avhengighetsforhold"
-#: apt-pkg/depcache.cc:101
+#: apt-pkg/depcache.cc:122
msgid "Candidate versions"
msgstr "Versjons-kandidater"
-#: apt-pkg/depcache.cc:130
+#: apt-pkg/depcache.cc:151
msgid "Dependency generation"
msgstr "Oppretter avhengighetsforhold"
-#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174
+#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
#, fuzzy
msgid "Reading state information"
msgstr "Fletter tilgjengelig informasjon"
-#: apt-pkg/depcache.cc:198
+#: apt-pkg/depcache.cc:219
#, fuzzy, c-format
msgid "Failed to open StateFile %s"
msgstr "Klarte ikke � �pne %s"
-#: apt-pkg/depcache.cc:204
+#: apt-pkg/depcache.cc:225
#, fuzzy, c-format
msgid "Failed to write temporary StateFile %s"
msgstr "Klarte ikke � skrive fila %s"
@@ -2515,17 +2515,17 @@ msgstr "Finner ikke metode-driveren %s."
msgid "Method %s did not start correctly"
msgstr "Metoden %s startet ikke korrekt"
-#: apt-pkg/acquire-worker.cc:381
+#: apt-pkg/acquire-worker.cc:396
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Sett inn disken merket �%s� i lagringsenheten �%s� og trykk Enter."
-#: apt-pkg/init.cc:126
+#: apt-pkg/init.cc:124
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Pakkesystemet �%s� st�ttes ikke"
-#: apt-pkg/init.cc:142
+#: apt-pkg/init.cc:140
msgid "Unable to determine a suitable packaging system type"
msgstr "Klarer ikke bestemme en passende pakkesystemtype"
@@ -2660,17 +2660,21 @@ msgstr "IO-feil ved lagring av kildekode-lager"
msgid "rename failed, %s (%s -> %s)."
msgstr "klarte ikke � endre navnet, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:401
msgid "MD5Sum mismatch"
msgstr "Feil MD5sum"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1405
+#, fuzzy
+msgid "Hash Sum mismatch"
+msgstr "Feil MD5sum"
+
+#: apt-pkg/acquire-item.cc:1097
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"Det er ingen offentlig n�kkel tilgjengelig for de f�lgende n�kkel-ID-ene:\n"
-#: apt-pkg/acquire-item.cc:1219
+#: apt-pkg/acquire-item.cc:1210
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2679,7 +2683,7 @@ msgstr ""
"Klarte ikke � finne en fil for pakken %s. Det kan bety at du m� ordne pakken "
"selv (fordi arkitekturen mangler)."
-#: apt-pkg/acquire-item.cc:1278
+#: apt-pkg/acquire-item.cc:1269
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2688,13 +2692,13 @@ msgstr ""
"Klarte ikke � finne en fil for pakken %s. Det kan bety at du m� ordne denne "
"pakken selv."
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1310
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "Oversiktsfilene er �delagte. Feltet �Filename:� mangler for pakken %s."
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1397
msgid "Size mismatch"
msgstr "Feil st�rrelse"
@@ -2785,76 +2789,86 @@ msgstr "Kildelisteoppf�ringer for denne CD-en er:\n"
msgid "Unmounting CD-ROM...\n"
msgstr "Avmonterer CD-ROM..."
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
#, c-format
msgid "Wrote %i records.\n"
msgstr "Skrev %i poster.\n"
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Skrev %i poster med %i manglende filer.\n"
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Skrev %i poster med %i feile filer.\n"
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "Skrev %i poster med %i manglende filer og %i feile filer.\n"
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:522
#, c-format
msgid "Preparing %s"
msgstr "Forbereder %s"
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:523
#, c-format
msgid "Unpacking %s"
msgstr "Pakker ut %s"
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:528
#, c-format
msgid "Preparing to configure %s"
msgstr "Forbereder konfigurering %s"
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:529
#, c-format
msgid "Configuring %s"
msgstr "Konfigurer %s"
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:530
#, c-format
msgid "Installed %s"
msgstr "Installerte %s"
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:535
#, c-format
msgid "Preparing for removal of %s"
msgstr "Forbereder fjerning av %s"
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:536
#, c-format
msgid "Removing %s"
msgstr "Fjerner %s"
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:537
#, c-format
msgid "Removed %s"
msgstr "Fjernet %s"
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:542
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Forbereder � fullstendig slette %s"
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:543
#, c-format
msgid "Completely removed %s"
msgstr "Fjernet %s fullstendig"
+#: apt-pkg/deb/dpkgpm.cc:566
+#, fuzzy, c-format
+msgid "Directory '%s' missing"
+msgstr "Listemappa %spartial mangler."
+
+#: apt-pkg/deb/dpkgpm.cc:709
+#, fuzzy, c-format
+msgid "openpty failed\n"
+msgstr "Utvalget mislykkes"
+
#: methods/rred.cc:219
msgid "Could not patch file"
msgstr "Kunne ikke �pne fila %s"
diff --git a/po/nl.po b/po/nl.po
index d2b510d3c..8a98c8ff7 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-06 06:51+0200\n"
+"POT-Creation-Date: 2007-08-04 09:09+0200\n"
"PO-Revision-Date: 2006-10-17 22:35+0100\n"
"Last-Translator: Bart Cornelis <cobaco@linux.be>\n"
"Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n"
@@ -158,9 +158,9 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2584 cmdline/apt-sortpkgs.cc:144
-#, c-format
-msgid "%s %s for %s %s compiled on %s %s\n"
+#: cmdline/apt-get.cc:2585 cmdline/apt-sortpkgs.cc:144
+#, fuzzy, c-format
+msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s voor %s %s gecompileerd op %s %s\n"
#: cmdline/apt-cache.cc:1721
@@ -662,7 +662,7 @@ msgstr "Hernoemen van %s naar %s is mislukt"
msgid "Y"
msgstr "J"
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1673
#, c-format
msgid "Regex compilation error - %s"
msgstr "Regex-compilatiefout - %s"
@@ -824,11 +824,11 @@ msgstr "Pakketten moeten verwijderd worden maar verwijderen is uitgeschakeld."
msgid "Internal error, Ordering didn't finish"
msgstr "Interne fout, rangschikken is niet voltooid"
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2011 cmdline/apt-get.cc:2044
msgid "Unable to lock the download directory"
msgstr "Kon de ophaalmap niet vergrendelen"
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2092 cmdline/apt-get.cc:2333
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr "De lijst van bronnen kon niet gelezen worden."
@@ -859,7 +859,7 @@ msgstr "Na het uitpakken zal er %sB extra schijfruimte gebruikt worden.\n"
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Na het uitpakken zal er %sB schijfruimte vrijkomen.\n"
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2186
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2187
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Kon de hoeveelheid vrije schijfruimte op %s niet bepalen"
@@ -896,7 +896,7 @@ msgstr "Afbreken."
msgid "Do you want to continue [Y/n]? "
msgstr "Wilt u doorgaan [J/n]? "
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2229
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2230
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Ophalen van %s %s is mislukt\n"
@@ -905,7 +905,7 @@ msgstr "Ophalen van %s %s is mislukt\n"
msgid "Some files failed to download"
msgstr "Ophalen van sommige bestanden is mislukt"
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2238
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2239
msgid "Download complete and in download only mode"
msgstr "Ophalen klaar en alleen-ophalen-modus staat aan"
@@ -1042,7 +1042,7 @@ msgid ""
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1754
msgid "The following information may help to resolve the situation:"
msgstr "De volgende informatie helpt u mogelijk verder:"
@@ -1055,33 +1055,33 @@ msgstr "Interne fout, probleemoplosser heeft dingen stukgemaakt"
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Interne fout, AllUpgrade heeft dingen stukgemaakt"
-#: cmdline/apt-get.cc:1544
+#: cmdline/apt-get.cc:1545
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "Kon pakket %s niet vinden"
-#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
+#: cmdline/apt-get.cc:1660 cmdline/apt-get.cc:1696
#, c-format
msgid "Couldn't find package %s"
msgstr "Kon pakket %s niet vinden"
-#: cmdline/apt-get.cc:1682
+#: cmdline/apt-get.cc:1683
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Let op, %s wordt geselecteerd omwille van de regex '%s'\n"
-#: cmdline/apt-get.cc:1712
+#: cmdline/apt-get.cc:1713
#, fuzzy, c-format
msgid "%s set to manual installed.\n"
msgstr "maar %s zal ge�nstalleerd worden"
-#: cmdline/apt-get.cc:1725
+#: cmdline/apt-get.cc:1726
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
"U wilt waarschijnlijk 'apt-get -f install' uitvoeren om volgende op te "
"lossen:"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1729
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1089,7 +1089,7 @@ msgstr ""
"Er zijn niet-voldane vereisten. U kunt best 'apt-get -f install' uitvoeren "
"zonder pakketten op te geven, (of u kunt zelf een oplossing specificeren)."
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1741
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1100,7 +1100,7 @@ msgstr ""
"een onmogelijke situatie gevraagd hebt of dat u de 'unstable'-distributie \n"
"gebruikt en sommige benodigde pakketten nog vastzitten in 'incoming'."
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1749
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1110,119 +1110,119 @@ msgstr ""
"waarschijnlijk dat het pakket gewoon niet installeerbaar is. U kunt dan\n"
"best een foutrapport indienen voor dit pakket."
-#: cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1757
msgid "Broken packages"
msgstr "Niet-werkende pakketten:"
-#: cmdline/apt-get.cc:1785
+#: cmdline/apt-get.cc:1786
msgid "The following extra packages will be installed:"
msgstr "De volgende extra pakketten zullen ge�nstalleerd worden:"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Suggested packages:"
msgstr "Voorgestelde pakketten:"
-#: cmdline/apt-get.cc:1875
+#: cmdline/apt-get.cc:1876
msgid "Recommended packages:"
msgstr "Aanbevolen pakketten:"
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1904
msgid "Calculating upgrade... "
msgstr "Opwaardering wordt doorgerekend... "
-#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1907 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Mislukt"
-#: cmdline/apt-get.cc:1911
+#: cmdline/apt-get.cc:1912
msgid "Done"
msgstr "Klaar"
-#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
+#: cmdline/apt-get.cc:1979 cmdline/apt-get.cc:1987
msgid "Internal error, problem resolver broke stuff"
msgstr "Interne fout, probleemoplosser heeft dingen stukgemaakt"
-#: cmdline/apt-get.cc:2086
+#: cmdline/apt-get.cc:2087
msgid "Must specify at least one package to fetch source for"
msgstr ""
"U dient minstens 1 pakket op te geven waarvan de broncode opgehaald moet "
"worden"
-#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2350
+#: cmdline/apt-get.cc:2117 cmdline/apt-get.cc:2351
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Kan geen bronpakket vinden voor %s"
-#: cmdline/apt-get.cc:2165
+#: cmdline/apt-get.cc:2166
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Reeds opgehaald bestand '%s' wordt overgeslagen\n"
-#: cmdline/apt-get.cc:2189
+#: cmdline/apt-get.cc:2190
#, c-format
msgid "You don't have enough free space in %s"
msgstr "U heeft niet voldoende vrije schijfruimte op %s"
-#: cmdline/apt-get.cc:2194
+#: cmdline/apt-get.cc:2195
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Moet %sB/%sB aan bronarchieven ophalen.\n"
-#: cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2198
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Moet %sB aan bronarchieven ophalen.\n"
-#: cmdline/apt-get.cc:2203
+#: cmdline/apt-get.cc:2204
#, c-format
msgid "Fetch source %s\n"
msgstr "Ophalen bron %s\n"
-#: cmdline/apt-get.cc:2234
+#: cmdline/apt-get.cc:2235
msgid "Failed to fetch some archives."
msgstr "Ophalen van sommige archieven is mislukt."
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2263
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Het uitpakken van de reeds uitgepakte bron in %s wordt overgeslagen\n"
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2275
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Uitpakopdracht '%s' is mislukt.\n"
-#: cmdline/apt-get.cc:2275
+#: cmdline/apt-get.cc:2276
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Gelieve na te gaan of het 'dpkg-dev'-pakket ge�nstalleerd is.\n"
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2293
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Bouwopdracht '%s' is mislukt.\n"
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:2312
msgid "Child process failed"
msgstr "Dochterproces is mislukt"
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2328
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"U dient tenminste ��n pakket op te geven om de bouwvereisten van te "
"controleren"
-#: cmdline/apt-get.cc:2355
+#: cmdline/apt-get.cc:2356
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Kan de informatie over de bouwvereisten voor %s niet ophalen"
-#: cmdline/apt-get.cc:2375
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s heeft geen bouwvereisten.\n"
-#: cmdline/apt-get.cc:2427
+#: cmdline/apt-get.cc:2428
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1231,7 +1231,7 @@ msgstr ""
"De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s "
"onvindbaar is"
-#: cmdline/apt-get.cc:2479
+#: cmdline/apt-get.cc:2480
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1240,32 +1240,32 @@ msgstr ""
"De vereiste %s van pakket %s kan niet voldaan worden omdat er geen "
"beschikbare versies zijn van pakket %s die aan de versievereisten voldoen"
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2515
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Voldoen van Vereiste %s van pakket %s is mislukt: ge�nstalleerde versie %s "
"is te nieuw"
-#: cmdline/apt-get.cc:2539
+#: cmdline/apt-get.cc:2540
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Voldoen van de vereiste %s van pakket %s is mislukt: %s"
-#: cmdline/apt-get.cc:2553
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Bouwvereisten voor %s konden niet voldaan worden."
-#: cmdline/apt-get.cc:2557
+#: cmdline/apt-get.cc:2558
msgid "Failed to process build dependencies"
msgstr "Verwerken van de bouwvereisten is mislukt"
-#: cmdline/apt-get.cc:2589
+#: cmdline/apt-get.cc:2590
msgid "Supported modules:"
msgstr "Ondersteunde modules:"
-#: cmdline/apt-get.cc:2630
+#: cmdline/apt-get.cc:2631
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1699,27 +1699,27 @@ msgstr "Fout bij het parsen van de MD5. regel %lu"
msgid "This is not a valid DEB archive, missing '%s' member"
msgstr "Dit is geen geldig DEB archief, het onderdeel '%s' mankeert"
-#: apt-inst/deb/debfile.cc:48
-#, c-format
-msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
+#: apt-inst/deb/debfile.cc:50
+#, fuzzy, c-format
+msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
msgstr ""
"Dit is geen geldig DEB-archief, het bevat noch een '%s' nog een '%s' "
"onderdeel"
-#: apt-inst/deb/debfile.cc:108
+#: apt-inst/deb/debfile.cc:110
#, c-format
msgid "Couldn't change to %s"
msgstr "Kon niet wijzigen naar %s"
-#: apt-inst/deb/debfile.cc:134
+#: apt-inst/deb/debfile.cc:140
msgid "Internal error, could not locate member"
msgstr "Interne fout, kon onderdeel niet vinden"
-#: apt-inst/deb/debfile.cc:167
+#: apt-inst/deb/debfile.cc:173
msgid "Failed to locate a valid control file"
msgstr "Localiseren van een geldig 'control'-bestand is mislukt"
-#: apt-inst/deb/debfile.cc:252
+#: apt-inst/deb/debfile.cc:258
msgid "Unparsable control file"
msgstr "Niet-ontleedbaar 'control'-bestand"
@@ -2091,15 +2091,15 @@ msgstr ""
msgid "Error reading from server"
msgstr "Fout bij het lezen van de server"
-#: methods/http.cc:1108
+#: methods/http.cc:1104
msgid "Bad header data"
msgstr "Foute koptekstdata"
-#: methods/http.cc:1125
+#: methods/http.cc:1121 methods/http.cc:1176
msgid "Connection failed"
msgstr "Verbinding mislukt"
-#: methods/http.cc:1216
+#: methods/http.cc:1228
msgid "Internal error"
msgstr "Interne fout"
@@ -2129,7 +2129,7 @@ msgstr "Configuratiebestand %s wordt geopend"
#: apt-pkg/contrib/configuration.cc:510
#, fuzzy, c-format
-msgid "Line %d too long (max %lu)"
+msgid "Line %d too long (max %u)"
msgstr "Regel %d is te lang (maxl %d)"
#: apt-pkg/contrib/configuration.cc:606
@@ -2389,29 +2389,29 @@ msgstr "optioneel"
msgid "extra"
msgstr "extra"
-#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129
+#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
msgid "Building dependency tree"
msgstr "Boom van vereisten wordt opgebouwd"
-#: apt-pkg/depcache.cc:101
+#: apt-pkg/depcache.cc:122
msgid "Candidate versions"
msgstr "Kandidaat-versies"
-#: apt-pkg/depcache.cc:130
+#: apt-pkg/depcache.cc:151
msgid "Dependency generation"
msgstr "Generatie vereisten"
-#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174
+#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
#, fuzzy
msgid "Reading state information"
msgstr "De beschikbare informatie wordt samengevoegd"
-#: apt-pkg/depcache.cc:198
+#: apt-pkg/depcache.cc:219
#, fuzzy, c-format
msgid "Failed to open StateFile %s"
msgstr "Openen van %s is mislukt"
-#: apt-pkg/depcache.cc:204
+#: apt-pkg/depcache.cc:225
#, fuzzy, c-format
msgid "Failed to write temporary StateFile %s"
msgstr "Wegschrijven van bestand %s is mislukt"
@@ -2545,19 +2545,19 @@ msgstr "Het methodestuurprogramma %s kon niet gevonden worden."
msgid "Method %s did not start correctly"
msgstr "Methode %s startte niet op de juiste manier"
-#: apt-pkg/acquire-worker.cc:381
+#: apt-pkg/acquire-worker.cc:396
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
"Gelieve de schijf met label '%s' in het station '%s' te plaatsen en op "
"'enter' te drukken."
-#: apt-pkg/init.cc:126
+#: apt-pkg/init.cc:124
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Pakketbeheersysteem '%s' wordt niet ondersteund"
-#: apt-pkg/init.cc:142
+#: apt-pkg/init.cc:140
msgid "Unable to determine a suitable packaging system type"
msgstr "Kan geen geschikt pakketsysteemtype bepalen"
@@ -2696,17 +2696,21 @@ msgstr "Invoer/Uitvoer-fout tijdens wegschrijven bronpakketcache"
msgid "rename failed, %s (%s -> %s)."
msgstr "hernoeming is mislukt, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:401
msgid "MD5Sum mismatch"
msgstr "MD5Sum komt niet overeen"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1405
+#, fuzzy
+msgid "Hash Sum mismatch"
+msgstr "MD5Sum komt niet overeen"
+
+#: apt-pkg/acquire-item.cc:1097
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"Er zijn geen publieke sleutels beschikbaar voor de volgende sleutel-IDs:\n"
-#: apt-pkg/acquire-item.cc:1219
+#: apt-pkg/acquire-item.cc:1210
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2715,7 +2719,7 @@ msgstr ""
"Er kon geen bestand gevonden worden voor pakket %s. Dit kan betekenen dat u "
"dit pakket handmatig moet repareren (wegens missende architectuur)"
-#: apt-pkg/acquire-item.cc:1278
+#: apt-pkg/acquire-item.cc:1269
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2724,7 +2728,7 @@ msgstr ""
"Er kon geen bestand gevonden worden voor pakket %s. Dit kan betekenen dat u "
"dit pakket handmatig moet repareren."
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1310
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2732,7 +2736,7 @@ msgstr ""
"De pakketindex-bestanden zijn beschadigd. Er is geen 'Filename:'-veld voor "
"pakket %s."
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1397
msgid "Size mismatch"
msgstr "Grootte komt niet overeen"
@@ -2823,78 +2827,88 @@ msgstr "Bronlijst-ingangen voor de schijf zijn:\n"
msgid "Unmounting CD-ROM...\n"
msgstr "CD wordt afgekoppeld..."
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
#, c-format
msgid "Wrote %i records.\n"
msgstr "%i records weggeschreven.\n"
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "%i records weggeschreven met %i missende bestanden.\n"
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "%i records weggeschreven met %i niet overeenkomende bestanden\n"
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
"%i records weggeschreven met %i missende bestanden en %i niet overeenkomende "
"bestanden\n"
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:522
#, c-format
msgid "Preparing %s"
msgstr "%s wordt voorbereid"
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:523
#, c-format
msgid "Unpacking %s"
msgstr "%s wordt uitgepakt"
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:528
#, c-format
msgid "Preparing to configure %s"
msgstr "Configuratie van %s wordt voorbereid"
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:529
#, c-format
msgid "Configuring %s"
msgstr "%s wordt geconfigureerd"
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:530
#, c-format
msgid "Installed %s"
msgstr "%s is ge�nstalleerd"
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:535
#, c-format
msgid "Preparing for removal of %s"
msgstr "Verwijdering van %s wordt voorbereid"
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:536
#, c-format
msgid "Removing %s"
msgstr "%s wordt verwijderd"
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:537
#, c-format
msgid "Removed %s"
msgstr "%s is verwijderd"
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:542
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Volledige verwijdering van %s wordt voorbereid"
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:543
#, c-format
msgid "Completely removed %s"
msgstr "%s is volledig verwijderd"
+#: apt-pkg/deb/dpkgpm.cc:566
+#, fuzzy, c-format
+msgid "Directory '%s' missing"
+msgstr "Lijstmap %spartial is afwezig."
+
+#: apt-pkg/deb/dpkgpm.cc:709
+#, fuzzy, c-format
+msgid "openpty failed\n"
+msgstr "Selectie is mislukt"
+
#: methods/rred.cc:219
#, fuzzy
msgid "Could not patch file"
diff --git a/po/nn.po b/po/nn.po
index 3123eef49..6666b14f0 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_nn\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-06 06:51+0200\n"
+"POT-Creation-Date: 2007-08-04 09:09+0200\n"
"PO-Revision-Date: 2005-02-14 23:30+0100\n"
"Last-Translator: Havard Korsvoll <korsvoll@skulelinux.no>\n"
"Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -161,9 +161,9 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2584 cmdline/apt-sortpkgs.cc:144
-#, c-format
-msgid "%s %s for %s %s compiled on %s %s\n"
+#: cmdline/apt-get.cc:2585 cmdline/apt-sortpkgs.cc:144
+#, fuzzy, c-format
+msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s for %s %s kompilert p� %s %s\n"
#: cmdline/apt-cache.cc:1721
@@ -658,7 +658,7 @@ msgstr "Klarte ikkje endra namnet p� %s til %s"
msgid "Y"
msgstr "J"
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1673
#, c-format
msgid "Regex compilation error - %s"
msgstr "Regex-kompileringsfeil - %s"
@@ -822,11 +822,11 @@ msgstr "Nokre pakkar m� fjernast, men fjerning er sl�tt av."
msgid "Internal error, Ordering didn't finish"
msgstr "Intern feil ved tilleggjing av avleiing"
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2011 cmdline/apt-get.cc:2044
msgid "Unable to lock the download directory"
msgstr "Klarte ikkje l�sa nedlastingskatalogen"
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2092 cmdline/apt-get.cc:2333
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr "Kjeldelista kan ikkje lesast."
@@ -855,7 +855,7 @@ msgstr "Etter utpakking vil %sB meir diskplass verta brukt.\n"
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Etter utpakking vil %sB meir diskplass verta frigjort.\n"
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2186
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2187
#, fuzzy, c-format
msgid "Couldn't determine free space in %s"
msgstr "Du har ikkje nok ledig plass i %s"
@@ -893,7 +893,7 @@ msgstr "Avbryt."
msgid "Do you want to continue [Y/n]? "
msgstr "Vil du halda fram [J/n]? "
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2229
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2230
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Klarte ikkje henta %s %s\n"
@@ -902,7 +902,7 @@ msgstr "Klarte ikkje henta %s %s\n"
msgid "Some files failed to download"
msgstr "Klarte ikkje henta nokre av filene"
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2238
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2239
msgid "Download complete and in download only mode"
msgstr "Nedlastinga er ferdig i nedlastingsmodus"
@@ -1038,7 +1038,7 @@ msgid ""
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1754
msgid "The following information may help to resolve the situation:"
msgstr "F�lgjande informasjon kan hjelpa med � l�ysa situasjonen:"
@@ -1051,32 +1051,32 @@ msgstr "Intern feil. AllUpgrade �ydelagde noko"
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Intern feil. AllUpgrade �ydelagde noko"
-#: cmdline/apt-get.cc:1544
+#: cmdline/apt-get.cc:1545
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "Fann ikkje pakken %s"
-#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
+#: cmdline/apt-get.cc:1660 cmdline/apt-get.cc:1696
#, c-format
msgid "Couldn't find package %s"
msgstr "Fann ikkje pakken %s"
-#: cmdline/apt-get.cc:1682
+#: cmdline/apt-get.cc:1683
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Merk, vel %s i staden for regex �%s�\n"
-#: cmdline/apt-get.cc:1712
+#: cmdline/apt-get.cc:1713
#, fuzzy, c-format
msgid "%s set to manual installed.\n"
msgstr "men %s skal installerast"
-#: cmdline/apt-get.cc:1725
+#: cmdline/apt-get.cc:1726
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
"Du vil kanskje pr�va � retta p� desse ved � k�yra �apt-get -f install�."
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1729
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1084,7 +1084,7 @@ msgstr ""
"Nokre krav er ikkje oppfylte. Du kan pr�va �apt-get -f install� (eller velja "
"ei l�ysing)."
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1741
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1096,7 +1096,7 @@ msgstr ""
"distribusjonen, kan det �g henda at nokre av pakkane som trengst ikkje\n"
"er laga enno eller at dei framleis ligg i �Incoming�."
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1749
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1106,123 +1106,123 @@ msgstr ""
"pakken rett og slett ikkje l�t seg installera. I s�fall b�r du senda\n"
"feilmelding."
-#: cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1757
msgid "Broken packages"
msgstr "�ydelagde pakkar"
-#: cmdline/apt-get.cc:1785
+#: cmdline/apt-get.cc:1786
msgid "The following extra packages will be installed:"
msgstr "Dei f�lgjande tilleggspakkane vil verta installerte:"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Suggested packages:"
msgstr "F�resl�tte pakkar:"
-#: cmdline/apt-get.cc:1875
+#: cmdline/apt-get.cc:1876
msgid "Recommended packages:"
msgstr "Tilr�dde pakkar"
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1904
msgid "Calculating upgrade... "
msgstr "Reknar ut oppgradering ... "
-#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1907 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Mislukkast"
-#: cmdline/apt-get.cc:1911
+#: cmdline/apt-get.cc:1912
msgid "Done"
msgstr "Ferdig"
-#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
+#: cmdline/apt-get.cc:1979 cmdline/apt-get.cc:1987
#, fuzzy
msgid "Internal error, problem resolver broke stuff"
msgstr "Intern feil. AllUpgrade �ydelagde noko"
-#: cmdline/apt-get.cc:2086
+#: cmdline/apt-get.cc:2087
msgid "Must specify at least one package to fetch source for"
msgstr "Du m� velja minst �in pakke som kjeldekoden skal hentast for"
-#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2350
+#: cmdline/apt-get.cc:2117 cmdline/apt-get.cc:2351
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Finn ingen kjeldepakke for %s"
-#: cmdline/apt-get.cc:2165
+#: cmdline/apt-get.cc:2166
#, fuzzy, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Hoppar over utpakking av kjeldekode som er utpakka fr� f�r i %s\n"
-#: cmdline/apt-get.cc:2189
+#: cmdline/apt-get.cc:2190
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Du har ikkje nok ledig plass i %s"
-#: cmdline/apt-get.cc:2194
+#: cmdline/apt-get.cc:2195
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "M� henta %sB/%sB med kjeldekodearkiv.\n"
-#: cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2198
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "M� henta %sB med kjeldekodearkiv.\n"
-#: cmdline/apt-get.cc:2203
+#: cmdline/apt-get.cc:2204
#, c-format
msgid "Fetch source %s\n"
msgstr "Hent kjeldekode %s\n"
-#: cmdline/apt-get.cc:2234
+#: cmdline/apt-get.cc:2235
msgid "Failed to fetch some archives."
msgstr "Klarte ikkje henta nokre av arkiva."
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2263
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Hoppar over utpakking av kjeldekode som er utpakka fr� f�r i %s\n"
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2275
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Utpakkingskommandoen �%s� mislukkast.\n"
-#: cmdline/apt-get.cc:2275
+#: cmdline/apt-get.cc:2276
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2293
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Byggjekommandoen �%s� mislukkast.\n"
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:2312
msgid "Child process failed"
msgstr "Barneprosessen mislukkast"
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2328
msgid "Must specify at least one package to check builddeps for"
msgstr "Du m� velja minst ein pakke som byggjekrava skal sjekkast for"
-#: cmdline/apt-get.cc:2355
+#: cmdline/apt-get.cc:2356
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Klarte ikkje henta byggjekrav for %s"
-#: cmdline/apt-get.cc:2375
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s har ingen byggjekrav.\n"
-#: cmdline/apt-get.cc:2427
+#: cmdline/apt-get.cc:2428
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "Kravet %s for %s kan ikkje oppfyllast fordi pakken %s ikkje finst"
-#: cmdline/apt-get.cc:2479
+#: cmdline/apt-get.cc:2480
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1231,31 +1231,31 @@ msgstr ""
"Kravet %s for %s kan ikkje oppfyllast fordi det ikkje finst nokon "
"tilgjengelege versjonar av pakken %s som oppfyller versjonskrava"
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2515
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Klarte ikkje oppfylla kravet %s for %s: Den installerte pakken %s er for ny"
-#: cmdline/apt-get.cc:2539
+#: cmdline/apt-get.cc:2540
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Klarte ikkje oppfylla kravet %s for %s: %s"
-#: cmdline/apt-get.cc:2553
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Byggjekrav for %s kunne ikkje tilfredstillast."
-#: cmdline/apt-get.cc:2557
+#: cmdline/apt-get.cc:2558
msgid "Failed to process build dependencies"
msgstr "Klarte ikkje behandla byggjekrava"
-#: cmdline/apt-get.cc:2589
+#: cmdline/apt-get.cc:2590
msgid "Supported modules:"
msgstr "St�tta modular:"
-#: cmdline/apt-get.cc:2630
+#: cmdline/apt-get.cc:2631
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1678,26 +1678,26 @@ msgstr "Feil ved tolking av MD5. Offset %lu"
msgid "This is not a valid DEB archive, missing '%s' member"
msgstr "Dette er ikkje eit gyldig DEB-arkiv, manglar �%s�-medlemmen"
-#: apt-inst/deb/debfile.cc:48
-#, c-format
-msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
+#: apt-inst/deb/debfile.cc:50
+#, fuzzy, c-format
+msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
msgstr ""
"Dette er ikkje eit gyldig DEB-arkiv, det har ingen �%s� eller �%s�-medlem"
-#: apt-inst/deb/debfile.cc:108
+#: apt-inst/deb/debfile.cc:110
#, c-format
msgid "Couldn't change to %s"
msgstr "Klarte ikkje byta til %s"
-#: apt-inst/deb/debfile.cc:134
+#: apt-inst/deb/debfile.cc:140
msgid "Internal error, could not locate member"
msgstr "Intern feil, fann ikkje medlem"
-#: apt-inst/deb/debfile.cc:167
+#: apt-inst/deb/debfile.cc:173
msgid "Failed to locate a valid control file"
msgstr "Fann ikkje noka gyldig kontrollfil"
-#: apt-inst/deb/debfile.cc:252
+#: apt-inst/deb/debfile.cc:258
msgid "Unparsable control file"
msgstr "Kontrollfila kan ikkje tolkast"
@@ -2060,15 +2060,15 @@ msgstr "Feil ved lesing fr� tenaren. Sambandet vart lukka i andre enden"
msgid "Error reading from server"
msgstr "Feil ved lesing fr� tenaren"
-#: methods/http.cc:1108
+#: methods/http.cc:1104
msgid "Bad header data"
msgstr "�ydelagde hovuddata"
-#: methods/http.cc:1125
+#: methods/http.cc:1121 methods/http.cc:1176
msgid "Connection failed"
msgstr "Sambandet mislukkast"
-#: methods/http.cc:1216
+#: methods/http.cc:1228
msgid "Internal error"
msgstr "Intern feil"
@@ -2098,7 +2098,7 @@ msgstr "Opnar oppsettsfila %s"
#: apt-pkg/contrib/configuration.cc:510
#, fuzzy, c-format
-msgid "Line %d too long (max %lu)"
+msgid "Line %d too long (max %u)"
msgstr "Linja %d er for lang (maks %d)"
#: apt-pkg/contrib/configuration.cc:606
@@ -2351,29 +2351,29 @@ msgstr "valfri"
msgid "extra"
msgstr "tillegg"
-#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129
+#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
msgid "Building dependency tree"
msgstr "Byggjer kravtre"
-#: apt-pkg/depcache.cc:101
+#: apt-pkg/depcache.cc:122
msgid "Candidate versions"
msgstr "Kandidatversjonar"
-#: apt-pkg/depcache.cc:130
+#: apt-pkg/depcache.cc:151
msgid "Dependency generation"
msgstr "Genererer kravforhold"
-#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174
+#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
#, fuzzy
msgid "Reading state information"
msgstr "Flettar informasjon om tilgjengelege pakkar"
-#: apt-pkg/depcache.cc:198
+#: apt-pkg/depcache.cc:219
#, fuzzy, c-format
msgid "Failed to open StateFile %s"
msgstr "Klarte ikkje opna %s"
-#: apt-pkg/depcache.cc:204
+#: apt-pkg/depcache.cc:225
#, fuzzy, c-format
msgid "Failed to write temporary StateFile %s"
msgstr "Klarte ikkje skriva fila %s"
@@ -2506,7 +2506,7 @@ msgstr "Finn ikkje metodedrivaren %s."
msgid "Method %s did not start correctly"
msgstr "Metoden %s starta ikkje rett"
-#: apt-pkg/acquire-worker.cc:381
+#: apt-pkg/acquire-worker.cc:396
#, fuzzy, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
@@ -2514,12 +2514,12 @@ msgstr ""
" �%s�\n"
"i stasjonen �%s� og trykk Enter.\n"
-#: apt-pkg/init.cc:126
+#: apt-pkg/init.cc:124
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Pakkesystemet �%s� er ikkje st�tta"
-#: apt-pkg/init.cc:142
+#: apt-pkg/init.cc:140
msgid "Unable to determine a suitable packaging system type"
msgstr "Klarte ikkje avgjera ein eigna pakkesystemtype"
@@ -2653,16 +2653,20 @@ msgstr "IU-feil ved lagring av kjeldelager"
msgid "rename failed, %s (%s -> %s)."
msgstr "endring av namn mislukkast, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:401
msgid "MD5Sum mismatch"
msgstr "Feil MD5-sum"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1405
+#, fuzzy
+msgid "Hash Sum mismatch"
+msgstr "Feil MD5-sum"
+
+#: apt-pkg/acquire-item.cc:1097
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:1219
+#: apt-pkg/acquire-item.cc:1210
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2671,7 +2675,7 @@ msgstr ""
"Fann ikkje fila for pakken %s. Det kan henda du m� fiksa denne pakken sj�lv "
"(fordi arkitekturen manglar)."
-#: apt-pkg/acquire-item.cc:1278
+#: apt-pkg/acquire-item.cc:1269
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2679,14 +2683,14 @@ msgid ""
msgstr ""
"Fann ikkje fila for pakken %s. Det kan henda du m� fiksa denne pakken sj�lv."
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1310
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"Pakkeindeksfilene er �ydelagde. Feltet �Filename:� manglar for pakken %s."
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1397
msgid "Size mismatch"
msgstr "Feil storleik"
@@ -2777,76 +2781,86 @@ msgstr "Kjeldelisteoppf�ringar for denne disken er:\n"
msgid "Unmounting CD-ROM...\n"
msgstr "Avmonterer CD-ROM ..."
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
#, c-format
msgid "Wrote %i records.\n"
msgstr "Skreiv %i postar.\n"
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Skreiv %i postar med %i manglande filer.\n"
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Skreiv %i postar med %i filer som ikkje passa\n"
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "Skreiv %i postar med %i manglande filer og %i filer som ikkje passa\n"
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:522
#, fuzzy, c-format
msgid "Preparing %s"
msgstr "Opnar %s"
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:523
#, fuzzy, c-format
msgid "Unpacking %s"
msgstr "Opnar %s"
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:528
#, fuzzy, c-format
msgid "Preparing to configure %s"
msgstr "Opnar oppsettsfila %s"
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:529
#, fuzzy, c-format
msgid "Configuring %s"
msgstr "Koplar til %s"
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:530
#, fuzzy, c-format
msgid "Installed %s"
msgstr " Installert: "
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:535
#, c-format
msgid "Preparing for removal of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:536
#, fuzzy, c-format
msgid "Removing %s"
msgstr "Opnar %s"
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:537
#, fuzzy, c-format
msgid "Removed %s"
msgstr "Tilr�dingar"
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:542
#, fuzzy, c-format
msgid "Preparing to completely remove %s"
msgstr "Opnar oppsettsfila %s"
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:543
#, fuzzy, c-format
msgid "Completely removed %s"
msgstr "Klarte ikkje fjerna %s"
+#: apt-pkg/deb/dpkgpm.cc:566
+#, fuzzy, c-format
+msgid "Directory '%s' missing"
+msgstr "Listekatalogen %spartial manglar."
+
+#: apt-pkg/deb/dpkgpm.cc:709
+#, fuzzy, c-format
+msgid "openpty failed\n"
+msgstr "Utvalet mislukkast"
+
#: methods/rred.cc:219
#, fuzzy
msgid "Could not patch file"
diff --git a/po/pl.po b/po/pl.po
index f67cccdc0..f5faba022 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-06 06:51+0200\n"
+"POT-Creation-Date: 2007-08-04 09:09+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"
@@ -157,9 +157,9 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2584 cmdline/apt-sortpkgs.cc:144
-#, c-format
-msgid "%s %s for %s %s compiled on %s %s\n"
+#: cmdline/apt-get.cc:2585 cmdline/apt-sortpkgs.cc:144
+#, fuzzy, c-format
+msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s dla %s %s skompilowany %s %s\n"
#: cmdline/apt-cache.cc:1721
@@ -654,7 +654,7 @@ msgstr "Nie uda�o si� zmieni� nazwy %s na %s"
msgid "Y"
msgstr "T"
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1673
#, c-format
msgid "Regex compilation error - %s"
msgstr "B��d kompilacji wyra�enia regularnego - %s"
@@ -815,11 +815,11 @@ msgstr "Pakiety powinny zosta� usuni�te, ale Remove jest wy��czone."
msgid "Internal error, Ordering didn't finish"
msgstr "B��d wewn�trzny, sortowanie niezako�czone"
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2011 cmdline/apt-get.cc:2044
msgid "Unable to lock the download directory"
msgstr "Nie uda�o si� zablokowa� katalogu pobierania"
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2092 cmdline/apt-get.cc:2333
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr "Nie uda�o si� odczyta� list �r�de�."
@@ -848,7 +848,7 @@ msgstr "Po rozpakowaniu zostanie dodatkowo u�yte %sB miejsca na dysku.\n"
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Po rozpakowaniu zostanie zwolnione %sB miejsca na dysku.\n"
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2186
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2187
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Nie uda�o si� ustali� ilo�ci wolnego miejsca w %s"
@@ -885,7 +885,7 @@ msgstr "Przerwane."
msgid "Do you want to continue [Y/n]? "
msgstr "Czy chcesz kontynuowa� [T/n]? "
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2229
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2230
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Nie uda�o si� pobra� %s %s\n"
@@ -894,7 +894,7 @@ msgstr "Nie uda�o si� pobra� %s %s\n"
msgid "Some files failed to download"
msgstr "Nie uda�o si� pobra� niekt�rych plik�w"
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2238
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2239
msgid "Download complete and in download only mode"
msgstr "Uko�czono pobieranie w trybie samego pobierania"
@@ -1030,7 +1030,7 @@ msgid ""
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1754
msgid "The following information may help to resolve the situation:"
msgstr "Nast�puj�ce informacje mog� pom�c rozpozna� sytuacj�:"
@@ -1043,31 +1043,31 @@ msgstr "B��d wewn�trzny, rozwi�zywanie problem�w wszystko popsu�o"
msgid "Internal error, AllUpgrade broke stuff"
msgstr "B��d wewn�trzny, AllUpgrade wszystko popsu�o"
-#: cmdline/apt-get.cc:1544
+#: cmdline/apt-get.cc:1545
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "Nie uda�o si� odnale�� pakietu %s"
-#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
+#: cmdline/apt-get.cc:1660 cmdline/apt-get.cc:1696
#, c-format
msgid "Couldn't find package %s"
msgstr "Nie uda�o si� odnale�� pakietu %s"
-#: cmdline/apt-get.cc:1682
+#: cmdline/apt-get.cc:1683
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Uwaga, wybieranie %s za wyra�enie '%s'\n"
-#: cmdline/apt-get.cc:1712
+#: cmdline/apt-get.cc:1713
#, fuzzy, c-format
msgid "%s set to manual installed.\n"
msgstr "ale %s ma zosta� zainstalowany"
-#: cmdline/apt-get.cc:1725
+#: cmdline/apt-get.cc:1726
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Nale�y uruchomi� `apt-get -f install', aby je naprawi�:"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1729
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1075,7 +1075,7 @@ msgstr ""
"Niespe�nione zale�no�ci. Spr�buj 'apt-get -f install' bez pakiet�w (lub "
"podaj rozwi�zanie)."
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1741
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1087,7 +1087,7 @@ msgstr ""
"w kt�rej niekt�re pakiety nie zosta�y jeszcze utworzone lub przeniesione\n"
"z katalogu Incoming (\"Przychodz�ce\")."
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1749
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1097,120 +1097,120 @@ msgstr ""
"danego pakietu po prostu nie da si� zainstalowa� i nale�y zg�osi� w nim\n"
"b��d."
-#: cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1757
msgid "Broken packages"
msgstr "Pakiety s� b��dne"
-#: cmdline/apt-get.cc:1785
+#: cmdline/apt-get.cc:1786
msgid "The following extra packages will be installed:"
msgstr "Zostan� zainstalowane nast�puj�ce dodatkowe pakiety:"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Suggested packages:"
msgstr "Sugerowane pakiety:"
-#: cmdline/apt-get.cc:1875
+#: cmdline/apt-get.cc:1876
msgid "Recommended packages:"
msgstr "Polecane pakiety:"
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1904
msgid "Calculating upgrade... "
msgstr "Obliczanie aktualizacji..."
-#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1907 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Nie uda�o si�"
-#: cmdline/apt-get.cc:1911
+#: cmdline/apt-get.cc:1912
msgid "Done"
msgstr "Gotowe"
-#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
+#: cmdline/apt-get.cc:1979 cmdline/apt-get.cc:1987
msgid "Internal error, problem resolver broke stuff"
msgstr "B��d wewn�trzny, rozwi�zywanie problem�w wszystko popsu�o"
-#: cmdline/apt-get.cc:2086
+#: cmdline/apt-get.cc:2087
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Nale�y poda� przynajmniej jeden pakiet, dla kt�rego maj� zosta� pobrane "
"�r�d�a"
-#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2350
+#: cmdline/apt-get.cc:2117 cmdline/apt-get.cc:2351
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Nie uda�o si� odnale�� �r�d�a dla pakietu %s"
-#: cmdline/apt-get.cc:2165
+#: cmdline/apt-get.cc:2166
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Pomijanie ju� pobranego pliku '%s'\n"
-#: cmdline/apt-get.cc:2189
+#: cmdline/apt-get.cc:2190
#, c-format
msgid "You don't have enough free space in %s"
msgstr "W %s nie ma wystarczaj�cej ilo�ci wolnego miejsca"
-#: cmdline/apt-get.cc:2194
+#: cmdline/apt-get.cc:2195
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Konieczne pobranie %sB/%sB archiw�w �r�de�.\n"
-#: cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2198
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Konieczne pobranie %sB archiw�w �r�de�.\n"
-#: cmdline/apt-get.cc:2203
+#: cmdline/apt-get.cc:2204
#, c-format
msgid "Fetch source %s\n"
msgstr "Pobierz �r�d�o %s\n"
-#: cmdline/apt-get.cc:2234
+#: cmdline/apt-get.cc:2235
msgid "Failed to fetch some archives."
msgstr "Nie uda�o si� pobra� niekt�rych archiw�w."
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2263
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Pomijanie rozpakowania ju� rozpakowanego �r�d�a w %s\n"
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2275
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Polecenie rozpakowania '%s' zawiod�o.\n"
-#: cmdline/apt-get.cc:2275
+#: cmdline/apt-get.cc:2276
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Sprawd� czy pakiet 'dpkg-dev' jest zainstalowany.\n"
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2293
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Polecenie budowania '%s' zawiod�o.\n"
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:2312
msgid "Child process failed"
msgstr "Proces potomny zawi�d�"
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2328
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Nale�y poda� przynajmniej jeden pakiet, dla kt�rego maj� zosta� pakiety "
"wymagane do budowania"
-#: cmdline/apt-get.cc:2355
+#: cmdline/apt-get.cc:2356
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
"Nie uda�o si� pobra� informacji o zale�no�ciach na czas budowania dla %s"
-#: cmdline/apt-get.cc:2375
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nie ma zale�no�ci czasu budowania.\n"
-#: cmdline/apt-get.cc:2427
+#: cmdline/apt-get.cc:2428
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1219,7 +1219,7 @@ msgstr ""
"Zale�no�� %s od %s nie mo�e zosta� spe�niona, poniewa� nie znaleziono "
"pakietu %s"
-#: cmdline/apt-get.cc:2479
+#: cmdline/apt-get.cc:2480
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1228,32 +1228,32 @@ msgstr ""
"Zale�no�� %s od %s nie mo�e zosta� spe�niona, poniewa� �adna z dost�pnych "
"wersji pakietu %s nie ma odpowiedniej wersji"
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2515
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Nie uda�o si� spe�ni� zale�no�ci %s od %s: Zainstalowany pakiet %s jest zbyt "
"nowy"
-#: cmdline/apt-get.cc:2539
+#: cmdline/apt-get.cc:2540
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Nie uda�o si� spe�ni� zale�no�ci %s od %s: %s"
-#: cmdline/apt-get.cc:2553
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Nie uda�o si� spe�ni� zale�no�ci na czas budowania od %s."
-#: cmdline/apt-get.cc:2557
+#: cmdline/apt-get.cc:2558
msgid "Failed to process build dependencies"
msgstr "Nie uda�o si� przetworzy� zale�no�ci na czas budowania"
-#: cmdline/apt-get.cc:2589
+#: cmdline/apt-get.cc:2590
msgid "Supported modules:"
msgstr "Obs�ugiwane modu�y:"
-#: cmdline/apt-get.cc:2630
+#: cmdline/apt-get.cc:2631
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1679,25 +1679,25 @@ msgstr "B��d przy czytaniu skr�tu MD5. Offset %lu"
msgid "This is not a valid DEB archive, missing '%s' member"
msgstr "To nie jest poprawne archiwum DEB, brakuje sk�adnika '%s'"
-#: apt-inst/deb/debfile.cc:48
-#, c-format
-msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
+#: apt-inst/deb/debfile.cc:50
+#, fuzzy, c-format
+msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
msgstr "To nie jest poprawne archiwum DEB, brakuje sk�adnika '%s' lub '%s'"
-#: apt-inst/deb/debfile.cc:108
+#: apt-inst/deb/debfile.cc:110
#, c-format
msgid "Couldn't change to %s"
msgstr "Nie uda�o si� przej�� do %s"
-#: apt-inst/deb/debfile.cc:134
+#: apt-inst/deb/debfile.cc:140
msgid "Internal error, could not locate member"
msgstr "B��d wewn�trzny, nie uda�o si� odnale�� sk�adnika"
-#: apt-inst/deb/debfile.cc:167
+#: apt-inst/deb/debfile.cc:173
msgid "Failed to locate a valid control file"
msgstr "Nie uda�o si� odnale�� poprawnego pliku control"
-#: apt-inst/deb/debfile.cc:252
+#: apt-inst/deb/debfile.cc:258
msgid "Unparsable control file"
msgstr "Plik kontrolny nie mo�e zosta� poprawnie zinterpretowany"
@@ -2062,15 +2062,15 @@ msgstr "B��d czytania z serwera: Zdalna strona zamkn�a po��czenie"
msgid "Error reading from server"
msgstr "B��d czytania z serwera"
-#: methods/http.cc:1108
+#: methods/http.cc:1104
msgid "Bad header data"
msgstr "B��dne dane nag��wka"
-#: methods/http.cc:1125
+#: methods/http.cc:1121 methods/http.cc:1176
msgid "Connection failed"
msgstr "Po��czenie nie uda�o si�"
-#: methods/http.cc:1216
+#: methods/http.cc:1228
msgid "Internal error"
msgstr "B��d wewn�trzny"
@@ -2100,7 +2100,7 @@ msgstr "Otwieranie pliku konfiguracyjnego %s"
#: apt-pkg/contrib/configuration.cc:510
#, fuzzy, c-format
-msgid "Line %d too long (max %lu)"
+msgid "Line %d too long (max %u)"
msgstr "Linia %d jest zbyt d�uga (max %d)"
#: apt-pkg/contrib/configuration.cc:606
@@ -2354,29 +2354,29 @@ msgstr "opcjonalny"
msgid "extra"
msgstr "dodatkowy"
-#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129
+#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
msgid "Building dependency tree"
msgstr "Budowanie drzewa zale�no�ci"
-#: apt-pkg/depcache.cc:101
+#: apt-pkg/depcache.cc:122
msgid "Candidate versions"
msgstr "Kandyduj�ce wersje"
-#: apt-pkg/depcache.cc:130
+#: apt-pkg/depcache.cc:151
msgid "Dependency generation"
msgstr "Generowanie zale�no�ci"
-#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174
+#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
#, fuzzy
msgid "Reading state information"
msgstr "��czenie informacji o dost�pnych pakietach"
-#: apt-pkg/depcache.cc:198
+#: apt-pkg/depcache.cc:219
#, fuzzy, c-format
msgid "Failed to open StateFile %s"
msgstr "Nie uda�o si� otworzy� %s"
-#: apt-pkg/depcache.cc:204
+#: apt-pkg/depcache.cc:225
#, fuzzy, c-format
msgid "Failed to write temporary StateFile %s"
msgstr "Nie uda�o si� zapisa� pliku %s"
@@ -2509,17 +2509,17 @@ msgstr "Nie uda�o si� odnale�� sterownika metody %s."
msgid "Method %s did not start correctly"
msgstr "Metoda %s nie uruchomi�a si� poprawnie."
-#: apt-pkg/acquire-worker.cc:381
+#: apt-pkg/acquire-worker.cc:396
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "W�� do nap�du '%s' dysk o nazwie: '%s' i naci�nij enter."
-#: apt-pkg/init.cc:126
+#: apt-pkg/init.cc:124
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "System pakiet�w '%s' nie jest obs�ugiwany"
-#: apt-pkg/init.cc:142
+#: apt-pkg/init.cc:140
msgid "Unable to determine a suitable packaging system type"
msgstr "Nie uda�o si� okre�li� odpowiedniego typu systemu pakiet�w"
@@ -2654,17 +2654,21 @@ msgstr "B��d wej�cia/wyj�cia przy zapisywaniu podr�cznego magazynu �r�de�"
msgid "rename failed, %s (%s -> %s)."
msgstr "nie uda�o si� zmieni� nazwy, %s (%s -> %s)"
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:401
msgid "MD5Sum mismatch"
msgstr "B��dna suma MD5"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1405
+#, fuzzy
+msgid "Hash Sum mismatch"
+msgstr "B��dna suma MD5"
+
+#: apt-pkg/acquire-item.cc:1097
#, fuzzy
msgid "There is no public key available for the following key IDs:\n"
msgstr "Dla nast�puj�cego identyfikatora klucza brakuje klucza publicznego:\n"
-#: apt-pkg/acquire-item.cc:1219
+#: apt-pkg/acquire-item.cc:1210
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2673,7 +2677,7 @@ msgstr ""
"Nie uda�o si� odnale�� pliku dla pakietu %s. Mo�e to oznacza�, �e trzeba "
"b�dzie r�cznie naprawi� ten pakiet (z powodu brakuj�cej architektury)."
-#: apt-pkg/acquire-item.cc:1278
+#: apt-pkg/acquire-item.cc:1269
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2682,14 +2686,14 @@ msgstr ""
"Nie uda�o si� odnale�� pliku dla pakietu %s. Mo�e to oznacza�, �e trzeba "
"b�dzie r�cznie naprawi� ten pakiet."
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1310
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"Pliki indeksu pakiet�w s� uszkodzone. Brak pola Filename: dla pakietu %s."
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1397
msgid "Size mismatch"
msgstr "B��dny rozmiar"
@@ -2782,76 +2786,86 @@ msgstr "�r�d�a dla tej p�yty to:\n"
msgid "Unmounting CD-ROM...\n"
msgstr "Odmontowanie CD-ROMu..."
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
#, c-format
msgid "Wrote %i records.\n"
msgstr "Zapisano %i rekord�w.\n"
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Zapisano %i rekord�w z %i brakuj�cymi plikami.\n"
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Zapisano %i rekord�w z %i niepasuj�cymi plikami\n"
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "Zapisano %i rekord�w z %i brakuj�cymi plikami i %i niepasuj�cymi\n"
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:522
#, c-format
msgid "Preparing %s"
msgstr "Przygotowanie %s"
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:523
#, c-format
msgid "Unpacking %s"
msgstr "Rozpakowywanie %s"
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:528
#, c-format
msgid "Preparing to configure %s"
msgstr "Przygotowanie do konfiguracji %s"
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:529
#, c-format
msgid "Configuring %s"
msgstr "Konfigurowanie %s"
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:530
#, c-format
msgid "Installed %s"
msgstr " Zainstalowany %s"
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:535
#, c-format
msgid "Preparing for removal of %s"
msgstr "Przygotowanie do usuni�cia %s"
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:536
#, c-format
msgid "Removing %s"
msgstr "Usuwanie %s"
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:537
#, c-format
msgid "Removed %s"
msgstr "Usuni�to %s"
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:542
#, fuzzy, c-format
msgid "Preparing to completely remove %s"
msgstr "Przygotowanie do konfiguracji %s"
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:543
#, fuzzy, c-format
msgid "Completely removed %s"
msgstr "Nie uda�o si� usun�� %s"
+#: apt-pkg/deb/dpkgpm.cc:566
+#, fuzzy, c-format
+msgid "Directory '%s' missing"
+msgstr "Brakuje katalogu list %spartial."
+
+#: apt-pkg/deb/dpkgpm.cc:709
+#, fuzzy, c-format
+msgid "openpty failed\n"
+msgstr "Operacja select nie powiod�a si�"
+
#: methods/rred.cc:219
msgid "Could not patch file"
msgstr "Nie uda�o si� na�o�y� �atki na plik"
diff --git a/po/pt.po b/po/pt.po
index 7618e2b8e..eb2370d44 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-06 06:51+0200\n"
+"POT-Creation-Date: 2007-08-04 09:09+0200\n"
"PO-Revision-Date: 2007-05-09 22:14+0100\n"
"Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
"Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -159,9 +159,9 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2584 cmdline/apt-sortpkgs.cc:144
-#, c-format
-msgid "%s %s for %s %s compiled on %s %s\n"
+#: cmdline/apt-get.cc:2585 cmdline/apt-sortpkgs.cc:144
+#, fuzzy, c-format
+msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s para %s %s compilado em %s %s\n"
#: cmdline/apt-cache.cc:1721
@@ -657,7 +657,7 @@ msgstr "Falha ao renomear %s para %s"
msgid "Y"
msgstr "S"
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1673
#, c-format
msgid "Regex compilation error - %s"
msgstr "Erro de compilação de regex - %s"
@@ -818,11 +818,11 @@ msgstr "Pacotes precisam de ser removidos mas Remove está desabilitado."
msgid "Internal error, Ordering didn't finish"
msgstr "Erro Interno, Ordering não terminou"
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2011 cmdline/apt-get.cc:2044
msgid "Unable to lock the download directory"
msgstr "Impossível criar lock no directório de download"
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2092 cmdline/apt-get.cc:2333
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr "A lista de fontes não pôde ser lida."
@@ -853,7 +853,7 @@ msgstr ""
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Depois de descompactar, %sB de espaço em disco serão libertados.\n"
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2186
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2187
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Impossível de determinar espaço livre em %s"
@@ -890,7 +890,7 @@ msgstr "Abortado."
msgid "Do you want to continue [Y/n]? "
msgstr "Você deseja continuar [Y/n]? "
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2229
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2230
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Falha ao obter %s %s\n"
@@ -899,7 +899,7 @@ msgstr "Falha ao obter %s %s\n"
msgid "Some files failed to download"
msgstr "Falhou o download de alguns ficheiros"
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2238
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2239
msgid "Download complete and in download only mode"
msgstr "Download completo e em modo de apenas download"
@@ -1035,7 +1035,7 @@ msgid ""
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1754
msgid "The following information may help to resolve the situation:"
msgstr "A seguinte informação pode ajudar a resolver a situação:"
@@ -1048,31 +1048,31 @@ msgstr "Erro Interno, o solucionador de problemas estragou coisas"
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Erro Interno, AllUpgrade estragou algo"
-#: cmdline/apt-get.cc:1544
+#: cmdline/apt-get.cc:1545
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "Impossível encontrar o pacote %s"
-#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
+#: cmdline/apt-get.cc:1660 cmdline/apt-get.cc:1696
#, c-format
msgid "Couldn't find package %s"
msgstr "Impossível encontrar o pacote %s"
-#: cmdline/apt-get.cc:1682
+#: cmdline/apt-get.cc:1683
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Nota, seleccionando %s para a expressão regular '%s'\n"
-#: cmdline/apt-get.cc:1712
+#: cmdline/apt-get.cc:1713
#, fuzzy, c-format
msgid "%s set to manual installed.\n"
msgstr "mas %s está para ser instalado"
-#: cmdline/apt-get.cc:1725
+#: cmdline/apt-get.cc:1726
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Você deve querer executar `apt-get -f install' para corrigir isto:"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1729
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1080,7 +1080,7 @@ msgstr ""
"Dependências não satisfeitas. Tente `apt-get -f install' sem nenhum pacote "
"(ou especifique uma solução)."
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1741
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1092,7 +1092,7 @@ msgstr ""
"distribuição instável, que alguns pacotes requisitados ainda não foram \n"
"criados ou foram tirados do Incoming."
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1749
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1103,119 +1103,119 @@ msgstr ""
"de\n"
"bug sobre esse pacote."
-#: cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1757
msgid "Broken packages"
msgstr "Pacotes estragados"
-#: cmdline/apt-get.cc:1785
+#: cmdline/apt-get.cc:1786
msgid "The following extra packages will be installed:"
msgstr "Os seguintes pacotes extra serão instalados:"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Suggested packages:"
msgstr "Pacotes sugeridos :"
-#: cmdline/apt-get.cc:1875
+#: cmdline/apt-get.cc:1876
msgid "Recommended packages:"
msgstr "Pacotes recomendados :"
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1904
msgid "Calculating upgrade... "
msgstr "Calculando Actualização... "
-#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1907 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Falhou"
-#: cmdline/apt-get.cc:1911
+#: cmdline/apt-get.cc:1912
msgid "Done"
msgstr "Pronto"
-#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
+#: cmdline/apt-get.cc:1979 cmdline/apt-get.cc:1987
msgid "Internal error, problem resolver broke stuff"
msgstr "Erro Interno, o solucionador de problemas estragou coisas"
-#: cmdline/apt-get.cc:2086
+#: cmdline/apt-get.cc:2087
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Deve-se especificar pelo menos um pacote para que se obtenha o código fonte"
-#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2350
+#: cmdline/apt-get.cc:2117 cmdline/apt-get.cc:2351
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Impossível encontrar um pacote de código fonte para %s"
-#: cmdline/apt-get.cc:2165
+#: cmdline/apt-get.cc:2166
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Saltando ficheiro do qual já havia sido feito download '%s'\n"
-#: cmdline/apt-get.cc:2189
+#: cmdline/apt-get.cc:2190
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Você não possui espaço livre suficiente em %s"
-#: cmdline/apt-get.cc:2194
+#: cmdline/apt-get.cc:2195
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Preciso obter %sB/%sB de arquivos de código fonte.\n"
-#: cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2198
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Precisa obter %sB de arquivos de código fonte.\n"
-#: cmdline/apt-get.cc:2203
+#: cmdline/apt-get.cc:2204
#, c-format
msgid "Fetch source %s\n"
msgstr "Obter Código Fonte %s\n"
-#: cmdline/apt-get.cc:2234
+#: cmdline/apt-get.cc:2235
msgid "Failed to fetch some archives."
msgstr "Falha ao obter alguns arquivos."
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2263
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
"Saltando a descompactação de pacote código fonte já descompactado em %s\n"
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2275
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "O comando de descompactação '%s' falhou.\n"
-#: cmdline/apt-get.cc:2275
+#: cmdline/apt-get.cc:2276
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Verifique se o pacote 'dpkg-dev' está instalado.\n"
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2293
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "O comando de compilação '%s' falhou.\n"
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:2312
msgid "Child process failed"
msgstr "O processo filho falhou"
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2328
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Deve especificar pelo menos um pacote para verificar as dependências de "
"compilação"
-#: cmdline/apt-get.cc:2355
+#: cmdline/apt-get.cc:2356
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Impossível obter informações de dependências de compilação para %s"
-#: cmdline/apt-get.cc:2375
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s não tem dependências de compilação.\n"
-#: cmdline/apt-get.cc:2427
+#: cmdline/apt-get.cc:2428
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1224,7 +1224,7 @@ msgstr ""
"a dependência de %s por %s não pôde ser satisfeita porque o pacote %s não "
"pôde ser encontrado"
-#: cmdline/apt-get.cc:2479
+#: cmdline/apt-get.cc:2480
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1233,32 +1233,32 @@ msgstr ""
"a dependência de %s por %s não pode ser satisfeita porque nenhuma versão "
"disponível do pacote %s pode satisfazer os requisitos de versão"
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2515
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Falha ao satisfazer a dependência %s para %s: Pacote instalado %s é muito "
"novo"
-#: cmdline/apt-get.cc:2539
+#: cmdline/apt-get.cc:2540
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Falha ao satisfazer a dependência %s para %s: %s"
-#: cmdline/apt-get.cc:2553
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Não foi possível satisfazer as dependências de compilação para %s."
-#: cmdline/apt-get.cc:2557
+#: cmdline/apt-get.cc:2558
msgid "Failed to process build dependencies"
msgstr "Falha ao processar as dependências de compilação"
-#: cmdline/apt-get.cc:2589
+#: cmdline/apt-get.cc:2590
msgid "Supported modules:"
msgstr "Módulos Suportados:"
-#: cmdline/apt-get.cc:2630
+#: cmdline/apt-get.cc:2631
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1685,25 +1685,25 @@ msgstr "Erro ao fazer parse ao MD5. Offset %lu"
msgid "This is not a valid DEB archive, missing '%s' member"
msgstr "Este não é um arquivo DEB válido, falta o membro '%s'"
-#: apt-inst/deb/debfile.cc:48
-#, c-format
-msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
+#: apt-inst/deb/debfile.cc:50
+#, fuzzy, c-format
+msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
msgstr "Este não é um arquivo DEB válido, não tem '%s' ou o membro '%s'"
-#: apt-inst/deb/debfile.cc:108
+#: apt-inst/deb/debfile.cc:110
#, c-format
msgid "Couldn't change to %s"
msgstr "Não foi possível mudar para %s"
-#: apt-inst/deb/debfile.cc:134
+#: apt-inst/deb/debfile.cc:140
msgid "Internal error, could not locate member"
msgstr "Erro Interno, não foi possível localizar membro"
-#: apt-inst/deb/debfile.cc:167
+#: apt-inst/deb/debfile.cc:173
msgid "Failed to locate a valid control file"
msgstr "Falha em localizar um ficheiro de controle válido"
-#: apt-inst/deb/debfile.cc:252
+#: apt-inst/deb/debfile.cc:258
msgid "Unparsable control file"
msgstr "Ficheiro de controle não interpretável"
@@ -2070,15 +2070,15 @@ msgstr "Erro lendo do servidor. O Remoto fechou a ligação"
msgid "Error reading from server"
msgstr "Erro lendo do servidor"
-#: methods/http.cc:1108
+#: methods/http.cc:1104
msgid "Bad header data"
msgstr "Dados de cabeçalho errados"
-#: methods/http.cc:1125
+#: methods/http.cc:1121 methods/http.cc:1176
msgid "Connection failed"
msgstr "Falhou a ligação"
-#: methods/http.cc:1216
+#: methods/http.cc:1228
msgid "Internal error"
msgstr "Erro interno"
@@ -2108,7 +2108,7 @@ msgstr "Abrindo ficheiro de configuração %s"
#: apt-pkg/contrib/configuration.cc:510
#, fuzzy, c-format
-msgid "Line %d too long (max %lu)"
+msgid "Line %d too long (max %u)"
msgstr "Linha %d é demasiado longa (max %d)"
#: apt-pkg/contrib/configuration.cc:606
@@ -2363,29 +2363,29 @@ msgstr "opcional"
msgid "extra"
msgstr "extra"
-#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129
+#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
msgid "Building dependency tree"
msgstr "Construindo Árvore de Dependências"
-#: apt-pkg/depcache.cc:101
+#: apt-pkg/depcache.cc:122
msgid "Candidate versions"
msgstr "Versões Candidatas"
-#: apt-pkg/depcache.cc:130
+#: apt-pkg/depcache.cc:151
msgid "Dependency generation"
msgstr "Geração de Dependência"
-#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174
+#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
#, fuzzy
msgid "Reading state information"
msgstr "Juntando informação Disponível"
-#: apt-pkg/depcache.cc:198
+#: apt-pkg/depcache.cc:219
#, fuzzy, c-format
msgid "Failed to open StateFile %s"
msgstr "Falhou ao abrir %s"
-#: apt-pkg/depcache.cc:204
+#: apt-pkg/depcache.cc:225
#, fuzzy, c-format
msgid "Failed to write temporary StateFile %s"
msgstr "Falha ao escrever ficheiro %s"
@@ -2519,18 +2519,18 @@ msgstr "O driver do método %s não pôde ser encontrado."
msgid "Method %s did not start correctly"
msgstr "Método %s não iniciou corretamente"
-#: apt-pkg/acquire-worker.cc:381
+#: apt-pkg/acquire-worker.cc:396
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
"Por favor insira o disco denominado: '%s' no leitor '%s' e pressione enter."
-#: apt-pkg/init.cc:126
+#: apt-pkg/init.cc:124
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Sistema de empacotamento '%s' não é suportado"
-#: apt-pkg/init.cc:142
+#: apt-pkg/init.cc:140
msgid "Unable to determine a suitable packaging system type"
msgstr ""
"Não foi possível determinar um tipo de sistema de empacotamento aplicável"
@@ -2672,18 +2672,22 @@ msgstr "Erro de I/O ao gravar a cache de código fonte"
msgid "rename failed, %s (%s -> %s)."
msgstr "falhou renomear, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:401
msgid "MD5Sum mismatch"
msgstr "MD5Sum incorreto"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1405
+#, fuzzy
+msgid "Hash Sum mismatch"
+msgstr "MD5Sum incorreto"
+
+#: apt-pkg/acquire-item.cc:1097
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"Não existe qualquer chave pública disponível para as seguintes IDs de "
"chave:\n"
-#: apt-pkg/acquire-item.cc:1219
+#: apt-pkg/acquire-item.cc:1210
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2693,7 +2697,7 @@ msgstr ""
"que você precisa consertar manualmente este pacote. (devido a arquitectura "
"não especificada)."
-#: apt-pkg/acquire-item.cc:1278
+#: apt-pkg/acquire-item.cc:1269
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2702,7 +2706,7 @@ msgstr ""
"Não foi possível localizar arquivo para o pacote %s. Isto pode significar "
"que você precisa consertar manualmente este pacote."
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1310
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2710,7 +2714,7 @@ msgstr ""
"Os arquivos de índice de pacotes estão corrompidos. Nenhum campo Filename: "
"para o pacote %s."
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1397
msgid "Size mismatch"
msgstr "Tamanho incorrecto"
@@ -2800,78 +2804,88 @@ msgstr "As entradas de listas de Source para este Disco são:\n"
msgid "Unmounting CD-ROM...\n"
msgstr "A desmontar o CD-ROM...\n"
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
#, c-format
msgid "Wrote %i records.\n"
msgstr "Escreveu %i registos.\n"
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Escreveu %i registos com %i ficheiros em falta.\n"
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Escreveu %i registos com %i ficheiros não coincidentes\n"
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
"Escreveu %i registos com %i ficheiros em falta e %i ficheiros não "
"coincidentes\n"
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:522
#, c-format
msgid "Preparing %s"
msgstr "A preparar %s"
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:523
#, c-format
msgid "Unpacking %s"
msgstr "A desempacotar %s"
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:528
#, c-format
msgid "Preparing to configure %s"
msgstr "A preparar para configurar %s"
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:529
#, c-format
msgid "Configuring %s"
msgstr "A configurar %s"
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:530
#, c-format
msgid "Installed %s"
msgstr "%s instalado"
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:535
#, c-format
msgid "Preparing for removal of %s"
msgstr "A preparar para remoção de %s"
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:536
#, c-format
msgid "Removing %s"
msgstr "A remover %s"
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:537
#, c-format
msgid "Removed %s"
msgstr "%s removido"
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:542
#, c-format
msgid "Preparing to completely remove %s"
msgstr "A preparar para remover completamente %s"
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:543
#, c-format
msgid "Completely removed %s"
msgstr "Remoção completa de %s"
+#: apt-pkg/deb/dpkgpm.cc:566
+#, fuzzy, c-format
+msgid "Directory '%s' missing"
+msgstr "Falta directório de listas %spartial."
+
+#: apt-pkg/deb/dpkgpm.cc:709
+#, fuzzy, c-format
+msgid "openpty failed\n"
+msgstr "Select falhou."
+
#: methods/rred.cc:219
msgid "Could not patch file"
msgstr "Não foi possível abrir ficheiro o %s"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 87f766978..2bc067e10 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: 2007-07-06 06:51+0200\n"
+"POT-Creation-Date: 2007-08-04 09:09+0200\n"
"PO-Revision-Date: 2006-08-21 00:40-0300\n"
"Last-Translator: Felipe Augusto van de Wiel (faw) <faw@cathedrallabs.org>\n"
"Language-Team: l10n portuguese <debian-l10n-portuguese@lists.debian.org>\n"
@@ -158,9 +158,9 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2584 cmdline/apt-sortpkgs.cc:144
-#, c-format
-msgid "%s %s for %s %s compiled on %s %s\n"
+#: cmdline/apt-get.cc:2585 cmdline/apt-sortpkgs.cc:144
+#, fuzzy, c-format
+msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s para %s %s compilado em %s %s\n"
#: cmdline/apt-cache.cc:1721
@@ -658,7 +658,7 @@ msgstr "Falha ao renomear %s para %s"
msgid "Y"
msgstr "S"
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1673
#, c-format
msgid "Regex compilation error - %s"
msgstr "Erro de compilação de regex - %s"
@@ -820,11 +820,11 @@ msgstr "Pacotes precisam ser removidos mas a remoção está desabilitada."
msgid "Internal error, Ordering didn't finish"
msgstr "Erro interno, Ordenação não finalizou"
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2011 cmdline/apt-get.cc:2044
msgid "Unable to lock the download directory"
msgstr "Impossível criar lock no diretório de download"
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2092 cmdline/apt-get.cc:2333
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr "A lista de fontes não pôde ser lida."
@@ -854,7 +854,7 @@ msgstr ""
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Depois de desempacotar, %sB de espaço em disco serão liberados.\n"
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2186
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2187
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Não foi possível determinar o espaço livre em %s"
@@ -891,7 +891,7 @@ msgstr "Abortar."
msgid "Do you want to continue [Y/n]? "
msgstr "Quer continuar [S/n]? "
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2229
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2230
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Falha ao buscar %s %s\n"
@@ -900,7 +900,7 @@ msgstr "Falha ao buscar %s %s\n"
msgid "Some files failed to download"
msgstr "Alguns arquivos falharam ao baixar"
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2238
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2239
msgid "Download complete and in download only mode"
msgstr "Baixar completo e no modo somente baixar (\"download only\")"
@@ -1035,7 +1035,7 @@ msgid ""
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1754
msgid "The following information may help to resolve the situation:"
msgstr "A informação a seguir pode ajudar a resolver a situação:"
@@ -1048,31 +1048,31 @@ msgstr "Erro interno, o solucionador de problemas quebrou coisas"
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Erro interno, AllUpgrade quebrou as coisas"
-#: cmdline/apt-get.cc:1544
+#: cmdline/apt-get.cc:1545
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "Impossível achar pacote %s"
-#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
+#: cmdline/apt-get.cc:1660 cmdline/apt-get.cc:1696
#, c-format
msgid "Couldn't find package %s"
msgstr "Impossível achar pacote %s"
-#: cmdline/apt-get.cc:1682
+#: cmdline/apt-get.cc:1683
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Nota, selecionando %s para expressão regular '%s'\n"
-#: cmdline/apt-get.cc:1712
+#: cmdline/apt-get.cc:1713
#, fuzzy, c-format
msgid "%s set to manual installed.\n"
msgstr "mas %s está para ser instalado"
-#: cmdline/apt-get.cc:1725
+#: cmdline/apt-get.cc:1726
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Você deve querer executar `apt-get -f install' para corrigir isso:"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1729
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1080,7 +1080,7 @@ msgstr ""
"Dependências desencontradas. Tente `apt-get -f install' sem nenhum pacote "
"(ou especifique uma solução)."
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1741
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1092,7 +1092,7 @@ msgstr ""
"distribuição instável, que alguns pacotes requeridos não foram\n"
"criados ainda ou foram tirados do Incoming."
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1749
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1102,117 +1102,117 @@ msgstr ""
"esteja simplesmente não instalável e um relato de erro sobre esse\n"
"pacotes deve ser enviado."
-#: cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1757
msgid "Broken packages"
msgstr "Pacotes quebrados"
-#: cmdline/apt-get.cc:1785
+#: cmdline/apt-get.cc:1786
msgid "The following extra packages will be installed:"
msgstr "Os pacotes extra a seguir serão instalados:"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Suggested packages:"
msgstr "Pacotes sugeridos:"
-#: cmdline/apt-get.cc:1875
+#: cmdline/apt-get.cc:1876
msgid "Recommended packages:"
msgstr "Pacotes recomendados:"
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1904
msgid "Calculating upgrade... "
msgstr "Calculando atualização... "
-#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1907 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Falhou"
-#: cmdline/apt-get.cc:1911
+#: cmdline/apt-get.cc:1912
msgid "Done"
msgstr "Pronto"
-#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
+#: cmdline/apt-get.cc:1979 cmdline/apt-get.cc:1987
msgid "Internal error, problem resolver broke stuff"
msgstr "Erro interno, o solucionador de problemas quebrou coisas"
-#: cmdline/apt-get.cc:2086
+#: cmdline/apt-get.cc:2087
msgid "Must specify at least one package to fetch source for"
msgstr "Deve-se especificar pelo menos um pacote para que se busque o fonte"
-#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2350
+#: cmdline/apt-get.cc:2117 cmdline/apt-get.cc:2351
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Impossível encontrar um pacote fonte para %s"
-#: cmdline/apt-get.cc:2165
+#: cmdline/apt-get.cc:2166
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Ignorando arquivo já obtido '%s'\n"
-#: cmdline/apt-get.cc:2189
+#: cmdline/apt-get.cc:2190
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Você não possui espaço livre suficiente em %s"
-#: cmdline/apt-get.cc:2194
+#: cmdline/apt-get.cc:2195
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Preciso obter %sB/%sB de arquivos fonte.\n"
-#: cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2198
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Precisa obter %sB de arquivos fonte.\n"
-#: cmdline/apt-get.cc:2203
+#: cmdline/apt-get.cc:2204
#, c-format
msgid "Fetch source %s\n"
msgstr "Obter fonte %s\n"
-#: cmdline/apt-get.cc:2234
+#: cmdline/apt-get.cc:2235
msgid "Failed to fetch some archives."
msgstr "Falha ao buscar alguns arquivos."
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2263
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Ignorando desempacotamento de fonte já desempacotado em %s\n"
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2275
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Comando de desempacotamento '%s' falhou.\n"
-#: cmdline/apt-get.cc:2275
+#: cmdline/apt-get.cc:2276
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Confira se o pacote 'dpkg-dev' está instalado.\n"
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2293
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Comando de construção '%s' falhou.\n"
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:2312
msgid "Child process failed"
msgstr "Processo filho falhou"
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2328
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Deve-se especificar pelo menos um pacote para que se cheque as dependências "
"de construção"
-#: cmdline/apt-get.cc:2355
+#: cmdline/apt-get.cc:2356
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Impossível conseguir informações de dependência de construção para %s"
-#: cmdline/apt-get.cc:2375
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s não tem dependências de construção.\n"
-#: cmdline/apt-get.cc:2427
+#: cmdline/apt-get.cc:2428
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1221,7 +1221,7 @@ msgstr ""
"a dependência de %s por %s não pôde ser satisfeita porque o pacote %s não "
"pôde ser encontrado"
-#: cmdline/apt-get.cc:2479
+#: cmdline/apt-get.cc:2480
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1230,32 +1230,32 @@ msgstr ""
"a dependência de %s por %s não pôde ser satisfeita porque nenhuma versão "
"disponível do pacote %s pôde satisfazer os requerimentos de versão"
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2515
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Falha ao satisfazer a dependência de %s por %s: Pacote instalado %s é muito "
"novo"
-#: cmdline/apt-get.cc:2539
+#: cmdline/apt-get.cc:2540
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Falha ao satisfazer dependência de %s por %s: %s"
-#: cmdline/apt-get.cc:2553
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Não foi possível satisfazer as dependências de compilação para %s."
-#: cmdline/apt-get.cc:2557
+#: cmdline/apt-get.cc:2558
msgid "Failed to process build dependencies"
msgstr "Falha ao processar as dependências de construção"
-#: cmdline/apt-get.cc:2589
+#: cmdline/apt-get.cc:2590
msgid "Supported modules:"
msgstr "Módulos suportados:"
-#: cmdline/apt-get.cc:2630
+#: cmdline/apt-get.cc:2631
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1683,26 +1683,26 @@ msgstr "Erro interpretando MD5. Posição %lu"
msgid "This is not a valid DEB archive, missing '%s' member"
msgstr "Este não é um arquivo DEB válido, membro '%s' faltando"
-#: apt-inst/deb/debfile.cc:48
-#, c-format
-msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
+#: apt-inst/deb/debfile.cc:50
+#, fuzzy, c-format
+msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
msgstr ""
"Este não é um arquivo DEB válido, o mesmo não possui um membro '%s' ou '%s'"
-#: apt-inst/deb/debfile.cc:108
+#: apt-inst/deb/debfile.cc:110
#, c-format
msgid "Couldn't change to %s"
msgstr "Não foi possível mudar para %s"
-#: apt-inst/deb/debfile.cc:134
+#: apt-inst/deb/debfile.cc:140
msgid "Internal error, could not locate member"
msgstr "Erro interno, não foi possível localizar membro"
-#: apt-inst/deb/debfile.cc:167
+#: apt-inst/deb/debfile.cc:173
msgid "Failed to locate a valid control file"
msgstr "Falha em localizar um arquivo de controle válido"
-#: apt-inst/deb/debfile.cc:252
+#: apt-inst/deb/debfile.cc:258
msgid "Unparsable control file"
msgstr "Arquivo de controle não interpretável"
@@ -2069,15 +2069,15 @@ msgstr "Erro lendo do servidor. Ponto remoto fechou a conexão"
msgid "Error reading from server"
msgstr "Erro lendo do servidor"
-#: methods/http.cc:1108
+#: methods/http.cc:1104
msgid "Bad header data"
msgstr "Dados de cabeçalho ruins"
-#: methods/http.cc:1125
+#: methods/http.cc:1121 methods/http.cc:1176
msgid "Connection failed"
msgstr "Conexão falhou"
-#: methods/http.cc:1216
+#: methods/http.cc:1228
msgid "Internal error"
msgstr "Erro interno"
@@ -2107,7 +2107,7 @@ msgstr "Abrindo arquivo de configuração %s"
#: apt-pkg/contrib/configuration.cc:510
#, fuzzy, c-format
-msgid "Line %d too long (max %lu)"
+msgid "Line %d too long (max %u)"
msgstr "Linha %d muito longa (máx. %d)"
#: apt-pkg/contrib/configuration.cc:606
@@ -2362,29 +2362,29 @@ msgstr "opcional"
msgid "extra"
msgstr "extra"
-#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129
+#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
msgid "Building dependency tree"
msgstr "Construindo árvore de dependências"
-#: apt-pkg/depcache.cc:101
+#: apt-pkg/depcache.cc:122
msgid "Candidate versions"
msgstr "Versões candidatas"
-#: apt-pkg/depcache.cc:130
+#: apt-pkg/depcache.cc:151
msgid "Dependency generation"
msgstr "Geração de dependência"
-#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174
+#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
#, fuzzy
msgid "Reading state information"
msgstr "Mesclando informação disponível"
-#: apt-pkg/depcache.cc:198
+#: apt-pkg/depcache.cc:219
#, fuzzy, c-format
msgid "Failed to open StateFile %s"
msgstr "Falha ao abrir %s"
-#: apt-pkg/depcache.cc:204
+#: apt-pkg/depcache.cc:225
#, fuzzy, c-format
msgid "Failed to write temporary StateFile %s"
msgstr "Falha ao gravar arquivo %s"
@@ -2519,18 +2519,18 @@ msgstr "O driver do método %s não pôde ser encontrado."
msgid "Method %s did not start correctly"
msgstr "Método %s não iniciou corretamente"
-#: apt-pkg/acquire-worker.cc:381
+#: apt-pkg/acquire-worker.cc:396
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
"Por favor, insira o disco nomeado: '%s' no leitor '%s' e pressione enter."
-#: apt-pkg/init.cc:126
+#: apt-pkg/init.cc:124
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Sistema de empacotamento '%s' não é suportado"
-#: apt-pkg/init.cc:142
+#: apt-pkg/init.cc:140
msgid "Unable to determine a suitable packaging system type"
msgstr ""
"Não foi possível determinar um tipo de sistema de empacotamento aplicável."
@@ -2672,16 +2672,20 @@ msgstr "Erro de I/O ao gravar cache fonte"
msgid "rename failed, %s (%s -> %s)."
msgstr "renomeação falhou, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:401
msgid "MD5Sum mismatch"
msgstr "MD5Sum incorreto"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1405
+#, fuzzy
+msgid "Hash Sum mismatch"
+msgstr "MD5Sum incorreto"
+
+#: apt-pkg/acquire-item.cc:1097
msgid "There is no public key available for the following key IDs:\n"
msgstr "Não existem chaves públicas para os seguintes IDs de chaves:\n"
-#: apt-pkg/acquire-item.cc:1219
+#: apt-pkg/acquire-item.cc:1210
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2691,7 +2695,7 @@ msgstr ""
"que você precisa consertar manualmente este pacote. (devido a arquitetura "
"não especificada)."
-#: apt-pkg/acquire-item.cc:1278
+#: apt-pkg/acquire-item.cc:1269
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2700,7 +2704,7 @@ msgstr ""
"Não foi possível localizar arquivo para o pacote %s. Isto pode significar "
"que você precisa consertar manualmente este pacote."
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1310
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2708,7 +2712,7 @@ msgstr ""
"Os arquivos de índice de pacotes estão corrompidos. Nenhum campo Filename: "
"para o pacote %s."
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1397
msgid "Size mismatch"
msgstr "Tamanho incorreto"
@@ -2801,78 +2805,88 @@ msgstr "Entradas na lista de fontes para este disco são:\n"
msgid "Unmounting CD-ROM...\n"
msgstr "Desmontando CD-ROM..."
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
#, c-format
msgid "Wrote %i records.\n"
msgstr "Gravados %i registros.\n"
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Gravados %i registros com %i arquivos faltando.\n"
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Gravados %i registros com %i arquivos que não combinam\n"
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
"Gravados %i registros com %i arquivos faltando e %i arquivos que não "
"combinam\n"
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:522
#, c-format
msgid "Preparing %s"
msgstr "Preparando %s"
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:523
#, c-format
msgid "Unpacking %s"
msgstr "Desempacotando %s"
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:528
#, c-format
msgid "Preparing to configure %s"
msgstr "Preparando para configurar %s"
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:529
#, c-format
msgid "Configuring %s"
msgstr "Configurando %s"
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:530
#, c-format
msgid "Installed %s"
msgstr "%s instalado"
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:535
#, c-format
msgid "Preparing for removal of %s"
msgstr "Preparando para a remoção de %s"
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:536
#, c-format
msgid "Removing %s"
msgstr "Removendo %s"
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:537
#, c-format
msgid "Removed %s"
msgstr "%s removido"
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:542
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Preparando para remover completamente %s"
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:543
#, c-format
msgid "Completely removed %s"
msgstr "%s completamente removido"
+#: apt-pkg/deb/dpkgpm.cc:566
+#, fuzzy, c-format
+msgid "Directory '%s' missing"
+msgstr "Diretório de listas %spartial está faltando."
+
+#: apt-pkg/deb/dpkgpm.cc:709
+#, fuzzy, c-format
+msgid "openpty failed\n"
+msgstr "Seleção falhou"
+
#: methods/rred.cc:219
msgid "Could not patch file"
msgstr "Não foi possível aplicar o patch"
diff --git a/po/ro.po b/po/ro.po
index 0a3e7c97c..1eec5fcca 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po_ro\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-06 06:51+0200\n"
+"POT-Creation-Date: 2007-08-04 09:09+0200\n"
"PO-Revision-Date: 2006-09-19 01:35+0300\n"
"Last-Translator: Sorin Batariuc <sorin@bonbon.net>\n"
"Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"
@@ -159,9 +159,9 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2584 cmdline/apt-sortpkgs.cc:144
-#, c-format
-msgid "%s %s for %s %s compiled on %s %s\n"
+#: cmdline/apt-get.cc:2585 cmdline/apt-sortpkgs.cc:144
+#, fuzzy, c-format
+msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s pentru %s %s compilat pe %s %s\n"
#: cmdline/apt-cache.cc:1721
@@ -664,7 +664,7 @@ msgstr "Eşuare în a redenumi %s în %s"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1673
#, c-format
msgid "Regex compilation error - %s"
msgstr "Eroare de compilare expresie regulată - %s"
@@ -825,11 +825,11 @@ msgstr "Pachete trebuiesc şterse dar ştergerea este dezactivată."
msgid "Internal error, Ordering didn't finish"
msgstr "Eroare internă, Ordering nu s-a terminat"
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2011 cmdline/apt-get.cc:2044
msgid "Unable to lock the download directory"
msgstr "Nu pot încuia directorul de descărcare"
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2092 cmdline/apt-get.cc:2333
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr "Lista surselor nu poate fi citită."
@@ -859,7 +859,7 @@ msgstr "După despachetare va fi folosit %sB de spaţiu suplimentar pe disc.\n"
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "După despachetare va fi eliberat %sB din spaţiul de pe disc.\n"
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2186
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2187
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "N-am putut determina spaţiul disponibil în %s"
@@ -897,7 +897,7 @@ msgstr "Renunţare."
msgid "Do you want to continue [Y/n]? "
msgstr "Vreţi să continuaţi [Y/n]? "
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2229
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2230
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Eşuare în aducerea %s %s\n"
@@ -906,7 +906,7 @@ msgstr "Eşuare în aducerea %s %s\n"
msgid "Some files failed to download"
msgstr "Eşuare în descărcarea unor fişiere"
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2238
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2239
msgid "Download complete and in download only mode"
msgstr "Descărcare completă şi în modul doar descărcare"
@@ -1040,7 +1040,7 @@ msgid ""
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1754
msgid "The following information may help to resolve the situation:"
msgstr "Următoarele informaţii ar putea să vă ajute la rezolvarea situaţiei:"
@@ -1054,31 +1054,31 @@ msgstr ""
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Eroare internă, înnoire totală a defectat diverse chestiuni"
-#: cmdline/apt-get.cc:1544
+#: cmdline/apt-get.cc:1545
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "Nu pot găsi pachetul %s"
-#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
+#: cmdline/apt-get.cc:1660 cmdline/apt-get.cc:1696
#, c-format
msgid "Couldn't find package %s"
msgstr "Nu pot găsi pachetul %s"
-#: cmdline/apt-get.cc:1682
+#: cmdline/apt-get.cc:1683
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Notă, selectare %s pentru expresie regulată '%s'\n"
-#: cmdline/apt-get.cc:1712
+#: cmdline/apt-get.cc:1713
#, fuzzy, c-format
msgid "%s set to manual installed.\n"
msgstr "dar %s este pe cale de a fi instalat"
-#: cmdline/apt-get.cc:1725
+#: cmdline/apt-get.cc:1726
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Aţi putea porni 'apt-get -f install' pentru a corecta acestea:"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1729
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1086,7 +1086,7 @@ msgstr ""
"Dependenţe neîndeplinite. Încercaţi 'apt-get -f install' fără nici un pachet "
"(sau oferiţi o altă soluţie)."
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1741
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1099,7 +1099,7 @@ msgstr ""
"pachete\n"
"cerute n-au fost create încă sau au fost mutate din Incoming."
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1749
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1109,118 +1109,118 @@ msgstr ""
" că pachetul pur şi simplu nu este instalabil şi un raport de eroare pentru\n"
"acest pachet ar trebui completat."
-#: cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1757
msgid "Broken packages"
msgstr "Pachete deteriorate"
-#: cmdline/apt-get.cc:1785
+#: cmdline/apt-get.cc:1786
msgid "The following extra packages will be installed:"
msgstr "Următoarele extra pachete vor fi instalate:"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Suggested packages:"
msgstr "Pachete sugerate:"
-#: cmdline/apt-get.cc:1875
+#: cmdline/apt-get.cc:1876
msgid "Recommended packages:"
msgstr "Pachete recomandate:"
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1904
msgid "Calculating upgrade... "
msgstr "Calculez înnoirea... "
-#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1907 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Eşuare"
-#: cmdline/apt-get.cc:1911
+#: cmdline/apt-get.cc:1912
msgid "Done"
msgstr "Terminat"
-#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
+#: cmdline/apt-get.cc:1979 cmdline/apt-get.cc:1987
msgid "Internal error, problem resolver broke stuff"
msgstr ""
"Eroare internă, rezolvatorul de probleme a deteriorat diverse chestiuni"
-#: cmdline/apt-get.cc:2086
+#: cmdline/apt-get.cc:2087
msgid "Must specify at least one package to fetch source for"
msgstr "Trebuie specificat cel puţin un pachet pentru a-i aduce sursa"
-#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2350
+#: cmdline/apt-get.cc:2117 cmdline/apt-get.cc:2351
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Nu pot găsi o sursă pachet pentru %s"
-#: cmdline/apt-get.cc:2165
+#: cmdline/apt-get.cc:2166
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Sar peste fişierul deja descărcat '%s'\n"
-#: cmdline/apt-get.cc:2189
+#: cmdline/apt-get.cc:2190
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Nu aveţi suficient spaţiu în %s"
-#: cmdline/apt-get.cc:2194
+#: cmdline/apt-get.cc:2195
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Este nevoie să descărcaţi %sB/%sB din arhivele surselor.\n"
-#: cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2198
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Este nevoie să descărcaţi %sB din arhivele surselor.\n"
-#: cmdline/apt-get.cc:2203
+#: cmdline/apt-get.cc:2204
#, c-format
msgid "Fetch source %s\n"
msgstr "Aducere sursa %s\n"
-#: cmdline/apt-get.cc:2234
+#: cmdline/apt-get.cc:2235
msgid "Failed to fetch some archives."
msgstr "Eşuare în a aduce unele arhive."
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2263
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Sar peste despachetarea sursei deja despachetate în %s\n"
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2275
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Comanda de despachetare '%s' eşuată.\n"
-#: cmdline/apt-get.cc:2275
+#: cmdline/apt-get.cc:2276
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Verificaţi dacă pachetul 'dpkg-dev' este instalat.\n"
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2293
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Comanda de construire '%s' eşuată.\n"
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:2312
msgid "Child process failed"
msgstr "Eşuare proces copil"
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2328
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Trebuie specificat cel puţin un pachet pentru a-i verifica dependenţele "
"înglobate"
-#: cmdline/apt-get.cc:2355
+#: cmdline/apt-get.cc:2356
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Nu pot prelua informaţiile despre dependenţele înglobate ale lui %s"
-#: cmdline/apt-get.cc:2375
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nu are dependenţe înglobate.\n"
-#: cmdline/apt-get.cc:2427
+#: cmdline/apt-get.cc:2428
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1229,7 +1229,7 @@ msgstr ""
"Dependenţa lui %s de %s nu poate fi satisfăcută deoarece pachetul %s nu "
"poate fi găsit"
-#: cmdline/apt-get.cc:2479
+#: cmdline/apt-get.cc:2480
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1238,32 +1238,32 @@ msgstr ""
"Dependenţa lui %s de %s nu poate fi satisfăcută deoarece nici o versiune "
"disponibilă a pachetului %s nu poate satisface versiunile cerute"
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2515
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Eşuare în a satisface dependenţa lui %s de %s: Pachetul instalat %s este "
"prea nou"
-#: cmdline/apt-get.cc:2539
+#: cmdline/apt-get.cc:2540
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Eşuare în a satisface dependenţa lui %s de %s: %s"
-#: cmdline/apt-get.cc:2553
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Dependenţele înglobate pentru %s nu pot fi satisfăcute."
-#: cmdline/apt-get.cc:2557
+#: cmdline/apt-get.cc:2558
msgid "Failed to process build dependencies"
msgstr "Eşuare în a prelucra dependenţele înglobate"
-#: cmdline/apt-get.cc:2589
+#: cmdline/apt-get.cc:2590
msgid "Supported modules:"
msgstr "Module suportate:"
-#: cmdline/apt-get.cc:2630
+#: cmdline/apt-get.cc:2631
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1693,25 +1693,25 @@ msgstr "Eroare la analiza MD5. Offset %lu"
msgid "This is not a valid DEB archive, missing '%s' member"
msgstr "Aceasta nu este o arhivă DEB validă, lipseşte membrul '%s'"
-#: apt-inst/deb/debfile.cc:48
-#, c-format
-msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
+#: apt-inst/deb/debfile.cc:50
+#, fuzzy, c-format
+msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
msgstr "Aceasta nu este o arhivă DEB validă, nu are membrul '%s' sau '%s'"
-#: apt-inst/deb/debfile.cc:108
+#: apt-inst/deb/debfile.cc:110
#, c-format
msgid "Couldn't change to %s"
msgstr "Nu pot schimba la %s"
-#: apt-inst/deb/debfile.cc:134
+#: apt-inst/deb/debfile.cc:140
msgid "Internal error, could not locate member"
msgstr "Eroare internă, nu pot localiza membrul"
-#: apt-inst/deb/debfile.cc:167
+#: apt-inst/deb/debfile.cc:173
msgid "Failed to locate a valid control file"
msgstr "Eşuare de localizare a unui fişier de control valid"
-#: apt-inst/deb/debfile.cc:252
+#: apt-inst/deb/debfile.cc:258
msgid "Unparsable control file"
msgstr "Fişier de control neanalizabil"
@@ -2077,15 +2077,15 @@ msgstr ""
msgid "Error reading from server"
msgstr "Eroare la citirea de pe server"
-#: methods/http.cc:1108
+#: methods/http.cc:1104
msgid "Bad header data"
msgstr "Antet de date necorespunzător"
-#: methods/http.cc:1125
+#: methods/http.cc:1121 methods/http.cc:1176
msgid "Connection failed"
msgstr "Conectare eşuată"
-#: methods/http.cc:1216
+#: methods/http.cc:1228
msgid "Internal error"
msgstr "Eroare internă"
@@ -2115,7 +2115,7 @@ msgstr "Deschidere fişier de configurare %s"
#: apt-pkg/contrib/configuration.cc:510
#, fuzzy, c-format
-msgid "Line %d too long (max %lu)"
+msgid "Line %d too long (max %u)"
msgstr "Linie %d prea lungă (max %d)"
#: apt-pkg/contrib/configuration.cc:606
@@ -2370,29 +2370,29 @@ msgstr "opţional"
msgid "extra"
msgstr "extra"
-#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129
+#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
msgid "Building dependency tree"
msgstr "Se construieşte arborele de dependenţă"
-#: apt-pkg/depcache.cc:101
+#: apt-pkg/depcache.cc:122
msgid "Candidate versions"
msgstr "Versiuni candidat"
-#: apt-pkg/depcache.cc:130
+#: apt-pkg/depcache.cc:151
msgid "Dependency generation"
msgstr "Generare dependenţe"
-#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174
+#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
#, fuzzy
msgid "Reading state information"
msgstr "Unirea informaţiilor disponibile"
-#: apt-pkg/depcache.cc:198
+#: apt-pkg/depcache.cc:219
#, fuzzy, c-format
msgid "Failed to open StateFile %s"
msgstr "Eşuare la deschiderea %s"
-#: apt-pkg/depcache.cc:204
+#: apt-pkg/depcache.cc:225
#, fuzzy, c-format
msgid "Failed to write temporary StateFile %s"
msgstr "Eşuare în scrierea fişierului %s"
@@ -2525,18 +2525,18 @@ msgstr "Metoda driver %s nu poate fi găsită."
msgid "Method %s did not start correctly"
msgstr "Metoda %s nu s-a lansat corect"
-#: apt-pkg/acquire-worker.cc:381
+#: apt-pkg/acquire-worker.cc:396
#, 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."
-#: apt-pkg/init.cc:126
+#: apt-pkg/init.cc:124
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Sistemul de pachete '%s' nu este suportat"
-#: apt-pkg/init.cc:142
+#: apt-pkg/init.cc:140
msgid "Unable to determine a suitable packaging system type"
msgstr "Nu pot determina un tip de sistem de pachete potrivit"
@@ -2678,18 +2678,22 @@ msgstr "Eroare IO în timpul salvării sursei cache"
msgid "rename failed, %s (%s -> %s)."
msgstr "redenumire eşuată, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:401
msgid "MD5Sum mismatch"
msgstr "Nepotrivire MD5Sum"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1405
+#, fuzzy
+msgid "Hash Sum mismatch"
+msgstr "Nepotrivire MD5Sum"
+
+#: apt-pkg/acquire-item.cc:1097
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"Nu există nici o cheie publică disponibilă pentru următoarele "
"identificatoare de chei:\n"
-#: apt-pkg/acquire-item.cc:1219
+#: apt-pkg/acquire-item.cc:1210
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2698,7 +2702,7 @@ msgstr ""
"N-am putut localiza un fişier pentru pachetul %s. Aceasta ar putea însemna "
"că aveţi nevoie să reparaţi manual acest pachet (din pricina unui arch lipsă)"
-#: apt-pkg/acquire-item.cc:1278
+#: apt-pkg/acquire-item.cc:1269
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2707,7 +2711,7 @@ msgstr ""
"N-am putut localiza un fişier pentru pachetul %s. Aceasta ar putea însemna "
"că aveţi nevoie să depanaţi manual acest pachet."
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1310
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2715,7 +2719,7 @@ msgstr ""
"Fişierele index de pachete sunt deteriorate. Fără câmpul 'nume fişier:' la "
"pachetul %s."
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1397
msgid "Size mismatch"
msgstr "Nepotrivire dimensiune"
@@ -2806,77 +2810,87 @@ msgstr "Intrările listei surselor pentru acest disc sunt:\n"
msgid "Unmounting CD-ROM...\n"
msgstr "Demontez CD-ROM..."
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
#, c-format
msgid "Wrote %i records.\n"
msgstr "S-au scris %i înregistrări.\n"
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "S-au scris %i înregistrări cu %i fişiere lipsă.\n"
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "S-au scris %i înregistrări cu %i fişiere nepotrivite\n"
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
#, 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"
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:522
#, c-format
msgid "Preparing %s"
msgstr "Se pregăteşte %s"
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:523
#, c-format
msgid "Unpacking %s"
msgstr "Se despachetează %s"
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:528
#, c-format
msgid "Preparing to configure %s"
msgstr "Se pregăteşte configurarea %s"
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:529
#, c-format
msgid "Configuring %s"
msgstr "Se configurează %s"
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:530
#, c-format
msgid "Installed %s"
msgstr "Instalat %s"
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:535
#, c-format
msgid "Preparing for removal of %s"
msgstr "Se pregăteşte ştergerea lui %s"
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:536
#, c-format
msgid "Removing %s"
msgstr "Se şterge %s"
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:537
#, c-format
msgid "Removed %s"
msgstr "Şters %s"
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:542
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Se pregăteşte ştergerea completă a %s"
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:543
#, c-format
msgid "Completely removed %s"
msgstr "Şters complet %s"
+#: apt-pkg/deb/dpkgpm.cc:566
+#, fuzzy, c-format
+msgid "Directory '%s' missing"
+msgstr "Directorul de liste %spartial lipseşte."
+
+#: apt-pkg/deb/dpkgpm.cc:709
+#, fuzzy, c-format
+msgid "openpty failed\n"
+msgstr "Eşuarea selecţiei"
+
#: methods/rred.cc:219
#, fuzzy
msgid "Could not patch file"
diff --git a/po/ru.po b/po/ru.po
index 1d76eb2e2..aa0e9e426 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.6.46.4\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-06 06:51+0200\n"
+"POT-Creation-Date: 2007-08-04 09:09+0200\n"
"PO-Revision-Date: 2007-01-03 23:33+0300\n"
"Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -167,9 +167,9 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2584 cmdline/apt-sortpkgs.cc:144
-#, c-format
-msgid "%s %s for %s %s compiled on %s %s\n"
+#: cmdline/apt-get.cc:2585 cmdline/apt-sortpkgs.cc:144
+#, fuzzy, c-format
+msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s для %s %s скомпилирован %s %s\n"
#: cmdline/apt-cache.cc:1721
@@ -672,7 +672,7 @@ msgstr "Не удалось переименовать %s в %s"
msgid "Y"
msgstr "д"
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1673
#, c-format
msgid "Regex compilation error - %s"
msgstr "Ошибка компиляции регулярного выражения - %s"
@@ -838,11 +838,11 @@ msgstr "Пакеты необходимо удалить, но удаление
msgid "Internal error, Ordering didn't finish"
msgstr "Внутренняя ошибка, Ordering не завершилась"
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2011 cmdline/apt-get.cc:2044
msgid "Unable to lock the download directory"
msgstr "Невозможно заблокировать каталог для загрузки"
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2092 cmdline/apt-get.cc:2333
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr "Не читается перечень источников."
@@ -873,7 +873,7 @@ msgid "After unpacking %sB disk space will be freed.\n"
msgstr ""
"После распаковки объем занятого дискового пространства уменьшится на %sB.\n"
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2186
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2187
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Не удалось определить количество свободного места в %s"
@@ -912,7 +912,7 @@ msgstr "Аварийное завершение."
msgid "Do you want to continue [Y/n]? "
msgstr "Хотите продолжить [Д/н]? "
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2229
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2230
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Не удалось загрузить %s %s\n"
@@ -921,7 +921,7 @@ msgstr "Не удалось загрузить %s %s\n"
msgid "Some files failed to download"
msgstr "Некоторые файлы не удалось загрузить"
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2238
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2239
msgid "Download complete and in download only mode"
msgstr "Указан режим \"только загрузка\", и загрузка завершена"
@@ -1056,7 +1056,7 @@ msgid ""
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1754
msgid "The following information may help to resolve the situation:"
msgstr "Следующая информация, возможно, поможет вам:"
@@ -1069,33 +1069,33 @@ msgstr "Внутренняя ошибка, решатель проблем вс�
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Внутренняя ошибка, AllUpgrade все поломал"
-#: cmdline/apt-get.cc:1544
+#: cmdline/apt-get.cc:1545
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "Не удалось найти пакет %s"
-#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
+#: cmdline/apt-get.cc:1660 cmdline/apt-get.cc:1696
#, c-format
msgid "Couldn't find package %s"
msgstr "Не удалось найти пакет %s"
-#: cmdline/apt-get.cc:1682
+#: cmdline/apt-get.cc:1683
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Заметьте, регулярное выражение %2$s приводит к выбору %1$s\n"
-#: cmdline/apt-get.cc:1712
+#: cmdline/apt-get.cc:1713
#, fuzzy, c-format
msgid "%s set to manual installed.\n"
msgstr "но %s будет установлен"
-#: cmdline/apt-get.cc:1725
+#: cmdline/apt-get.cc:1726
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
"Возможно, для исправления этих ошибок вы захотите воспользоваться `apt-get -"
"f install':"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1729
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1103,7 +1103,7 @@ msgstr ""
"Неудовлетворённые зависимости. Попытайтесь выполнить 'apt-get -f install', "
"не указывая имени пакета, (или найдите другое решение)."
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1741
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1114,7 +1114,7 @@ msgstr ""
"или же используете нестабильную версию дистрибутива, где запрошенные вами\n"
"пакеты ещё не созданы или были удалены из Incoming."
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1749
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1124,121 +1124,121 @@ msgstr ""
"пакет просто не может быть установлен из-за ошибок в самом пакете.\n"
"Необходимо послать отчёт об этой ошибке."
-#: cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1757
msgid "Broken packages"
msgstr "Сломанные пакеты"
-#: cmdline/apt-get.cc:1785
+#: cmdline/apt-get.cc:1786
msgid "The following extra packages will be installed:"
msgstr "Будут установлены следующие дополнительные пакеты:"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Suggested packages:"
msgstr "Предлагаемые пакеты:"
-#: cmdline/apt-get.cc:1875
+#: cmdline/apt-get.cc:1876
msgid "Recommended packages:"
msgstr "Рекомендуемые пакеты:"
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1904
msgid "Calculating upgrade... "
msgstr "Расчёт обновлений... "
-#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1907 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Неудачно"
-#: cmdline/apt-get.cc:1911
+#: cmdline/apt-get.cc:1912
msgid "Done"
msgstr "Готово"
-#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
+#: cmdline/apt-get.cc:1979 cmdline/apt-get.cc:1987
msgid "Internal error, problem resolver broke stuff"
msgstr "Внутренняя ошибка, решатель проблем всё поломал"
-#: cmdline/apt-get.cc:2086
+#: cmdline/apt-get.cc:2087
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Укажите как минимум один пакет, для которого необходимо загрузить исходные "
"тексты"
-#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2350
+#: cmdline/apt-get.cc:2117 cmdline/apt-get.cc:2351
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Невозможно найти пакет с исходными текстами для %s"
-#: cmdline/apt-get.cc:2165
+#: cmdline/apt-get.cc:2166
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Пропускаем уже загруженный файл '%s'\n"
-#: cmdline/apt-get.cc:2189
+#: cmdline/apt-get.cc:2190
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Недостаточно места в %s"
-#: cmdline/apt-get.cc:2194
+#: cmdline/apt-get.cc:2195
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Необходимо загрузить %sB/%sB из архивов исходных текстов.\n"
-#: cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2198
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Нужно загрузить %sB архивов с исходными текстами.\n"
-#: cmdline/apt-get.cc:2203
+#: cmdline/apt-get.cc:2204
#, c-format
msgid "Fetch source %s\n"
msgstr "Загрузка исходных текстов %s\n"
-#: cmdline/apt-get.cc:2234
+#: cmdline/apt-get.cc:2235
msgid "Failed to fetch some archives."
msgstr "Некоторые архивы не удалось загрузить."
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2263
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
"Распаковка исходных текстов пропущена, так как в %s уже находятся "
"распакованные исходные тексты\n"
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2275
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Команда распаковки '%s' завершилась неудачно.\n"
-#: cmdline/apt-get.cc:2275
+#: cmdline/apt-get.cc:2276
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Проверьте, установлен ли пакет 'dpkg-dev'.\n"
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2293
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Команда сборки '%s' завершилась неудачно.\n"
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:2312
msgid "Child process failed"
msgstr "Порождённый процесс завершился неудачно"
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2328
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Для проверки зависимостей для сборки необходимо указать как минимум один "
"пакет"
-#: cmdline/apt-get.cc:2355
+#: cmdline/apt-get.cc:2356
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Невозможно получить информацию о зависимостях для сборки %s"
-#: cmdline/apt-get.cc:2375
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s не имеет зависимостей для сборки.\n"
-#: cmdline/apt-get.cc:2427
+#: cmdline/apt-get.cc:2428
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1247,7 +1247,7 @@ msgstr ""
"Зависимость типа %s для %s не может быть удовлетворена, так как пакет %s не "
"найден"
-#: cmdline/apt-get.cc:2479
+#: cmdline/apt-get.cc:2480
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1256,32 +1256,32 @@ msgstr ""
"Зависимость типа %s для %s не может быть удовлетворена, поскольку ни одна из "
"версий пакета %s не удовлетворяет требованиям"
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2515
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Не удалось удовлетворить зависимость типа %s для пакета %s: Установленный "
"пакет %s новее, чем надо"
-#: cmdline/apt-get.cc:2539
+#: cmdline/apt-get.cc:2540
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Невозможно удовлетворить зависимость типа %s для пакета %s: %s"
-#: cmdline/apt-get.cc:2553
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Зависимости для сборки %s не могут быть удовлетворены."
-#: cmdline/apt-get.cc:2557
+#: cmdline/apt-get.cc:2558
msgid "Failed to process build dependencies"
msgstr "Обработка зависимостей для сборки завершилась неудачно"
-#: cmdline/apt-get.cc:2589
+#: cmdline/apt-get.cc:2590
msgid "Supported modules:"
msgstr "Поддерживаемые модули:"
-#: cmdline/apt-get.cc:2630
+#: cmdline/apt-get.cc:2631
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1706,25 +1706,25 @@ msgstr "Ошибка чтения контрольной суммы. Смеще�
msgid "This is not a valid DEB archive, missing '%s' member"
msgstr "Это неправильный DEB-архив - отсутствует составная часть '%s'"
-#: apt-inst/deb/debfile.cc:48
-#, c-format
-msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
+#: apt-inst/deb/debfile.cc:50
+#, fuzzy, c-format
+msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
msgstr "Это неправильный DEB-архив - отсутствует составная часть '%s' или '%s'"
-#: apt-inst/deb/debfile.cc:108
+#: apt-inst/deb/debfile.cc:110
#, c-format
msgid "Couldn't change to %s"
msgstr "Не удалось перейти в каталог %s"
-#: apt-inst/deb/debfile.cc:134
+#: apt-inst/deb/debfile.cc:140
msgid "Internal error, could not locate member"
msgstr "Внутренняя ошибка, не удалось найти составную часть"
-#: apt-inst/deb/debfile.cc:167
+#: apt-inst/deb/debfile.cc:173
msgid "Failed to locate a valid control file"
msgstr "Не удалось найти правильный control-файл"
-#: apt-inst/deb/debfile.cc:252
+#: apt-inst/deb/debfile.cc:258
msgid "Unparsable control file"
msgstr "Не удалось прочесть содержимое control-файла"
@@ -2094,15 +2094,15 @@ msgstr "Ошибка чтения, удалённый сервер прерва�
msgid "Error reading from server"
msgstr "Ошибка чтения с сервера"
-#: methods/http.cc:1108
+#: methods/http.cc:1104
msgid "Bad header data"
msgstr "Неверный заголовок данных"
-#: methods/http.cc:1125
+#: methods/http.cc:1121 methods/http.cc:1176
msgid "Connection failed"
msgstr "Соединение разорвано"
-#: methods/http.cc:1216
+#: methods/http.cc:1228
msgid "Internal error"
msgstr "Внутренняя ошибка"
@@ -2132,7 +2132,7 @@ msgstr "Открытие файла конфигурации %s"
#: apt-pkg/contrib/configuration.cc:510
#, fuzzy, c-format
-msgid "Line %d too long (max %lu)"
+msgid "Line %d too long (max %u)"
msgstr "Строка %d слишком длинна (максимум %d)."
#: apt-pkg/contrib/configuration.cc:606
@@ -2393,29 +2393,29 @@ msgstr "необязательный"
msgid "extra"
msgstr "дополнительный"
-#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129
+#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
msgid "Building dependency tree"
msgstr "Построение дерева зависимостей"
-#: apt-pkg/depcache.cc:101
+#: apt-pkg/depcache.cc:122
msgid "Candidate versions"
msgstr "Версии-кандидаты"
-#: apt-pkg/depcache.cc:130
+#: apt-pkg/depcache.cc:151
msgid "Dependency generation"
msgstr "Генерирование зависимостей"
-#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174
+#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
#, fuzzy
msgid "Reading state information"
msgstr "Объединение информации о доступных пакетах"
-#: apt-pkg/depcache.cc:198
+#: apt-pkg/depcache.cc:219
#, fuzzy, c-format
msgid "Failed to open StateFile %s"
msgstr "Не удалось открыть %s"
-#: apt-pkg/depcache.cc:204
+#: apt-pkg/depcache.cc:225
#, fuzzy, c-format
msgid "Failed to write temporary StateFile %s"
msgstr "Не удалось записать в файл %s"
@@ -2549,17 +2549,17 @@ msgstr "Драйвер для метода %s не найден."
msgid "Method %s did not start correctly"
msgstr "Метод %s запустился не корректно"
-#: apt-pkg/acquire-worker.cc:381
+#: apt-pkg/acquire-worker.cc:396
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Вставьте диск с меткой '%s' в устройство '%s' и нажмите ввод."
-#: apt-pkg/init.cc:126
+#: apt-pkg/init.cc:124
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Менеджер пакетов '%s' не поддерживается"
-#: apt-pkg/init.cc:142
+#: apt-pkg/init.cc:140
msgid "Unable to determine a suitable packaging system type"
msgstr "Невозможно определить подходящий тип менеджера пакетов"
@@ -2692,16 +2692,20 @@ msgstr "Ошибка ввода/вывода при попытке сохран�
msgid "rename failed, %s (%s -> %s)."
msgstr "переименовать не удалось, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:401
msgid "MD5Sum mismatch"
msgstr "MD5Sum не совпадает"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1405
+#, fuzzy
+msgid "Hash Sum mismatch"
+msgstr "MD5Sum не совпадает"
+
+#: apt-pkg/acquire-item.cc:1097
msgid "There is no public key available for the following key IDs:\n"
msgstr "Недоступен общий ключ для следующих ID ключей:\n"
-#: apt-pkg/acquire-item.cc:1219
+#: apt-pkg/acquire-item.cc:1210
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2710,7 +2714,7 @@ msgstr ""
"Не удалось обнаружить файл пакета %s. Это может означать, что вам придётся "
"вручную исправить этот пакет (возможно, пропущен arch)"
-#: apt-pkg/acquire-item.cc:1278
+#: apt-pkg/acquire-item.cc:1269
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2719,13 +2723,13 @@ msgstr ""
"Не удалось обнаружить файл пакета %s. Это может означать, что вам придётся "
"вручную исправить этот пакет."
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1310
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "Некорректный перечень пакетов. Нет поля Filename: для пакета %s."
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1397
msgid "Size mismatch"
msgstr "Не совпадает размер"
@@ -2818,78 +2822,88 @@ msgstr "Записи в списке источников для этого ди
msgid "Unmounting CD-ROM...\n"
msgstr "Размонтирование CD-ROM..."
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
#, c-format
msgid "Wrote %i records.\n"
msgstr "Сохранено %i записей.\n"
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Сохранено %i записей с %i отсутствующими файлами.\n"
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Сохранено %i записей с %i несовпадающими файлами\n"
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
"Сохранено %i записей с %i отсутствующими файлами и с %i несовпадающими "
"файлами\n"
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:522
#, c-format
msgid "Preparing %s"
msgstr "Подготавливается %s"
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:523
#, c-format
msgid "Unpacking %s"
msgstr "Распаковывается %s"
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:528
#, c-format
msgid "Preparing to configure %s"
msgstr "Подготавливается для конфигурации %s"
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:529
#, c-format
msgid "Configuring %s"
msgstr "Настройка %s"
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:530
#, c-format
msgid "Installed %s"
msgstr "Установлен %s"
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:535
#, c-format
msgid "Preparing for removal of %s"
msgstr "Подготавливается для удаления %s"
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:536
#, c-format
msgid "Removing %s"
msgstr "Удаление %s"
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:537
#, c-format
msgid "Removed %s"
msgstr "Удалён %s"
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:542
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Подготовка к полному удалению %s"
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:543
#, c-format
msgid "Completely removed %s"
msgstr "%s полностью удалён"
+#: apt-pkg/deb/dpkgpm.cc:566
+#, fuzzy, c-format
+msgid "Directory '%s' missing"
+msgstr "Каталог %spartial отсутствует."
+
+#: apt-pkg/deb/dpkgpm.cc:709
+#, fuzzy, c-format
+msgid "openpty failed\n"
+msgstr "Ошибка в select"
+
#: methods/rred.cc:219
msgid "Could not patch file"
msgstr "Не удалось пропатчить файл"
diff --git a/po/sk.po b/po/sk.po
index 43117be0a..e98071063 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-06 06:51+0200\n"
+"POT-Creation-Date: 2007-08-04 09:09+0200\n"
"PO-Revision-Date: 2006-09-10 18:50+0200\n"
"Last-Translator: Peter Mann <Peter.Mann@tuke.sk>\n"
"Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -158,9 +158,9 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2584 cmdline/apt-sortpkgs.cc:144
-#, c-format
-msgid "%s %s for %s %s compiled on %s %s\n"
+#: cmdline/apt-get.cc:2585 cmdline/apt-sortpkgs.cc:144
+#, fuzzy, c-format
+msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s pre %s %s skompilovaný na %s %s\n"
#: cmdline/apt-cache.cc:1721
@@ -653,7 +653,7 @@ msgstr "Premenovanie %s na %s zlyhalo"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1673
#, c-format
msgid "Regex compilation error - %s"
msgstr "Chyba pri preklade regulárneho výrazu - %s"
@@ -814,11 +814,11 @@ msgstr "Je potrebné odstránenie balíka, ale funkcia Odstrániť je vypnutá."
msgid "Internal error, Ordering didn't finish"
msgstr "Vnútorná chyba, Triedenie sa neukončilo"
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2011 cmdline/apt-get.cc:2044
msgid "Unable to lock the download directory"
msgstr "Adresár pre sťahovanie sa nedá zamknúť"
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2092 cmdline/apt-get.cc:2333
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr "Nedá sa načítať zoznam zdrojov."
@@ -849,7 +849,7 @@ msgstr "Po rozbalení sa na disku použije ďalších %sB.\n"
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Po rozbalení sa na disku uvoľní %sB.\n"
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2186
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2187
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Na %s sa nedá zistiť veľkosť voľného miesta"
@@ -886,7 +886,7 @@ msgstr "Prerušené."
msgid "Do you want to continue [Y/n]? "
msgstr "Chcete pokračovať [Y/n]? "
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2229
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2230
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Zlyhalo stiahnutie %s %s\n"
@@ -895,7 +895,7 @@ msgstr "Zlyhalo stiahnutie %s %s\n"
msgid "Some files failed to download"
msgstr "Niektoré súbory sa nedajú stiahnuť"
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2238
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2239
msgid "Download complete and in download only mode"
msgstr "Sťahovanie ukončené v režime \"iba stiahnuť\""
@@ -1028,7 +1028,7 @@ msgid ""
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1754
msgid "The following information may help to resolve the situation:"
msgstr "Nasledovné informácie vám možno pomôžu vyriešiť túto situáciu:"
@@ -1041,31 +1041,31 @@ msgstr "Vnútorná chyba, problem resolver pokazil veci"
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Vnútorná chyba, AllUpgrade pokazil veci"
-#: cmdline/apt-get.cc:1544
+#: cmdline/apt-get.cc:1545
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "Balík %s sa nedá nájsť"
-#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
+#: cmdline/apt-get.cc:1660 cmdline/apt-get.cc:1696
#, c-format
msgid "Couldn't find package %s"
msgstr "Balík %s sa nedá nájsť"
-#: cmdline/apt-get.cc:1682
+#: cmdline/apt-get.cc:1683
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Poznámka: vyberá sa %s pre regulárny výraz '%s'\n"
-#: cmdline/apt-get.cc:1712
+#: cmdline/apt-get.cc:1713
#, fuzzy, c-format
msgid "%s set to manual installed.\n"
msgstr "ale inštalovať sa bude %s"
-#: cmdline/apt-get.cc:1725
+#: cmdline/apt-get.cc:1726
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Na opravu nasledovných môžete spustiť `apt-get -f install':"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1729
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1073,7 +1073,7 @@ msgstr ""
"Nesplnené závislosti. Skúste spustiť 'apt-get -f install' bez balíkov (alebo "
"navrhnite riešenie)."
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1741
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1085,7 +1085,7 @@ msgstr ""
"požadované balíky ešte neboli vytvorené alebo presunuté z fronty\n"
"Novoprichádzajúcich (Incoming) balíkov."
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1749
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1095,124 +1095,124 @@ msgstr ""
"balík nie je inštalovateľný a mali by ste zaslať hlásenie o chybe\n"
"(bug report) pre daný balík."
-#: cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1757
msgid "Broken packages"
msgstr "Poškodené balíky"
-#: cmdline/apt-get.cc:1785
+#: cmdline/apt-get.cc:1786
msgid "The following extra packages will be installed:"
msgstr "Nainštalujú sa nasledovné extra balíky:"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Suggested packages:"
msgstr "Navrhované balíky:"
-#: cmdline/apt-get.cc:1875
+#: cmdline/apt-get.cc:1876
msgid "Recommended packages:"
msgstr "Odporúčané balíky:"
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1904
msgid "Calculating upgrade... "
msgstr "Prepočítava sa aktualizácia... "
-#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1907 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Chyba"
-#: cmdline/apt-get.cc:1911
+#: cmdline/apt-get.cc:1912
msgid "Done"
msgstr "Hotovo"
-#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
+#: cmdline/apt-get.cc:1979 cmdline/apt-get.cc:1987
msgid "Internal error, problem resolver broke stuff"
msgstr "Vnútorná chyba, problem resolver pokazil veci"
-#: cmdline/apt-get.cc:2086
+#: cmdline/apt-get.cc:2087
msgid "Must specify at least one package to fetch source for"
msgstr "Musíte zadať aspoň jeden balík, pre ktorý sa stiahnu zdrojové texty"
-#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2350
+#: cmdline/apt-get.cc:2117 cmdline/apt-get.cc:2351
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Nedá sa nájsť zdrojový balík pre %s"
-#: cmdline/apt-get.cc:2165
+#: cmdline/apt-get.cc:2166
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Preskakuje sa už stiahnutý súbor '%s'\n"
-#: cmdline/apt-get.cc:2189
+#: cmdline/apt-get.cc:2190
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Na %s nemáte dostatok voľného miesta"
-#: cmdline/apt-get.cc:2194
+#: cmdline/apt-get.cc:2195
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Je potrebné stiahnuť %sB/%sB zdrojových archívov.\n"
-#: cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2198
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Je potrebné stiahnuť %sB zdrojových archívov.\n"
-#: cmdline/apt-get.cc:2203
+#: cmdline/apt-get.cc:2204
#, c-format
msgid "Fetch source %s\n"
msgstr "Stiahnuť zdroj %s\n"
-#: cmdline/apt-get.cc:2234
+#: cmdline/apt-get.cc:2235
msgid "Failed to fetch some archives."
msgstr "Zlyhalo stiahnutie niektorých archívov."
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2263
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Preskakuje sa rozbalenie už rozbaleného zdroja v %s\n"
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2275
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Príkaz pre rozbalenie '%s' zlyhal.\n"
-#: cmdline/apt-get.cc:2275
+#: cmdline/apt-get.cc:2276
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Skontrolujte, či je nainštalovaný balík 'dpkg-dev'.\n"
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2293
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Príkaz pre zostavenie '%s' zlyhal.\n"
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:2312
msgid "Child process failed"
msgstr "Proces potomka zlyhal"
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2328
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Musíte zadať aspoň jeden balík, pre ktorý sa budú overovať závislosti na "
"zostavenie"
-#: cmdline/apt-get.cc:2355
+#: cmdline/apt-get.cc:2356
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Nedajú sa získať závislosti pre zostavenie %s"
-#: cmdline/apt-get.cc:2375
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nemá žiadne závislosti pre zostavenie.\n"
-#: cmdline/apt-get.cc:2427
+#: cmdline/apt-get.cc:2428
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "%s závislosť pre %s sa nemôže splniť, pretože sa nedá nájsť balík %s"
-#: cmdline/apt-get.cc:2479
+#: cmdline/apt-get.cc:2480
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1221,31 +1221,31 @@ msgstr ""
"%s závislosť pre %s sa nedá splniť, protože sa nedá nájsť verzia balíku %s, "
"ktorá zodpovedá požiadavke na verziu"
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2515
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Zlyhalo splnenie %s závislosti pre %s: Inštalovaný balík %s je príliš nový"
-#: cmdline/apt-get.cc:2539
+#: cmdline/apt-get.cc:2540
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Zlyhalo splnenie %s závislosti pre %s: %s"
-#: cmdline/apt-get.cc:2553
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Závislosti pre zostavenie %s sa nedajú splniť."
-#: cmdline/apt-get.cc:2557
+#: cmdline/apt-get.cc:2558
msgid "Failed to process build dependencies"
msgstr "Spracovanie závislostí pre zostavenie zlyhalo"
-#: cmdline/apt-get.cc:2589
+#: cmdline/apt-get.cc:2590
msgid "Supported modules:"
msgstr "Podporované moduly:"
-#: cmdline/apt-get.cc:2630
+#: cmdline/apt-get.cc:2631
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1667,25 +1667,25 @@ msgstr "Chyba pri spracovaní MD5. Offset %lu"
msgid "This is not a valid DEB archive, missing '%s' member"
msgstr "Toto nie je platný DEB archív, chýba časť '%s'"
-#: apt-inst/deb/debfile.cc:48
-#, c-format
-msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
+#: apt-inst/deb/debfile.cc:50
+#, fuzzy, c-format
+msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
msgstr "Toto nie je platný DEB archív, chýba časť '%s' alebo '%s'"
-#: apt-inst/deb/debfile.cc:108
+#: apt-inst/deb/debfile.cc:110
#, c-format
msgid "Couldn't change to %s"
msgstr "Nedá sa prejsť do %s"
-#: apt-inst/deb/debfile.cc:134
+#: apt-inst/deb/debfile.cc:140
msgid "Internal error, could not locate member"
msgstr "Vnútorná chyba, nedá sa nájsť člen"
-#: apt-inst/deb/debfile.cc:167
+#: apt-inst/deb/debfile.cc:173
msgid "Failed to locate a valid control file"
msgstr "Nedá sa nájsť platný riadiaci súbor"
-#: apt-inst/deb/debfile.cc:252
+#: apt-inst/deb/debfile.cc:258
msgid "Unparsable control file"
msgstr "Nespracovateľný riadiaci súbor"
@@ -2049,15 +2049,15 @@ msgstr "Chyba pri čítaní zo servera. Druhá strana ukončila spojenie"
msgid "Error reading from server"
msgstr "Chyba pri čítaní zo servera"
-#: methods/http.cc:1108
+#: methods/http.cc:1104
msgid "Bad header data"
msgstr "Zlé dátové záhlavie"
-#: methods/http.cc:1125
+#: methods/http.cc:1121 methods/http.cc:1176
msgid "Connection failed"
msgstr "Spojenie zlyhalo"
-#: methods/http.cc:1216
+#: methods/http.cc:1228
msgid "Internal error"
msgstr "Vnútorná chyba"
@@ -2087,7 +2087,7 @@ msgstr "Otvára sa konfiguračný súbor %s"
#: apt-pkg/contrib/configuration.cc:510
#, fuzzy, c-format
-msgid "Line %d too long (max %lu)"
+msgid "Line %d too long (max %u)"
msgstr "Riadok %d je príliš dlhý (nanajvýš %d)"
#: apt-pkg/contrib/configuration.cc:606
@@ -2341,29 +2341,29 @@ msgstr "voliteľný"
msgid "extra"
msgstr "extra"
-#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129
+#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
msgid "Building dependency tree"
msgstr "Vytvára sa strom závislostí"
-#: apt-pkg/depcache.cc:101
+#: apt-pkg/depcache.cc:122
msgid "Candidate versions"
msgstr "Kandidátske verzie"
-#: apt-pkg/depcache.cc:130
+#: apt-pkg/depcache.cc:151
msgid "Dependency generation"
msgstr "Generovanie závislostí"
-#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174
+#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
#, fuzzy
msgid "Reading state information"
msgstr "Zlučujú sa dostupné informácie"
-#: apt-pkg/depcache.cc:198
+#: apt-pkg/depcache.cc:219
#, fuzzy, c-format
msgid "Failed to open StateFile %s"
msgstr "%s sa nedá otvoriť"
-#: apt-pkg/depcache.cc:204
+#: apt-pkg/depcache.cc:225
#, fuzzy, c-format
msgid "Failed to write temporary StateFile %s"
msgstr "Zápis súboru %s zlyhal"
@@ -2494,17 +2494,17 @@ msgstr "Nedá sa nájsť ovládač spôsobu %s."
msgid "Method %s did not start correctly"
msgstr "Spôsob %s nebol správne spustený"
-#: apt-pkg/acquire-worker.cc:381
+#: apt-pkg/acquire-worker.cc:396
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Vložte disk nazvaný '%s' do mechaniky '%s' a stlačte Enter."
-#: apt-pkg/init.cc:126
+#: apt-pkg/init.cc:124
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Balíčkovací systém '%s' nie je podporovaný"
-#: apt-pkg/init.cc:142
+#: apt-pkg/init.cc:140
msgid "Unable to determine a suitable packaging system type"
msgstr "Nedá sa určiť vhodný typ balíčkovacieho systému"
@@ -2639,16 +2639,20 @@ msgstr "V/V chyba pri ukladaní zdrojovej vyrovnávacej pamäte"
msgid "rename failed, %s (%s -> %s)."
msgstr "premenovanie zlyhalo, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:401
msgid "MD5Sum mismatch"
msgstr "Nezhoda MD5 súčtov"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1405
+#, fuzzy
+msgid "Hash Sum mismatch"
+msgstr "Nezhoda MD5 súčtov"
+
+#: apt-pkg/acquire-item.cc:1097
msgid "There is no public key available for the following key IDs:\n"
msgstr "Nie sú dostupné žiadne verejné kľúče ku kľúčom s nasledovnými ID:\n"
-#: apt-pkg/acquire-item.cc:1219
+#: apt-pkg/acquire-item.cc:1210
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2657,7 +2661,7 @@ msgstr ""
"Nedá sa nájsť súbor s balíkom %s. To by mohlo znamenať, že tento balík je "
"potrebné opraviť manuálne (kvôli chýbajúcej architektúre)."
-#: apt-pkg/acquire-item.cc:1278
+#: apt-pkg/acquire-item.cc:1269
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2666,13 +2670,13 @@ msgstr ""
"Nedá sa nájsť súbor s balíkom %s. Asi budete musieť opraviť tento balík "
"manuálne."
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1310
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "Indexové súbory balíka sú narušené. Chýba pole Filename: pre balík %s."
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1397
msgid "Size mismatch"
msgstr "Veľkosti sa nezhodujú"
@@ -2764,76 +2768,86 @@ msgstr "Položky zoznamu zdrojov pre tento disk sú:\n"
msgid "Unmounting CD-ROM...\n"
msgstr "CD-ROM sa odpája..."
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
#, c-format
msgid "Wrote %i records.\n"
msgstr "Zapísaných %i záznamov.\n"
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Zapísaných %i záznamov s %i chýbajúcimi súbormi.\n"
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Zapísaných %i záznamov s %i chybnými súbormi\n"
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "Zapísaných %i záznamov s %i chýbajúcimi a %i chybnými súbormi\n"
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:522
#, c-format
msgid "Preparing %s"
msgstr "Pripravuje sa %s"
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:523
#, c-format
msgid "Unpacking %s"
msgstr "Rozbaľuje sa %s"
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:528
#, c-format
msgid "Preparing to configure %s"
msgstr "Pripravuje sa nastavenie %s"
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:529
#, c-format
msgid "Configuring %s"
msgstr "Nastavuje sa %s"
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:530
#, c-format
msgid "Installed %s"
msgstr "Nainštalovaný balík %s"
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:535
#, c-format
msgid "Preparing for removal of %s"
msgstr "Pripravuje sa odstránenie %s"
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:536
#, c-format
msgid "Removing %s"
msgstr "Odstraňuje sa %s"
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:537
#, c-format
msgid "Removed %s"
msgstr "Odstránený balík %s"
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:542
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Pripravuje sa úplné odstránenie %s"
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:543
#, c-format
msgid "Completely removed %s"
msgstr "Balík '%s' je úplne odstránený"
+#: apt-pkg/deb/dpkgpm.cc:566
+#, fuzzy, c-format
+msgid "Directory '%s' missing"
+msgstr "Adresár zoznamov %spartial chýba."
+
+#: apt-pkg/deb/dpkgpm.cc:709
+#, fuzzy, c-format
+msgid "openpty failed\n"
+msgstr "Výber zlyhal"
+
#: methods/rred.cc:219
msgid "Could not patch file"
msgstr "Súbor %s sa nedá otvoriť súbor"
diff --git a/po/sl.po b/po/sl.po
index 55bf357d9..95a0ef535 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-06 06:51+0200\n"
+"POT-Creation-Date: 2007-08-04 09:09+0200\n"
"PO-Revision-Date: 2005-02-16 22:18+0100\n"
"Last-Translator: Jure Cuhalev <gandalf@owca.info>\n"
"Language-Team: Slovenian <sl@li.org>\n"
@@ -155,9 +155,9 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2584 cmdline/apt-sortpkgs.cc:144
-#, c-format
-msgid "%s %s for %s %s compiled on %s %s\n"
+#: cmdline/apt-get.cc:2585 cmdline/apt-sortpkgs.cc:144
+#, fuzzy, c-format
+msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s za %s %s preveden na %s %s\n"
#: cmdline/apt-cache.cc:1721
@@ -653,7 +653,7 @@ msgstr "Ni mogo�e preimenovati %s v %s"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1673
#, c-format
msgid "Regex compilation error - %s"
msgstr "Napaka pri prevajanju regex - %s"
@@ -816,11 +816,11 @@ msgstr "Odstraniti je potrebno pakete, a je Odstranjevanje onemogo�eno."
msgid "Internal error, Ordering didn't finish"
msgstr "Notranja napaka pri dodajanju odklona"
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2011 cmdline/apt-get.cc:2044
msgid "Unable to lock the download directory"
msgstr "Ni mogo�e zakleniti imenika za prenose"
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2092 cmdline/apt-get.cc:2333
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr "Seznama virov ni mogo�e brati."
@@ -849,7 +849,7 @@ msgstr "Po odpakiranju bo uporabljenega %sB dodatnega prostora na disku.\n"
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Po odpakiranju bo spro��enega %sB prostora na disku.\n"
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2186
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2187
#, fuzzy, c-format
msgid "Couldn't determine free space in %s"
msgstr "Nimate dovolj prostora na %s"
@@ -886,7 +886,7 @@ msgstr "Prekini."
msgid "Do you want to continue [Y/n]? "
msgstr "Ali �elite nadaljevati [Y/n]? "
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2229
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2230
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Ni mogo�e dobiti %s %s\n"
@@ -895,7 +895,7 @@ msgstr "Ni mogo�e dobiti %s %s\n"
msgid "Some files failed to download"
msgstr "Prenos nekaterih datotek ni uspel"
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2238
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2239
msgid "Download complete and in download only mode"
msgstr "Prenos dokon�an in uporabljen na�in samo prenos"
@@ -1029,7 +1029,7 @@ msgid ""
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1754
msgid "The following information may help to resolve the situation:"
msgstr "Naslednji podatki vam bodo morda pomagali re�iti te�avo:"
@@ -1042,31 +1042,31 @@ msgstr "Notranja napaka zaradi AllUpgrade."
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Notranja napaka zaradi AllUpgrade."
-#: cmdline/apt-get.cc:1544
+#: cmdline/apt-get.cc:1545
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "Ni mogo�e najti paketa %s"
-#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
+#: cmdline/apt-get.cc:1660 cmdline/apt-get.cc:1696
#, c-format
msgid "Couldn't find package %s"
msgstr "Ni mogo�e najti paketa %s"
-#: cmdline/apt-get.cc:1682
+#: cmdline/apt-get.cc:1683
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Opomba: izbran %s namesto regex '%s'\n"
-#: cmdline/apt-get.cc:1712
+#: cmdline/apt-get.cc:1713
#, fuzzy, c-format
msgid "%s set to manual installed.\n"
msgstr "vendar bo paket %s name��en"
-#: cmdline/apt-get.cc:1725
+#: cmdline/apt-get.cc:1726
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Poskusite zagnati 'apt-get -f install', �e �elite popraviti:"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1729
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1074,7 +1074,7 @@ msgstr ""
"Nere�ene odvisnosti. Poskusite 'apt-get -f install' brez paketov (ali "
"podajte re�itev)."
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1741
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1085,7 +1085,7 @@ msgstr ""
"nemogo� polo�aj, �e uporabljate nestabilno izdajo pa, da nekateri zahtevani "
"paketi �e niso ustvarjeni ali prene�eni iz Prihajajo�e."
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1749
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1095,126 +1095,126 @@ msgstr ""
"preprosto ne da namestiti in je potrebno vlo�iti poro�ilo o hro��u\n"
"o tem paketu."
-#: cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1757
msgid "Broken packages"
msgstr "Pokvarjeni paketi"
-#: cmdline/apt-get.cc:1785
+#: cmdline/apt-get.cc:1786
msgid "The following extra packages will be installed:"
msgstr "Naslednji dodatni paketi bodo name��eni:"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Suggested packages:"
msgstr "Predlagani paketi:"
-#: cmdline/apt-get.cc:1875
+#: cmdline/apt-get.cc:1876
msgid "Recommended packages:"
msgstr "Priporo�eni paketi:"
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1904
msgid "Calculating upgrade... "
msgstr "Prera�unavanje nadgradnje ... "
-#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1907 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Spodletelo"
-#: cmdline/apt-get.cc:1911
+#: cmdline/apt-get.cc:1912
msgid "Done"
msgstr "Opravljeno"
-#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
+#: cmdline/apt-get.cc:1979 cmdline/apt-get.cc:1987
#, fuzzy
msgid "Internal error, problem resolver broke stuff"
msgstr "Notranja napaka zaradi AllUpgrade."
-#: cmdline/apt-get.cc:2086
+#: cmdline/apt-get.cc:2087
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Potrebno je navesti vsaj en paket, za katerega �elite dobiti izorno kodo"
-#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2350
+#: cmdline/apt-get.cc:2117 cmdline/apt-get.cc:2351
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Izvornega paketa za %s ni mogo�e najti"
-#: cmdline/apt-get.cc:2165
+#: cmdline/apt-get.cc:2166
#, fuzzy, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Odpakiranje �e odpakiranih izvornih paketov v %s presko�eno\n"
-#: cmdline/apt-get.cc:2189
+#: cmdline/apt-get.cc:2190
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Nimate dovolj prostora na %s"
-#: cmdline/apt-get.cc:2194
+#: cmdline/apt-get.cc:2195
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Potrebno je dobiti %sB/%sB izvornih arhivov.\n"
-#: cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2198
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Potrebno je dobiti %sB izvornih arhivov.\n"
-#: cmdline/apt-get.cc:2203
+#: cmdline/apt-get.cc:2204
#, c-format
msgid "Fetch source %s\n"
msgstr "Dobi vir %s\n"
-#: cmdline/apt-get.cc:2234
+#: cmdline/apt-get.cc:2235
msgid "Failed to fetch some archives."
msgstr "Nekaterih arhivov ni mogo�e dobiti."
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2263
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Odpakiranje �e odpakiranih izvornih paketov v %s presko�eno\n"
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2275
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Ukaz odpakiranja '%s' ni uspel.\n"
-#: cmdline/apt-get.cc:2275
+#: cmdline/apt-get.cc:2276
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2293
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Ukaz gradnje '%s' ni uspel.\n"
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:2312
msgid "Child process failed"
msgstr "Otro�ki proces ni uspel"
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2328
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Potrebno je navesti vsaj en paket, za katerega �elite preveriti odvisnosti "
"za gradnjo"
-#: cmdline/apt-get.cc:2355
+#: cmdline/apt-get.cc:2356
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Ni mogo�e dobiti informacij o odvisnostih za gradnjo za %s"
-#: cmdline/apt-get.cc:2375
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nima odvisnosti za gradnjo.\n"
-#: cmdline/apt-get.cc:2427
+#: cmdline/apt-get.cc:2428
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "%s odvisnosti za %s ni mogo�e zadostiti, ker ni mogo�e najti paketa %s"
-#: cmdline/apt-get.cc:2479
+#: cmdline/apt-get.cc:2480
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1223,31 +1223,31 @@ msgstr ""
"%s odvisnosti za %s ni mogo�e zadostiti, ker nobena razli�ica paketa %s ne "
"more zadostiti zahtevi po razli�ici"
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2515
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Ni mogo�e zadostiti %s odvisnosti za %s. Name��en paket %s je preve� nov"
-#: cmdline/apt-get.cc:2539
+#: cmdline/apt-get.cc:2540
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Ni mogo�e zadostiti %s odvisnosti za %s. %s"
-#: cmdline/apt-get.cc:2553
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Odvisnostim za gradnjo %s ni mogo�e zadostiti."
-#: cmdline/apt-get.cc:2557
+#: cmdline/apt-get.cc:2558
msgid "Failed to process build dependencies"
msgstr "Obdelava odvisnosti za gradnjo ni uspela"
-#: cmdline/apt-get.cc:2589
+#: cmdline/apt-get.cc:2590
msgid "Supported modules:"
msgstr "Podprti moduli:"
-#: cmdline/apt-get.cc:2630
+#: cmdline/apt-get.cc:2631
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1670,25 +1670,25 @@ msgstr "Napaka pri raz�lenjevanju MD5. Odmik %lu"
msgid "This is not a valid DEB archive, missing '%s' member"
msgstr "To ni veljaven arhiv DEB. Manjka �lan '%s'."
-#: apt-inst/deb/debfile.cc:48
-#, c-format
-msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
+#: apt-inst/deb/debfile.cc:50
+#, fuzzy, c-format
+msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
msgstr "To ni veljaven arhiv DEB. Manjka �lan '%s' ali '%s'."
-#: apt-inst/deb/debfile.cc:108
+#: apt-inst/deb/debfile.cc:110
#, c-format
msgid "Couldn't change to %s"
msgstr "Ni mogo�e spremeniti v %s"
-#: apt-inst/deb/debfile.cc:134
+#: apt-inst/deb/debfile.cc:140
msgid "Internal error, could not locate member"
msgstr "Notranja napaka. Ni mogo�e najti �lana."
-#: apt-inst/deb/debfile.cc:167
+#: apt-inst/deb/debfile.cc:173
msgid "Failed to locate a valid control file"
msgstr "Ni mogo�e najti veljavne nadzorne datoteka"
-#: apt-inst/deb/debfile.cc:252
+#: apt-inst/deb/debfile.cc:258
msgid "Unparsable control file"
msgstr "Nadzorne datoteke ni mogo�e raz�leniti"
@@ -2050,15 +2050,15 @@ msgstr "Napaka pri branju oddaljene in zaprte povezave s stre�nika "
msgid "Error reading from server"
msgstr "Napaka pri branju s stre�nika"
-#: methods/http.cc:1108
+#: methods/http.cc:1104
msgid "Bad header data"
msgstr "Napa�ni podatki glave"
-#: methods/http.cc:1125
+#: methods/http.cc:1121 methods/http.cc:1176
msgid "Connection failed"
msgstr "Povezava ni uspela"
-#: methods/http.cc:1216
+#: methods/http.cc:1228
msgid "Internal error"
msgstr "Notranja napaka"
@@ -2088,7 +2088,7 @@ msgstr "Odpiranje nastavitvene datoteke %s"
#: apt-pkg/contrib/configuration.cc:510
#, fuzzy, c-format
-msgid "Line %d too long (max %lu)"
+msgid "Line %d too long (max %u)"
msgstr "Vrstica %d je predolga (najve� %d)"
#: apt-pkg/contrib/configuration.cc:606
@@ -2342,29 +2342,29 @@ msgstr "izbirno"
msgid "extra"
msgstr "dodatno"
-#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129
+#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
msgid "Building dependency tree"
msgstr "Gradnja drevesa odvisnosti"
-#: apt-pkg/depcache.cc:101
+#: apt-pkg/depcache.cc:122
msgid "Candidate versions"
msgstr "Razli�ice kandidatov"
-#: apt-pkg/depcache.cc:130
+#: apt-pkg/depcache.cc:151
msgid "Dependency generation"
msgstr "Ustvarjanje odvisnosti"
-#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174
+#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
#, fuzzy
msgid "Reading state information"
msgstr "Spajanje informacij na voljo"
-#: apt-pkg/depcache.cc:198
+#: apt-pkg/depcache.cc:219
#, fuzzy, c-format
msgid "Failed to open StateFile %s"
msgstr "Ni mogo�e odprti %s"
-#: apt-pkg/depcache.cc:204
+#: apt-pkg/depcache.cc:225
#, fuzzy, c-format
msgid "Failed to write temporary StateFile %s"
msgstr "Napaka pri pisanju datoteke %s"
@@ -2496,7 +2496,7 @@ msgstr "Ni mogo�e najti gonilnika metod %s."
msgid "Method %s did not start correctly"
msgstr "Metoda %s se ni za�ela pravilno"
-#: apt-pkg/acquire-worker.cc:381
+#: apt-pkg/acquire-worker.cc:396
#, fuzzy, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
@@ -2504,12 +2504,12 @@ msgstr ""
" '%s'\n"
"v enoto '%s' in pritisnite enter\n"
-#: apt-pkg/init.cc:126
+#: apt-pkg/init.cc:124
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Paketni sistem '%s' ni podprt"
-#: apt-pkg/init.cc:142
+#: apt-pkg/init.cc:140
msgid "Unable to determine a suitable packaging system type"
msgstr "Ni mogo�e ugotoviti ustrezne vrste paketnega sistema"
@@ -2642,16 +2642,20 @@ msgstr "Napaka IO pri shranjevanju predpomnilnika virov"
msgid "rename failed, %s (%s -> %s)."
msgstr "preimenovanje spodletelo, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:401
msgid "MD5Sum mismatch"
msgstr "Neujemanje vsote MD5"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1405
+#, fuzzy
+msgid "Hash Sum mismatch"
+msgstr "Neujemanje vsote MD5"
+
+#: apt-pkg/acquire-item.cc:1097
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:1219
+#: apt-pkg/acquire-item.cc:1210
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2660,7 +2664,7 @@ msgstr ""
"Ni bilo mogo�e najti datoteke za paket %s. Morda boste morali ro�no "
"popraviti ta paket (zaradi manjkajo�ega arhiva)."
-#: apt-pkg/acquire-item.cc:1278
+#: apt-pkg/acquire-item.cc:1269
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2669,7 +2673,7 @@ msgstr ""
"Ni bilo mogo�e najti datoteke za paket %s. Morda boste morali ro�no "
"popraviti ta paket."
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1310
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2677,7 +2681,7 @@ msgstr ""
"Datoteke s kazali paketov so pokvarjene. Brez imena datotek: polje alu paket "
"%s."
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1397
msgid "Size mismatch"
msgstr "Neujemanje velikosti"
@@ -2768,78 +2772,88 @@ msgstr "Izvorni vnosi za ta medij so:\n"
msgid "Unmounting CD-ROM...\n"
msgstr "Odklapljam CD-ROM..."
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
#, c-format
msgid "Wrote %i records.\n"
msgstr "Zapisal %i zapisov.\n"
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Zapisal %i zapisov z %i manjkajo�imi datotekami.\n"
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Zapisal %i zapisov z %i neujemajo�imi datotekami.\n"
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
"Zapisal %i zapisov z %i manjkajo�imi datotekami in %i neujemajo�imi "
"datotekami.\n"
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:522
#, fuzzy, c-format
msgid "Preparing %s"
msgstr "Odpiram %s"
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:523
#, fuzzy, c-format
msgid "Unpacking %s"
msgstr "Odpiram %s"
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:528
#, fuzzy, c-format
msgid "Preparing to configure %s"
msgstr "Odpiranje nastavitvene datoteke %s"
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:529
#, fuzzy, c-format
msgid "Configuring %s"
msgstr "Povezujem se z %s"
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:530
#, fuzzy, c-format
msgid "Installed %s"
msgstr " Name��en: "
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:535
#, c-format
msgid "Preparing for removal of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:536
#, fuzzy, c-format
msgid "Removing %s"
msgstr "Odpiram %s"
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:537
#, fuzzy, c-format
msgid "Removed %s"
msgstr "Priporo�a"
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:542
#, fuzzy, c-format
msgid "Preparing to completely remove %s"
msgstr "Odpiranje nastavitvene datoteke %s"
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:543
#, fuzzy, c-format
msgid "Completely removed %s"
msgstr "Odstranitev %s ni uspela"
+#: apt-pkg/deb/dpkgpm.cc:566
+#, fuzzy, c-format
+msgid "Directory '%s' missing"
+msgstr "Manjka imenik s seznami %spartial."
+
+#: apt-pkg/deb/dpkgpm.cc:709
+#, fuzzy, c-format
+msgid "openpty failed\n"
+msgstr "Izbira ni uspela"
+
#: methods/rred.cc:219
#, fuzzy
msgid "Could not patch file"
diff --git a/po/sv.po b/po/sv.po
index 2d2432d08..ba2df8bfc 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-06 06:51+0200\n"
+"POT-Creation-Date: 2007-08-04 09:09+0200\n"
"PO-Revision-Date: 2007-07-24 18:03+0100\n"
"Last-Translator: Peter Karlsson <peterk@debian.org>\n"
"Language-Team: Swedish <debian-l10n-swedish@debian.org>\n"
@@ -18,7 +18,8 @@ msgstr ""
#: cmdline/apt-cache.cc:143
#, c-format
msgid "Package %s version %s has an unmet dep:\n"
-msgstr "Paketet %s med versionen %s har ett beroende som inte kan tillfredsst�llas:\n"
+msgstr ""
+"Paketet %s med versionen %s har ett beroende som inte kan tillfredsst�llas:\n"
#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640
#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018
@@ -157,9 +158,9 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2584 cmdline/apt-sortpkgs.cc:144
-#, c-format
-msgid "%s %s for %s %s compiled on %s %s\n"
+#: cmdline/apt-get.cc:2585 cmdline/apt-sortpkgs.cc:144
+#, fuzzy, c-format
+msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s f�r %s %s kompilerad den %s %s\n"
#: cmdline/apt-cache.cc:1721
@@ -658,7 +659,7 @@ msgstr "Misslyckades med att byta namn p� %s till %s"
msgid "Y"
msgstr "J"
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1673
#, c-format
msgid "Regex compilation error - %s"
msgstr "Fel vid kompilering av regulj�rt uttryck - %s"
@@ -820,11 +821,11 @@ msgstr "Paketen 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:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2011 cmdline/apt-get.cc:2044
msgid "Unable to lock the download directory"
msgstr "Kunde inte l�sa h�mtningskatalogen"
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2092 cmdline/apt-get.cc:2333
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr "Listan �ver k�llor kunde inte l�sas."
@@ -855,7 +856,7 @@ msgstr "Efter uppackning kommer ytterligare %sB utrymme anv�ndas p� disken.\n"
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Efter uppackning kommer %sB att frig�ras p� disken.\n"
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2186
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2187
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Kunde inte fastst�lla ledigt utrymme i %s"
@@ -893,7 +894,7 @@ msgstr "Avbryter."
msgid "Do you want to continue [Y/n]? "
msgstr "Vill du forts�tta [J/n]? "
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2229
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2230
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Misslyckades med att h�mta %s %s\n"
@@ -902,7 +903,7 @@ msgstr "Misslyckades med att h�mta %s %s\n"
msgid "Some files failed to download"
msgstr "Misslyckades med att h�mta vissa filer"
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2238
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2239
msgid "Download complete and in download only mode"
msgstr "H�mtningen f�rdig i \"endast-h�mta\"-l�ge"
@@ -911,8 +912,8 @@ msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
msgstr ""
-"Vissa arkiv kunte inte h�mtas. Prova att k�ra \"apt-get update\" eller med "
-"--fix-missing."
+"Vissa arkiv kunte inte h�mtas. Prova att k�ra \"apt-get update\" eller med --"
+"fix-missing."
#: cmdline/apt-get.cc:1005
msgid "--fix-missing and media swapping is not currently supported"
@@ -1018,7 +1019,8 @@ msgstr ""
#: cmdline/apt-get.cc:1433
msgid "We are not supposed to delete stuff, can't start AutoRemover"
-msgstr "Det �r inte meningen att vi ska ta bort n�got, kan inte starta AutoRemover"
+msgstr ""
+"Det �r inte meningen att vi ska ta bort n�got, kan inte starta AutoRemover"
#: cmdline/apt-get.cc:1465
msgid ""
@@ -1039,7 +1041,7 @@ msgstr ""
"Hmm, det verkar som AutoRemover f�rst�rde n�got som verkligen\n"
"inte skulle h�nda. Skicka in en felrapport mot paketet apt."
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1754
msgid "The following information may help to resolve the situation:"
msgstr "F�ljande information kan vara till hj�lp f�r att l�sa situationen:"
@@ -1051,32 +1053,32 @@ msgstr "Internt fel, AutoRemover f�rst�rde n�got"
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Internt fel, AllUpgrade f�rst�rde n�got"
-#: cmdline/apt-get.cc:1544
+#: cmdline/apt-get.cc:1545
#, c-format
msgid "Couldn't find task %s"
msgstr "Kunde inte hitta funktionen %s"
-#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
+#: cmdline/apt-get.cc:1660 cmdline/apt-get.cc:1696
#, c-format
msgid "Couldn't find package %s"
msgstr "Kunde inte hitta paketet %s"
-#: cmdline/apt-get.cc:1682
+#: cmdline/apt-get.cc:1683
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Observera, v�ljer %s f�r det regulj�ra uttrycket \"%s\"\n"
-#: cmdline/apt-get.cc:1712
+#: cmdline/apt-get.cc:1713
#, c-format
msgid "%s set to manual installed.\n"
msgstr "%s �r satt till manuellt installerad.\n"
-#: cmdline/apt-get.cc:1725
+#: cmdline/apt-get.cc:1726
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
"Du kan m�jligen r�tta till detta genom att k�ra \"apt-get -f install\":"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1729
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1084,7 +1086,7 @@ msgstr ""
"Otillfredsst�llda beroenden. Prova med \"apt-get -f install\" utan paket "
"(eller ange en l�sning)."
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1741
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1096,7 +1098,7 @@ msgstr ""
"att n�gra n�dv�ndiga paket �nnu inte har skapats eller flyttats\n"
"ut fr�n \"Incoming\"."
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1749
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1106,115 +1108,115 @@ msgstr ""
"helt enkelt inte kan installeras och att en felrapport om detta b�r\n"
"skickas in."
-#: cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1757
msgid "Broken packages"
msgstr "Trasiga paket"
-#: cmdline/apt-get.cc:1785
+#: cmdline/apt-get.cc:1786
msgid "The following extra packages will be installed:"
msgstr "F�ljande ytterligare paket kommer att installeras:"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Suggested packages:"
msgstr "F�reslagna paket:"
-#: cmdline/apt-get.cc:1875
+#: cmdline/apt-get.cc:1876
msgid "Recommended packages:"
msgstr "Rekommenderade paket:"
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1904
msgid "Calculating upgrade... "
msgstr "Ber�knar uppgradering... "
-#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1907 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Misslyckades"
-#: cmdline/apt-get.cc:1911
+#: cmdline/apt-get.cc:1912
msgid "Done"
msgstr "F�rdig"
-#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
+#: cmdline/apt-get.cc:1979 cmdline/apt-get.cc:1987
msgid "Internal error, problem resolver broke stuff"
msgstr "Internt fel, probleml�saren f�rst�rde n�gonting"
-#: cmdline/apt-get.cc:2086
+#: cmdline/apt-get.cc:2087
msgid "Must specify at least one package to fetch source for"
msgstr "Du m�ste ange minst ett paket att h�mta k�llkod f�r"
-#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2350
+#: cmdline/apt-get.cc:2117 cmdline/apt-get.cc:2351
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Kunde inte hitta n�got k�llkodspaket f�r %s"
-#: cmdline/apt-get.cc:2165
+#: cmdline/apt-get.cc:2166
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Hoppar �ver redan h�mtade filen \"%s\"\n"
-#: cmdline/apt-get.cc:2189
+#: cmdline/apt-get.cc:2190
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Du har inte tillr�ckligt mycket ledigt utrymme i %s"
-#: cmdline/apt-get.cc:2194
+#: cmdline/apt-get.cc:2195
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Beh�ver h�mta %sB/%sB k�llkodsarkiv.\n"
-#: cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2198
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Beh�ver h�mta %sB k�llkodsarkiv.\n"
-#: cmdline/apt-get.cc:2203
+#: cmdline/apt-get.cc:2204
#, c-format
msgid "Fetch source %s\n"
msgstr "H�mtar k�llkoden %s\n"
-#: cmdline/apt-get.cc:2234
+#: cmdline/apt-get.cc:2235
msgid "Failed to fetch some archives."
msgstr "Misslyckades med att h�mta vissa arkiv."
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2263
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Packar inte upp redan uppackad k�llkod i %s\n"
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2275
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Uppackningskommandot \"%s\" misslyckades.\n"
-#: cmdline/apt-get.cc:2275
+#: cmdline/apt-get.cc:2276
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "F�rs�kra dig om att paketet \"dpkg-dev\" �r installerat.\n"
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2293
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Byggkommandot \"%s\" misslyckades.\n"
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:2312
msgid "Child process failed"
msgstr "Barnprocessen misslyckades"
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2328
msgid "Must specify at least one package to check builddeps for"
msgstr "Du m�ste ange minst ett paket att kontrollera byggberoenden f�r"
-#: cmdline/apt-get.cc:2355
+#: cmdline/apt-get.cc:2356
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Kunde inte h�mta information om byggberoenden f�r %s"
-#: cmdline/apt-get.cc:2375
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s har inga byggberoenden.\n"
-#: cmdline/apt-get.cc:2427
+#: cmdline/apt-get.cc:2428
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1223,7 +1225,7 @@ msgstr ""
"%s-beroendet p� %s kan inte tillfredsst�llas eftersom paketet %s inte kan "
"hittas"
-#: cmdline/apt-get.cc:2479
+#: cmdline/apt-get.cc:2480
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1232,32 +1234,32 @@ msgstr ""
"%s-beroendet p� %s kan inte tillfredsst�llas eftersom inga tillg�ngliga "
"versioner av paketet %s tillfredsst�ller versionskraven"
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2515
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-"Misslyckades med att tillfredsst�lla %s-beroendet f�r %s: Det installerade paketet %"
-"s �r f�r nytt"
+"Misslyckades med att tillfredsst�lla %s-beroendet f�r %s: Det installerade "
+"paketet %s �r f�r nytt"
-#: cmdline/apt-get.cc:2539
+#: cmdline/apt-get.cc:2540
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Misslyckades med att tillfredsst�lla %s-beroendet f�r %s: %s"
-#: cmdline/apt-get.cc:2553
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Byggberoenden f�r %s kunde inte tillfredsst�llas."
-#: cmdline/apt-get.cc:2557
+#: cmdline/apt-get.cc:2558
msgid "Failed to process build dependencies"
msgstr "Misslyckades med att behandla byggberoenden"
-#: cmdline/apt-get.cc:2589
+#: cmdline/apt-get.cc:2590
msgid "Supported modules:"
msgstr "Moduler som st�ds:"
-#: cmdline/apt-get.cc:2630
+#: cmdline/apt-get.cc:2631
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1685,26 +1687,26 @@ msgstr "Fel vid tolkning av MD5. Position %lu"
msgid "This is not a valid DEB archive, missing '%s' member"
msgstr "Detta �r inte ett giltigt DEB-arkiv, delen \"%s\" saknas"
-#: apt-inst/deb/debfile.cc:48
-#, c-format
-msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
+#: apt-inst/deb/debfile.cc:50
+#, fuzzy, c-format
+msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
msgstr "Detta �r inte ett giltigt DEB-arkiv, b�de \"%s\" och \"%s\" saknas"
# chdir
-#: apt-inst/deb/debfile.cc:108
+#: apt-inst/deb/debfile.cc:110
#, c-format
msgid "Couldn't change to %s"
msgstr "Kunde inte byta till %s"
-#: apt-inst/deb/debfile.cc:134
+#: apt-inst/deb/debfile.cc:140
msgid "Internal error, could not locate member"
msgstr "Internt fel, kunde inte hitta del"
-#: apt-inst/deb/debfile.cc:167
+#: apt-inst/deb/debfile.cc:173
msgid "Failed to locate a valid control file"
msgstr "Misslyckades med att hitta en giltig control-fil"
-#: apt-inst/deb/debfile.cc:252
+#: apt-inst/deb/debfile.cc:258
msgid "Unparsable control file"
msgstr "Kunde inte tolka control-filen"
@@ -1973,7 +1975,8 @@ msgstr "E: Argumentslistan fr�n Acquire::gpgv::Options �r f�r l�ng. Avslutar."
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
-"Internt fel: Korrekt signatur men kunde inte fastst�lla nyckelns fingeravtryck?!"
+"Internt fel: Korrekt signatur men kunde inte fastst�lla nyckelns "
+"fingeravtryck?!"
#: methods/gpgv.cc:209
msgid "At least one invalid signature was encountered."
@@ -1998,8 +2001,8 @@ 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 �ppna nyckeln inte "
-"�r tillg�nglig:\n"
+"F�ljande signaturer kunde inte verifieras f�r att den �ppna nyckeln inte �r "
+"tillg�nglig:\n"
#: methods/gzip.cc:64
#, c-format
@@ -2073,15 +2076,15 @@ msgstr "Fel vid l�sning fr�n server: Andra �nden st�ngde f�rbindelsen"
msgid "Error reading from server"
msgstr "Fel vid l�sning fr�n server"
-#: methods/http.cc:1108
+#: methods/http.cc:1104
msgid "Bad header data"
msgstr "Felaktiga data i huvud"
-#: methods/http.cc:1125
+#: methods/http.cc:1121 methods/http.cc:1176
msgid "Connection failed"
msgstr "Anslutningen misslyckades"
-#: methods/http.cc:1216
+#: methods/http.cc:1228
msgid "Internal error"
msgstr "Internt fel"
@@ -2110,8 +2113,8 @@ msgid "Opening configuration file %s"
msgstr "�ppnar konfigurationsfilen %s"
#: apt-pkg/contrib/configuration.cc:510
-#, c-format
-msgid "Line %d too long (max %lu)"
+#, fuzzy, c-format
+msgid "Line %d too long (max %u)"
msgstr "Rad %d �r f�r l�ng (max %lu)"
#: apt-pkg/contrib/configuration.cc:606
@@ -2188,7 +2191,8 @@ msgstr "Flaggan %s kr�ver ett argument."
#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204
#, c-format
msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr "Flagga %s: Den angivna konfigurationsposten m�ste inneh�lla ett =<v�rde>."
+msgstr ""
+"Flagga %s: Den angivna konfigurationsposten m�ste inneh�lla ett =<v�rde>."
#: apt-pkg/contrib/cmndline.cc:234
#, c-format
@@ -2368,28 +2372,28 @@ msgstr "valfri"
msgid "extra"
msgstr "extra"
-#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129
+#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
msgid "Building dependency tree"
msgstr "Bygger beroendetr�d"
-#: apt-pkg/depcache.cc:101
+#: apt-pkg/depcache.cc:122
msgid "Candidate versions"
msgstr "Kandiderande versioner"
-#: apt-pkg/depcache.cc:130
+#: apt-pkg/depcache.cc:151
msgid "Dependency generation"
msgstr "Beroendegenerering"
-#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174
+#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
msgid "Reading state information"
msgstr "L�ser tillst�ndsinformation"
-#: apt-pkg/depcache.cc:198
+#: apt-pkg/depcache.cc:219
#, c-format
msgid "Failed to open StateFile %s"
msgstr "Misslyckades med att �ppna StateFile %s"
-#: apt-pkg/depcache.cc:204
+#: apt-pkg/depcache.cc:225
#, c-format
msgid "Failed to write temporary StateFile %s"
msgstr "Misslyckades med att skriva tempor�r StateFile %s"
@@ -2522,18 +2526,19 @@ msgstr "Metoddrivrutinen %s kunde inte hittas."
msgid "Method %s did not start correctly"
msgstr "Metoden %s startade inte korrekt"
-#: apt-pkg/acquire-worker.cc:381
+#: apt-pkg/acquire-worker.cc:396
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "Mata in skivan med etiketten \"%s\" i enheten \"%s\" och tryck p� Enter."
+msgstr ""
+"Mata in skivan med etiketten \"%s\" i enheten \"%s\" och tryck p� Enter."
-#: apt-pkg/init.cc:126
+#: apt-pkg/init.cc:124
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Paketsystemet \"%s\" st�ds inte"
#
-#: apt-pkg/init.cc:142
+#: apt-pkg/init.cc:140
msgid "Unable to determine a suitable packaging system type"
msgstr "Kunde inte fastst�lla en l�mplig paketsystemstyp"
@@ -2669,16 +2674,20 @@ 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:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:401
msgid "MD5Sum mismatch"
msgstr "MD5-kontrollsumman st�mmer inte"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1405
+#, fuzzy
+msgid "Hash Sum mismatch"
+msgstr "MD5-kontrollsumman st�mmer inte"
+
+#: apt-pkg/acquire-item.cc:1097
msgid "There is no public key available for the following key IDs:\n"
msgstr "Det finns ingen �ppen nyckel tillg�nglig f�r f�ljande nyckel-id:n:\n"
-#: apt-pkg/acquire-item.cc:1219
+#: apt-pkg/acquire-item.cc:1210
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2687,7 +2696,7 @@ msgstr ""
"Jag kunde inte hitta 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:1278
+#: apt-pkg/acquire-item.cc:1269
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2696,13 +2705,13 @@ msgstr ""
"Jag kunde inte hitta n�gon fil f�r paketet %s. Detta kan betyda att du "
"manuellt m�ste reparera detta paket."
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1310
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "Paketindexfilerna �r skadede. Inget \"Filename:\"-f�lt f�r paketet %s."
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1397
msgid "Size mismatch"
msgstr "Storleken st�mmer inte"
@@ -2752,7 +2761,7 @@ msgid "Scanning disc for index files..\n"
msgstr "S�ker efter indexfiler p� skivan...\n"
#: apt-pkg/cdrom.cc:671
-#, -format
+#, c-format
msgid ""
"Found %i package indexes, %i source indexes, %i translation indexes and %i "
"signatures\n"
@@ -2794,76 +2803,86 @@ msgstr "Poster i k�llistan f�r denna skiva:\n"
msgid "Unmounting CD-ROM...\n"
msgstr "Avmonterar cd-rom...\n"
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
#, c-format
msgid "Wrote %i records.\n"
msgstr "Skrev %i poster.\n"
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Skrev %i poster med %i saknade filer.\n"
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Skrev %i poster med %i filer som inte st�mmer\n"
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "Skrev %i poster med %i saknade filer och %i filer som inte st�mmer\n"
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:522
#, c-format
msgid "Preparing %s"
msgstr "F�rbereder %s"
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:523
#, c-format
msgid "Unpacking %s"
msgstr "Packar upp %s"
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:528
#, c-format
msgid "Preparing to configure %s"
msgstr "F�rbereder konfigurering av %s"
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:529
#, c-format
msgid "Configuring %s"
msgstr "Konfigurerar %s"
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:530
#, c-format
msgid "Installed %s"
msgstr "Installerade %s"
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:535
#, c-format
msgid "Preparing for removal of %s"
msgstr "F�rbereder borttagning av %s"
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:536
#, c-format
msgid "Removing %s"
msgstr "Tar bort %s"
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:537
#, c-format
msgid "Removed %s"
msgstr "Tog bort %s"
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:542
#, c-format
msgid "Preparing to completely remove %s"
msgstr "F�rbereder borttagning av hela %s"
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:543
#, c-format
msgid "Completely removed %s"
msgstr "Tog bort hela %s"
+#: apt-pkg/deb/dpkgpm.cc:566
+#, fuzzy, c-format
+msgid "Directory '%s' missing"
+msgstr "Listkatalogen %spartial saknas."
+
+#: apt-pkg/deb/dpkgpm.cc:709
+#, fuzzy, c-format
+msgid "openpty failed\n"
+msgstr "\"Select\" misslyckades"
+
#: methods/rred.cc:219
msgid "Could not patch file"
msgstr "Kunde inte l�gga p� programfix p� filen"
diff --git a/po/th.po b/po/th.po
new file mode 100644
index 000000000..223116530
--- /dev/null
+++ b/po/th.po
@@ -0,0 +1,2821 @@
+# Thai translation of apt.
+# Copyright (C) 2007 Free Software Foundation, Inc.
+# This file is distributed under the same license as the apt package.
+# Theppiak Karoonboonyanan <thep@linux.thai.net>, 2007.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: apt\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-08-04 12:41+0200\n"
+"PO-Revision-Date: 2007-09-17 16:07+0700\n"
+"Last-Translator: Theppitak Karoonboonyanan <thep@linux.thai.net>\n"
+"Language-Team: Thai <thai-l10n@googlegroups.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: cmdline/apt-cache.cc:143
+#, c-format
+msgid "Package %s version %s has an unmet dep:\n"
+msgstr "แพกเกจ %s รุ่น %s ขาดแพกเกจที่ต้องใช้:\n"
+
+#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640
+#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018
+#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "ไม่พบแพกเกจ %s"
+
+#: cmdline/apt-cache.cc:247
+msgid "Total package names : "
+msgstr "จำนวนชื่อแพกเกจทั้งหมด : "
+
+#: cmdline/apt-cache.cc:287
+msgid " Normal packages: "
+msgstr " แพกเกจปกติ: "
+
+#: cmdline/apt-cache.cc:288
+msgid " Pure virtual packages: "
+msgstr " แพกเกจเสมือนแท้ๆ: "
+
+#: cmdline/apt-cache.cc:289
+msgid " Single virtual packages: "
+msgstr " แพกเกจเสมือนที่มีแพกเกจจริงเดียว: "
+
+#: cmdline/apt-cache.cc:290
+msgid " Mixed virtual packages: "
+msgstr " แพกเกจเสมือนผสม: "
+
+#: cmdline/apt-cache.cc:291
+msgid " Missing: "
+msgstr " แพกเกจที่ขาดหาย: "
+
+#: cmdline/apt-cache.cc:293
+msgid "Total distinct versions: "
+msgstr "จำนวนรุ่นที่แตกต่างกันทั้งหมด: "
+
+#: cmdline/apt-cache.cc:295
+msgid "Total Distinct Descriptions: "
+msgstr "จำนวนคำบรรยายแพกเกจที่แตกต่างกันทั้งหมด: "
+
+#: cmdline/apt-cache.cc:297
+msgid "Total dependencies: "
+msgstr "จำนวนการเชื่อมโยงระหว่างแพกเกจทั้งหมด: "
+
+#: cmdline/apt-cache.cc:300
+msgid "Total ver/file relations: "
+msgstr "จำนวนความสัมพันธ์ รุ่น/แฟ้ม ทั้งหมด: "
+
+#: cmdline/apt-cache.cc:302
+msgid "Total Desc/File relations: "
+msgstr "จำนวนความสัมพันธ์ คำบรรยาย/แฟ้ม ทั้งหมด: "
+
+#: cmdline/apt-cache.cc:304
+msgid "Total Provides mappings: "
+msgstr "จำนวนผังการตระเตรียมทั้งหมด: "
+
+#: cmdline/apt-cache.cc:316
+msgid "Total globbed strings: "
+msgstr "จำนวนสตริงทั้งหมด: "
+
+#: cmdline/apt-cache.cc:330
+msgid "Total dependency version space: "
+msgstr "ขนาดของพื้นที่ความเชื่อมโยงระหว่างแพกเกจทั้งหมด: "
+
+#: cmdline/apt-cache.cc:335
+msgid "Total slack space: "
+msgstr "พื้นที่สำรองทั้งหมด: "
+
+#: cmdline/apt-cache.cc:343
+msgid "Total space accounted for: "
+msgstr "พื้นที่ที่นับรวมทั้งหมด: "
+
+#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218
+#, c-format
+msgid "Package file %s is out of sync."
+msgstr "ข้อมูลแฟ้ม Package %s ไม่ตรงกับความเป็นจริง"
+
+#: cmdline/apt-cache.cc:1293
+msgid "You must give exactly one pattern"
+msgstr "คุณต้องระบุแพตเทิร์นด้วย"
+
+#: cmdline/apt-cache.cc:1447
+msgid "No packages found"
+msgstr "ไม่พบแพกเกจ"
+
+#: cmdline/apt-cache.cc:1524
+msgid "Package files:"
+msgstr "แฟ้มแพกเกจ:"
+
+#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617
+msgid "Cache is out of sync, can't x-ref a package file"
+msgstr "ข้อมูลแคชไม่ตรงกับความเป็นจริงแล้ว ไม่สามารถอ้างอิงไขว้ระหว่างแฟ้มแพกเกจ"
+
+#: cmdline/apt-cache.cc:1532
+#, c-format
+msgid "%4i %s\n"
+msgstr "%4i %s\n"
+
+#. Show any packages have explicit pins
+#: cmdline/apt-cache.cc:1544
+msgid "Pinned packages:"
+msgstr "แพกเกจที่ถูกตรึง:"
+
+#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597
+msgid "(not found)"
+msgstr "(ไม่พบ)"
+
+#. Installed version
+#: cmdline/apt-cache.cc:1577
+msgid " Installed: "
+msgstr " ที่ติดตั้งอยู่: "
+
+#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587
+msgid "(none)"
+msgstr "(ไม่มี)"
+
+#. Candidate Version
+#: cmdline/apt-cache.cc:1584
+msgid " Candidate: "
+msgstr " รุ่นที่ติดตั้งได้: "
+
+#: cmdline/apt-cache.cc:1594
+msgid " Package pin: "
+msgstr " การตรึงแพกเกจ: "
+
+#. Show the priority tables
+#: cmdline/apt-cache.cc:1603
+msgid " Version table:"
+msgstr " ตารางรุ่น:"
+
+#: cmdline/apt-cache.cc:1618
+#, c-format
+msgid " %4i %s\n"
+msgstr " %4i %s\n"
+
+#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
+#: cmdline/apt-get.cc:2585 cmdline/apt-sortpkgs.cc:144
+#, c-format
+msgid "%s %s for %s compiled on %s %s\n"
+msgstr "%s %s สำหรับ %s คอมไพล์เมื่อ %s %s\n"
+
+#: cmdline/apt-cache.cc:1721
+msgid ""
+"Usage: apt-cache [options] command\n"
+" apt-cache [options] add file1 [file2 ...]\n"
+" apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
+" apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
+"\n"
+"apt-cache is a low-level tool used to manipulate APT's binary\n"
+"cache files, and query information from them\n"
+"\n"
+"Commands:\n"
+" add - Add a package file to the source cache\n"
+" gencaches - Build both the package and source cache\n"
+" showpkg - Show some general information for a single package\n"
+" showsrc - Show source records\n"
+" stats - Show some basic statistics\n"
+" dump - Show the entire file in a terse form\n"
+" dumpavail - Print an available file to stdout\n"
+" unmet - Show unmet dependencies\n"
+" search - Search the package list for a regex pattern\n"
+" show - Show a readable record for the package\n"
+" depends - Show raw dependency information for a package\n"
+" rdepends - Show reverse dependency information for a package\n"
+" pkgnames - List the names of all packages\n"
+" dotty - Generate package graphs for GraphVis\n"
+" xvcg - Generate package graphs for xvcg\n"
+" policy - Show policy settings\n"
+"\n"
+"Options:\n"
+" -h This help text.\n"
+" -p=? The package cache.\n"
+" -s=? The source cache.\n"
+" -q Disable progress indicator.\n"
+" -i Show only important deps for the unmet command.\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
+msgstr ""
+"วิธีใช้: apt-cache [ตัวเลือก] คำสั่ง\n"
+" apt-cache [ตัวเลือก] add file1 [file2 ...]\n"
+" apt-cache [ตัวเลือก] showpkg pkg1 [pkg2 ...]\n"
+" apt-cache [ตัวเลือก] showsrc pkg1 [pkg2 ...]\n"
+"\n"
+"apt-cache เป็นเครื่องมือระดับล่างสำหรับจัดการแฟ้มแคชไบนารีของ APT\n"
+"และใช้สืบค้นข้อมูลจากแคช\n"
+"\n"
+"คำสั่ง:\n"
+" add - เพิ่มแฟ้มแพกเกจเข้าในแคชของซอร์ส\n"
+" gencaches - สร้างทั้งแคชของแพกเกจและแคชของซอร์ส\n"
+" showpkg - แสดงข้อมูลทั่วไปของแพกเกจที่กำหนด\n"
+" showsrc - แสดงระเบียนข้อมูลซอร์ส\n"
+" stats - แสดงสถิติทั่วไป\n"
+" dump - แสดงเนื้อหาแคชทั้งหมดในรูปแบบดิบ\n"
+" dumpavail - แสดงข้อมูลแพกเกจที่มีทั้งหมดออกทาง stdout\n"
+" unmet - แสดงความเชื่อมโยงที่ยังขาดหาย\n"
+" search - ค้นรายชื่อแพกเกจด้วยนิพจน์เรกิวลาร์\n"
+" show - แสดงข้อมูลของแพกเกจ\n"
+" depends - แสดงข้อมูลแพกเกจที่ต้องใช้สำหรับแพกเกจที่กำหนด\n"
+" rdepends - แสดงข้อมูลแพกเกจอื่นที่ต้องใช้แพกเกจที่กำหนด\n"
+" pkgnames - แสดงรายชื่อแพกเกจทั้งหมด\n"
+" dotty - สร้างกราฟความเชื่อมโยงของแพกเกจในรูป GraphVis\n"
+" xvcg - สร้างกราฟความเชื่อมโยงของแพกเกจในรูป xvcg\n"
+" policy - แสดงค่าตั้งนโยบาย\n"
+"\n"
+"ตัวเลือก:\n"
+" -h แสดงข้อความช่วยเหลือนี้\n"
+" -p=? แฟ้มเก็บแคชของแพกเกจ\n"
+" -s=? แฟ้มเก็บแคชของซอร์ส\n"
+" -q ปิดแถบแสดงความคืบหน้า\n"
+" -i แสดงเฉพาะข้อมูลความเชื่อมโยงที่สำคัญสำหรับคำสั่ง unmet\n"
+" -c=? อ่านแฟ้มค่าตั้งนี้\n"
+" -o=? กำหนดตัวเลือกค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n"
+"กรุณาอ่านข้อมูลเพิ่มเติมจาก manual page apt-cache(8) และ apt.conf(5)\n"
+
+#: cmdline/apt-cdrom.cc:78
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr "กรุณาตั้งชื่อแผ่น เช่น 'Debian 4.0r1 Disk 1'"
+
+#: cmdline/apt-cdrom.cc:93
+msgid "Please insert a Disc in the drive and press enter"
+msgstr "กรุณาใส่แผ่นลงในไดรว์แล้วกด enter"
+
+#: cmdline/apt-cdrom.cc:117
+msgid "Repeat this process for the rest of the CDs in your set."
+msgstr "ทำเช่นนี้ต่อไปกับแผ่นซีดีที่เหลือในชุด"
+
+#: cmdline/apt-config.cc:41
+msgid "Arguments not in pairs"
+msgstr "อาร์กิวเมนต์ไม่ได้ระบุเป็นคู่ๆ"
+
+#: cmdline/apt-config.cc:76
+msgid ""
+"Usage: apt-config [options] command\n"
+"\n"
+"apt-config is a simple tool to read the APT config file\n"
+"\n"
+"Commands:\n"
+" shell - Shell mode\n"
+" dump - Show the configuration\n"
+"\n"
+"Options:\n"
+" -h This help text.\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"วิธีใช้: apt-config [ตัวเลือก] คำสั่ง\n"
+"\n"
+"apt-config เป็นเครื่องมือง่ายๆ ที่ใช้อ่านแฟ้มค่าตั้ง APT\n"
+"\n"
+"คำสั่ง:\n"
+" shell - โหมดเชลล์\n"
+" dump - แสดงค่าตั้ง\n"
+"\n"
+"ตัวเลือก:\n"
+" -h ข้อความช่วยเหลือนี้ -c=? อ่านแฟ้มค่าตั้งนี้\n"
+" -o=? กำหนดตัวเลือกค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n"
+
+#: cmdline/apt-extracttemplates.cc:98
+#, c-format
+msgid "%s not a valid DEB package."
+msgstr "%s ไม่ใช่แพกเกจ DEB ที่ใช้การได้"
+
+#: cmdline/apt-extracttemplates.cc:232
+msgid ""
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates is a tool to extract config and template info\n"
+"from debian packages\n"
+"\n"
+"Options:\n"
+" -h This help text\n"
+" -t Set the temp dir\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"วิธีใช้: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates เป็นเครื่องมือสำหรับแยกเอาข้อมูลการตั้งค่าและเทมเพลต\n"
+"ออกมาจากแพกเกจเดเบียน\n"
+"\n"
+"ตัวเลือก:\n"
+" -h แสดงข้อความช่วยเหลือนี้\n"
+" -t กำหนดไดเรกทอรีทำงานชั่วคราว\n"
+" -c=? อ่านแฟ้มค่าตั้งนี้\n"
+" -o=? กำหนดตัวเลือกค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n"
+
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:815
+#, c-format
+msgid "Unable to write to %s"
+msgstr "ไม่สามารถเขียนลงแฟ้ม %s"
+
+#: cmdline/apt-extracttemplates.cc:310
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "ไม่สามารถอ่านรุ่นของ debconf ได้ ได้ติดตั้ง debconf ไว้หรือไม่?"
+
+#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338
+msgid "Package extension list is too long"
+msgstr "รายชื่อนามสกุลแพกเกจยาวเกินไป"
+
+#: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180
+#: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253
+#: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289
+#, c-format
+msgid "Error processing directory %s"
+msgstr "เกิดข้อผิดพลาดขณะประมวลผลไดเรกทอรี %s"
+
+#: ftparchive/apt-ftparchive.cc:251
+msgid "Source extension list is too long"
+msgstr "รายชื่อนามสกุลซอร์สยาวเกินไป"
+
+#: ftparchive/apt-ftparchive.cc:368
+msgid "Error writing header to contents file"
+msgstr "เกิดข้อผิดพลาดขณะเขียนข้อมูลส่วนหัวลงในแฟ้มสารบัญ"
+
+#: ftparchive/apt-ftparchive.cc:398
+#, c-format
+msgid "Error processing contents %s"
+msgstr "เกิดข้อผิดพลาดขณะประมวลผลสารบัญ %s"
+
+#: ftparchive/apt-ftparchive.cc:553
+msgid ""
+"Usage: apt-ftparchive [options] command\n"
+"Commands: packages binarypath [overridefile [pathprefix]]\n"
+" sources srcpath [overridefile [pathprefix]]\n"
+" contents path\n"
+" release path\n"
+" generate config [groups]\n"
+" clean config\n"
+"\n"
+"apt-ftparchive generates index files for Debian archives. It supports\n"
+"many styles of generation from fully automated to functional replacements\n"
+"for dpkg-scanpackages and dpkg-scansources\n"
+"\n"
+"apt-ftparchive generates Package files from a tree of .debs. The\n"
+"Package file contains the contents of all the control fields from\n"
+"each package as well as the MD5 hash and filesize. An override file\n"
+"is supported to force the value of Priority and Section.\n"
+"\n"
+"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+"The --source-override option can be used to specify a src override file\n"
+"\n"
+"The 'packages' and 'sources' command should be run in the root of the\n"
+"tree. BinaryPath should point to the base of the recursive search and \n"
+"override file should contain the override flags. Pathprefix is\n"
+"appended to the filename fields if present. Example usage from the \n"
+"Debian archive:\n"
+" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+" dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Options:\n"
+" -h This help text\n"
+" --md5 Control MD5 generation\n"
+" -s=? Source override file\n"
+" -q Quiet\n"
+" -d=? Select the optional caching database\n"
+" --no-delink Enable delinking debug mode\n"
+" --contents Control contents file generation\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitrary configuration option"
+msgstr ""
+"วิธีใช้: apt-ftparchive [ตัวเลือก] คำสั่ง\n"
+"คำสั่ง: packages binarypath [overridefile [pathprefix]]\n"
+" sources srcpath [overridefile [pathprefix]]\n"
+" contents path\n"
+" release path\n"
+" generate config [groups]\n"
+" clean config\n"
+"\n"
+"apt-ftparchive ใช้สร้างแฟ้มดัชนีสำหรับแหล่งแพกเกจเดเบียน รองรับวิธีสร้างหลายแบบ\n"
+"ตั้งแต่แบบอัตโนมัติทั้งหมด ไปจนถึงการใช้แทน dpkg-scanpackages และ dpkg-scansources\n"
+"\n"
+"apt-ftparchive สร้างแฟ้ม Package จากต้นไม้ไดเรกทอรีที่เก็บ .deb แฟ้ม Package\n"
+"จะรวมเนื้อหาข้อมูลควบคุมทุกรายการของแต่ละแพกเกจ รวมถึง MD5 hash และขนาดแฟ้ม\n"
+"และรองรับการสร้างแฟ้ม override เพื่อบังคับค่าลำดับความสำคัญและหมวดแพกเกจด้วย\n"
+"\n"
+"ในทำนองเดียวกัน apt-ftparchive จะสร้างแฟ้ม Sources จากต้นไม้ไดเรกทอรีที่เก็บ .dsc\n"
+"คุณสามารถใช้ตัวเลือก --source-override เพื่อระบุแฟ้ม override สำหรับซอร์สได้\n"
+"\n"
+"คำสั่ง 'packages' และ 'sources' ควรเรียกที่ตำแหน่งรากของต้นไม้ไดเรกทอรี\n"
+"ค่า binarypath ควรชี้ไปที่ตำแหน่งฐานที่จะค้นหาแบบทั่วถึง และแฟ้ม override ก็ควรมีแฟล็ก\n"
+"override ต่างๆ สำหรับแพกเกจ ค่า pathprefix จะถูกเพิ่มเข้าที่หน้าข้อมูล filename ถ้ามี\n"
+"ตัวอย่างการใช้งานจากแหล่งแพกเกจเดเบียน:\n"
+" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+" dists/potato/main/binary-i386/Packages\n"
+"\n"
+"ตัวเลือก:\n"
+" -h แสดงข้อความช่วยเหลือนี้\n"
+" --md5 ควบคุมการสร้าง MD5\n"
+" -s=? แฟ้ม override สำหรับซอร์ส\n"
+" -q ทำงานแบบเงียบ\n"
+" -d=? เลือกฐานข้อมูลแคชอื่น\n"
+" --no-delink เปิดโหมดดีบั๊กสำหรับการตัดลิงก์\n"
+" --contents ควบคุมการสร้างแฟ้มสารบัญ\n"
+" -c=? อ่านแฟ้มค่าตั้งนี้\n"
+" -o=? กำหนดตัวเลือกค่าตั้งเป็นรายตัว"
+
+#: ftparchive/apt-ftparchive.cc:759
+msgid "No selections matched"
+msgstr "ไม่มีรายการเลือกที่ตรง"
+
+#: ftparchive/apt-ftparchive.cc:832
+#, c-format
+msgid "Some files are missing in the package file group `%s'"
+msgstr "บางแฟ้มขาดหายไปในกลุ่มแฟ้มแพกเกจ `%s'"
+
+#: ftparchive/cachedb.cc:43
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "DB เสีย จะเปลี่ยนชื่อแฟ้มเป็น %s.old"
+
+#: ftparchive/cachedb.cc:61
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "DB เป็นรุ่นเก่า จะพยายามปรับรุ่น %s ขึ้น"
+
+#: ftparchive/cachedb.cc:72
+msgid ""
+"DB format is invalid. If you upgraded from a older version of apt, please "
+"remove and re-create the database."
+msgstr "ฟอร์แมตของ DB ผิด ถ้าคุณเพิ่งปรับรุ่นมาจาก apt รุ่นเก่า กรุณาลบฐานข้อมูลแล้วสร้างใหม่"
+
+#: ftparchive/cachedb.cc:77
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "ไม่สามารถเปิดแฟ้ม DB %s: %s"
+
+#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190
+#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117 methods/gpgv.cc:272
+#, c-format
+msgid "Failed to stat %s"
+msgstr "stat %s ไม่สำเร็จ"
+
+#: ftparchive/cachedb.cc:238
+msgid "Archive has no control record"
+msgstr "แพกเกจไม่มีระเบียนควบคุม"
+
+#: ftparchive/cachedb.cc:444
+msgid "Unable to get a cursor"
+msgstr "ไม่สามารถนำตัวชี้ตำแหน่งมาใช้ได้"
+
+#: ftparchive/writer.cc:75
+#, c-format
+msgid "W: Unable to read directory %s\n"
+msgstr "W: อ่านไดเรกทอรี %s ไม่สำเร็จ\n"
+
+#: ftparchive/writer.cc:80
+#, c-format
+msgid "W: Unable to stat %s\n"
+msgstr "W: stat %s ไม่สำเร็จ\n"
+
+#: ftparchive/writer.cc:131
+msgid "E: "
+msgstr "E: "
+
+#: ftparchive/writer.cc:133
+msgid "W: "
+msgstr "W: "
+
+#: ftparchive/writer.cc:140
+msgid "E: Errors apply to file "
+msgstr "E: ข้อผิดพลาดเกิดกับแฟ้ม "
+
+#: ftparchive/writer.cc:157 ftparchive/writer.cc:187
+#, c-format
+msgid "Failed to resolve %s"
+msgstr "หาพาธเต็มของ %s ไม่สำเร็จ"
+
+#: ftparchive/writer.cc:169
+msgid "Tree walking failed"
+msgstr "เดินท่องต้นไม้ไม่สำเร็จ"
+
+#: ftparchive/writer.cc:194
+#, c-format
+msgid "Failed to open %s"
+msgstr "เปิด %s ไม่สำเร็จ"
+
+#: ftparchive/writer.cc:253
+#, c-format
+msgid " DeLink %s [%s]\n"
+msgstr " DeLink %s [%s]\n"
+
+#: ftparchive/writer.cc:261
+#, c-format
+msgid "Failed to readlink %s"
+msgstr "readlink %s ไม่สำเร็จ"
+
+#: ftparchive/writer.cc:265
+#, c-format
+msgid "Failed to unlink %s"
+msgstr "unlink %s ไม่สำเร็จ"
+
+#: ftparchive/writer.cc:272
+#, c-format
+msgid "*** Failed to link %s to %s"
+msgstr "*** ลิงก์ %s ไปยัง %s ไม่สำเร็จ"
+
+#: ftparchive/writer.cc:282
+#, c-format
+msgid " DeLink limit of %sB hit.\n"
+msgstr " มาถึงขีดจำกัดการ DeLink ที่ %sB แล้ว\n"
+
+#: ftparchive/writer.cc:386
+msgid "Archive had no package field"
+msgstr "แพกเกจไม่มีช่องข้อมูล 'Package'"
+
+#: ftparchive/writer.cc:394 ftparchive/writer.cc:609
+#, c-format
+msgid " %s has no override entry\n"
+msgstr " %s ไม่มีข้อมูล override\n"
+
+#: ftparchive/writer.cc:439 ftparchive/writer.cc:697
+#, c-format
+msgid " %s maintainer is %s not %s\n"
+msgstr " ผู้ดูแล %s คือ %s ไม่ใช่ %s\n"
+
+#: ftparchive/writer.cc:619
+#, c-format
+msgid " %s has no source override entry\n"
+msgstr " %s ไม่มีข้อมูล override สำหรับซอร์ส\n"
+
+#: ftparchive/writer.cc:623
+#, c-format
+msgid " %s has no binary override entry either\n"
+msgstr " %s ไม่มีข้อมูล override สำหรับไบนารีเช่นกัน\n"
+
+#: ftparchive/contents.cc:317
+#, c-format
+msgid "Internal error, could not locate member %s"
+msgstr "ข้อผิดพลาดภายใน: ไม่พบสมาชิก %s"
+
+#: ftparchive/contents.cc:353 ftparchive/contents.cc:384
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - จองหน่วยความจำไม่สำเร็จ"
+
+#: ftparchive/override.cc:34 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "ไม่สามารถเปิด %s"
+
+#: ftparchive/override.cc:60 ftparchive/override.cc:166
+#, c-format
+msgid "Malformed override %s line %lu #1"
+msgstr "แฟ้ม override %s ผิดรูปแบบที่บรรทัด %lu #1"
+
+#: ftparchive/override.cc:74 ftparchive/override.cc:178
+#, c-format
+msgid "Malformed override %s line %lu #2"
+msgstr "แฟ้ม override %s ผิดรูปแบบที่บรรทัด %lu #2"
+
+#: ftparchive/override.cc:88 ftparchive/override.cc:191
+#, c-format
+msgid "Malformed override %s line %lu #3"
+msgstr "แฟ้ม override %s ผิดรูปแบบที่บรรทัด %lu #3"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "ไม่สามารถอ่านแฟ้ม override %s"
+
+#: ftparchive/multicompress.cc:71
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "ไม่รู้จักอัลกอริทึมบีบอัด '%s'"
+
+#: ftparchive/multicompress.cc:101
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "ผลลัพธ์ของการบีบอัด %s ต้องมีชุดของการบีบอัดด้วย"
+
+#: ftparchive/multicompress.cc:168 methods/rsh.cc:91
+msgid "Failed to create IPC pipe to subprocess"
+msgstr "ไม่สามารถสร้างไปป์ IPC ไปยังโพรเซสย่อย"
+
+#: ftparchive/multicompress.cc:194
+msgid "Failed to create FILE*"
+msgstr "สร้าง FILE* ไม่สำเร็จ"
+
+#: ftparchive/multicompress.cc:197
+msgid "Failed to fork"
+msgstr "fork ไม่สำเร็จ"
+
+#: ftparchive/multicompress.cc:211
+msgid "Compress child"
+msgstr "โพรเซสลูกสำหรับบีบอัด"
+
+#: ftparchive/multicompress.cc:234
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "ข้อผิดพลาดภายใน: ไม่สามารถสร้าง %s"
+
+#: ftparchive/multicompress.cc:285
+msgid "Failed to create subprocess IPC"
+msgstr "สร้าง IPC ของโพรเซสย่อยไม่สำเร็จ"
+
+#: ftparchive/multicompress.cc:320
+msgid "Failed to exec compressor "
+msgstr "เรียกทำงานตัวบีบอัดไม่สำเร็จ"
+
+#: ftparchive/multicompress.cc:359
+msgid "decompressor"
+msgstr "ตัวคลายบีบอัด"
+
+#: ftparchive/multicompress.cc:402
+msgid "IO to subprocess/file failed"
+msgstr "IO ไปยังโพรเซสย่อยหรือแฟ้มล้มเหลว"
+
+#: ftparchive/multicompress.cc:454
+msgid "Failed to read while computing MD5"
+msgstr "อ่านแฟ้มไม่สำเร็จขณะคำนวณ MD5"
+
+#: ftparchive/multicompress.cc:471
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "มีปัญหาขณะลบแฟ้ม %s"
+
+#: ftparchive/multicompress.cc:486 apt-inst/extract.cc:185
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "ไม่สามารถเปลี่ยนชื่อ %s ไปเป็น %s"
+
+#: cmdline/apt-get.cc:121
+msgid "Y"
+msgstr "Y"
+
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1673
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "คอมไพล์นิพจน์เรกิวลาร์ไม่สำเร็จ - %s"
+
+#: cmdline/apt-get.cc:238
+msgid "The following packages have unmet dependencies:"
+msgstr "แพกเกจต่อไปนี้ขาดแพกเกจที่ต้องใช้:"
+
+#: cmdline/apt-get.cc:328
+#, c-format
+msgid "but %s is installed"
+msgstr "แต่รุ่นที่ติดตั้งไว้คือ %s"
+
+#: cmdline/apt-get.cc:330
+#, c-format
+msgid "but %s is to be installed"
+msgstr "แต่รุ่นที่จะติดตั้งคือ %s"
+
+#: cmdline/apt-get.cc:337
+msgid "but it is not installable"
+msgstr "แต่ไม่สามารถติดตั้งได้"
+
+#: cmdline/apt-get.cc:339
+msgid "but it is a virtual package"
+msgstr "แต่แพกเกจนี้เป็นแพกเกจเสมือน"
+
+#: cmdline/apt-get.cc:342
+msgid "but it is not installed"
+msgstr "แต่ได้ติดตั้งไว้"
+
+#: cmdline/apt-get.cc:342
+msgid "but it is not going to be installed"
+msgstr "แต่แพกเกจนี้จะไม่ถูกติดตั้ง"
+
+#: cmdline/apt-get.cc:347
+msgid " or"
+msgstr " หรือ"
+
+#: cmdline/apt-get.cc:376
+msgid "The following NEW packages will be installed:"
+msgstr "จะติดตั้งแพกเกจ *ใหม่* ต่อไปนี้:"
+
+#: cmdline/apt-get.cc:402
+msgid "The following packages will be REMOVED:"
+msgstr "จะ *ลบ* แพกเกจต่อไปนี้:"
+
+#: cmdline/apt-get.cc:424
+msgid "The following packages have been kept back:"
+msgstr "จะคงรุ่นแพกเกจต่อไปนี้:"
+
+#: cmdline/apt-get.cc:445
+msgid "The following packages will be upgraded:"
+msgstr "จะปรับรุ่นแพกเกจต่อไปนี้ขึ้น:"
+
+#: cmdline/apt-get.cc:466
+msgid "The following packages will be DOWNGRADED:"
+msgstr "จะปรับรุ่นแพกเกจต่อไปนี้ *ลง*:"
+
+#: cmdline/apt-get.cc:486
+msgid "The following held packages will be changed:"
+msgstr "จะเปลี่ยนแปลงรายการคงรุ่นแพกเกจต่อไปนี้:"
+
+#: cmdline/apt-get.cc:539
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (เนื่องจาก %s) "
+
+#: cmdline/apt-get.cc:547
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"*คำเตือน*: แพกเกจที่จำเป็นต่อไปนี้จะถูกถอดถอน\n"
+"คุณ *ไม่ควร* ทำเช่นนี้ นอกจากคุณเข้าใจสิ่งที่จะทำ!"
+
+#: cmdline/apt-get.cc:578
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "ปรับรุ่นขึ้น %lu, ติดตั้งใหม่ %lu, "
+
+#: cmdline/apt-get.cc:582
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "ติดตั้งซ้ำ %lu, "
+
+#: cmdline/apt-get.cc:584
+#, c-format
+msgid "%lu downgraded, "
+msgstr "ปรับรุ่นลง %lu, "
+
+#: cmdline/apt-get.cc:586
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "ถอดถอน %lu และไม่ปรับรุ่น %lu\n"
+
+#: cmdline/apt-get.cc:590
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "ติดตั้งหรือถอดถอนไม่ครบ %lu\n"
+
+#: cmdline/apt-get.cc:664
+msgid "Correcting dependencies..."
+msgstr "กำลังแก้ปัญหาความขึ้นต่อกันระหว่างแพกเกจ..."
+
+#: cmdline/apt-get.cc:667
+msgid " failed."
+msgstr " ล้มเหลว"
+
+#: cmdline/apt-get.cc:670
+msgid "Unable to correct dependencies"
+msgstr "ไม่สามารถแก้ปัญหาความขึ้นต่อกันระหว่างแพกเกจได้"
+
+#: cmdline/apt-get.cc:673
+msgid "Unable to minimize the upgrade set"
+msgstr "ไม่สามารถจำกัดรายการปรับรุ่นให้น้อยที่สุดได้"
+
+#: cmdline/apt-get.cc:675
+msgid " Done"
+msgstr " เสร็จแล้ว"
+
+#: cmdline/apt-get.cc:679
+msgid "You might want to run `apt-get -f install' to correct these."
+msgstr "คุณอาจต้องเรียก `apt-get -f install' เพื่อแก้ปัญหาเหล่านี้"
+
+#: cmdline/apt-get.cc:682
+msgid "Unmet dependencies. Try using -f."
+msgstr "รายการแพกเกจที่ต้องใช้ไม่ครบ กรุณาลองใช้ตัวเลือก -f"
+
+#: cmdline/apt-get.cc:704
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "*คำเตือน*: แพกเกจต่อไปนี้ไม่สามารถยืนยันแหล่งต้นตอได้!"
+
+#: cmdline/apt-get.cc:708
+msgid "Authentication warning overridden.\n"
+msgstr "จะข้ามการเตือนเกี่ยวกับการยืนยันแหล่งต้นตอ\n"
+
+#: cmdline/apt-get.cc:715
+msgid "Install these packages without verification [y/N]? "
+msgstr "จะติดตั้งแพกเกจเหล่านี้โดยไม่ตรวจสอบหรือไม่ [y/N]? "
+
+#: cmdline/apt-get.cc:717
+msgid "Some packages could not be authenticated"
+msgstr "มีบางแพกเกจไม่สามารถยืนยันแหล่งต้นตอได้"
+
+#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873
+msgid "There are problems and -y was used without --force-yes"
+msgstr "มีปัญหาบางประการ และมีการใช้ -y โดยไม่ระบุ --force-yes"
+
+#: cmdline/apt-get.cc:770
+msgid "Internal error, InstallPackages was called with broken packages!"
+msgstr "เกิดข้อผิดพลาดภายใน: มีการเรียก InstallPackages ด้วยแพกเกจที่เสีย!"
+
+#: cmdline/apt-get.cc:779
+msgid "Packages need to be removed but remove is disabled."
+msgstr "มีแพกเกจที่จำเป็นต้องถอดถอน แต่ถูกห้ามการถอดถอนไว้"
+
+#: cmdline/apt-get.cc:790
+msgid "Internal error, Ordering didn't finish"
+msgstr "ข้อผิดพลาดภายใน: การเรียงลำดับไม่เสร็จสิ้น"
+
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2011 cmdline/apt-get.cc:2044
+msgid "Unable to lock the download directory"
+msgstr "ไม่สามารถล็อคไดเรกทอรีดาวน์โหลด"
+
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2092 cmdline/apt-get.cc:2333
+#: apt-pkg/cachefile.cc:63
+msgid "The list of sources could not be read."
+msgstr "ไม่สามารถอ่านรายชื่อแหล่งแพกเกจได้"
+
+#: cmdline/apt-get.cc:831
+msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
+msgstr "แปลกประหลาด.. ขนาดไม่ตรงกัน กรุณาอีเมลแจ้ง apt@packages.debian.org"
+
+#: cmdline/apt-get.cc:836
+#, c-format
+msgid "Need to get %sB/%sB of archives.\n"
+msgstr "ต้องดาวน์โหลดแพกเกจ %sB/%sB\n"
+
+#: cmdline/apt-get.cc:839
+#, c-format
+msgid "Need to get %sB of archives.\n"
+msgstr "ต้องดาวน์โหลดแพกเกจ %sB\n"
+
+#: cmdline/apt-get.cc:844
+#, c-format
+msgid "After unpacking %sB of additional disk space will be used.\n"
+msgstr "หลังจากแตกแพกเกจแล้ว ต้องใช้เนื้อที่บนดิสก์อีก %s\n"
+
+#: cmdline/apt-get.cc:847
+#, c-format
+msgid "After unpacking %sB disk space will be freed.\n"
+msgstr "หลังจากแตกแพกเกจแล้ว เนื้อที่บนดิสก์จะว่างเพิ่มอีก %s\n"
+
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2187
+#, c-format
+msgid "Couldn't determine free space in %s"
+msgstr "ไม่สามารถคำนวณพื้นที่ว่างใน %s"
+
+#: cmdline/apt-get.cc:864
+#, c-format
+msgid "You don't have enough free space in %s."
+msgstr "คุณมีพื้นที่ว่างเหลือไม่พอใน %s"
+
+#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899
+msgid "Trivial Only specified but this is not a trivial operation."
+msgstr "Trivial Only ถูกกำหนดไว้ แต่คำสั่งนี้ไม่ใช่คำสั่งเล็กน้อย"
+
+#: cmdline/apt-get.cc:881
+msgid "Yes, do as I say!"
+msgstr "Yes, do as I say!"
+
+#: cmdline/apt-get.cc:883
+#, c-format
+msgid ""
+"You are about to do something potentially harmful.\n"
+"To continue type in the phrase '%s'\n"
+" ?] "
+msgstr ""
+"คุณกำลังจะทำสิ่งที่อาจเป็นอันตราย\n"
+"หากต้องการดำเนินการต่อ ให้พิมพ์ประโยค '%s'\n"
+" ?] "
+
+#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
+msgid "Abort."
+msgstr "เลิกทำ"
+
+#: cmdline/apt-get.cc:904
+msgid "Do you want to continue [Y/n]? "
+msgstr "คุณต้องการจะดำเนินการต่อไปหรือไม่ [Y/n]?"
+
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2230
+#, c-format
+msgid "Failed to fetch %s %s\n"
+msgstr "ไม่สามารถดาวน์โหลด %s %s\n"
+
+#: cmdline/apt-get.cc:994
+msgid "Some files failed to download"
+msgstr "ดาวน์โหลดบางแฟ้มไม่สำเร็จ"
+
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2239
+msgid "Download complete and in download only mode"
+msgstr "ดาวน์โหลดสำเร็จแล้ว และอยู่ในโหมดดาวน์โหลดอย่างเดียว"
+
+#: cmdline/apt-get.cc:1001
+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:1005
+msgid "--fix-missing and media swapping is not currently supported"
+msgstr "ยังไม่รองรับ --fix-missing พร้อมกับการเปลี่ยนแผ่น"
+
+#: cmdline/apt-get.cc:1010
+msgid "Unable to correct missing packages."
+msgstr "ไม่สามารถแก้ปัญหาแพกเกจที่ขาดหายได้"
+
+#: cmdline/apt-get.cc:1011
+msgid "Aborting install."
+msgstr "จะล้มเลิกการติดตั้ง"
+
+#: cmdline/apt-get.cc:1045
+#, c-format
+msgid "Note, selecting %s instead of %s\n"
+msgstr "หมายเหตุ: จะเลือก %s แทน %s\n"
+
+#: cmdline/apt-get.cc:1055
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr "จะข้าม %s เนื่องจากแพกเกจติดตั้งไว้แล้ว และไม่มีการกำหนดให้ปรับรุ่น\n"
+
+#: cmdline/apt-get.cc:1073
+#, c-format
+msgid "Package %s is not installed, so not removed\n"
+msgstr "แพกเกจ %s ไม่ได้ติดตั้งไว้ จึงไม่มีการถอดถอน\n"
+
+#: cmdline/apt-get.cc:1084
+#, c-format
+msgid "Package %s is a virtual package provided by:\n"
+msgstr "แพกเกจ %s เป็นแพกเกจเสมือนที่ตระเตรียมโดย:\n"
+
+#: cmdline/apt-get.cc:1096
+msgid " [Installed]"
+msgstr " [ติดตั้งอยู่]"
+
+#: cmdline/apt-get.cc:1101
+msgid "You should explicitly select one to install."
+msgstr "คุณควรเจาะจงเลือกแพกเกจใดแพกเกจหนึ่งเพื่อติดตั้ง"
+
+#: cmdline/apt-get.cc:1106
+#, c-format
+msgid ""
+"Package %s is not available, but is referred to by another package.\n"
+"This may mean that the package is missing, has been obsoleted, or\n"
+"is only available from another source\n"
+msgstr ""
+"ไม่มีแพกเกจ %s ให้ใช้ติดตั้ง แต่ถูกอ้างถึงโดยแพกเกจอื่น\n"
+"แพกเกจนี้อาจขาดหายไป หรือตกรุ่นไปแล้ว หรืออยู่ในแหล่งอื่น\n"
+
+#: cmdline/apt-get.cc:1125
+msgid "However the following packages replace it:"
+msgstr "อย่างไรก็ดี แพกเกจต่อไปนี้ได้แทนที่แพกเกจดังกล่าวไปแล้ว:"
+
+#: cmdline/apt-get.cc:1128
+#, c-format
+msgid "Package %s has no installation candidate"
+msgstr "แพกเกจ %s ไม่มีรุ่นที่จะใช้ติดตั้ง"
+
+#: cmdline/apt-get.cc:1148
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "ไม่สามารถติดตั้ง %s ซ้ำได้ เนื่องจากไม่สามารถดาวน์โหลดได้\n"
+
+#: cmdline/apt-get.cc:1156
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s เป็นรุ่นใหม่ล่าสุดอยู่แล้ว\n"
+
+#: cmdline/apt-get.cc:1185
+#, c-format
+msgid "Release '%s' for '%s' was not found"
+msgstr "ไม่พบรุ่นย่อย '%s' ของ '%s'"
+
+#: cmdline/apt-get.cc:1187
+#, c-format
+msgid "Version '%s' for '%s' was not found"
+msgstr "ไม่พบรุ่น '%s' ของ '%s'"
+
+#: cmdline/apt-get.cc:1193
+#, c-format
+msgid "Selected version %s (%s) for %s\n"
+msgstr "เลือกรุ่น %s (%s) สำหรับ %s แล้ว\n"
+
+#: cmdline/apt-get.cc:1330
+msgid "The update command takes no arguments"
+msgstr "คำสั่ง update ไม่รับอาร์กิวเมนต์เพิ่ม"
+
+#: cmdline/apt-get.cc:1343
+msgid "Unable to lock the list directory"
+msgstr "ไม่สามารถล็อคไดเรกทอรีรายชื่อแพกเกจ"
+
+#: cmdline/apt-get.cc:1410 cmdline/apt-get.cc:1412
+msgid ""
+"Some index files failed to download, they have been ignored, or old ones "
+"used instead."
+msgstr "ดาวน์โหลดแฟ้มดัชนีบางแฟ้มไม่สำเร็จ จะข้ามรายการดังกล่าวไป หรือใช้ข้อมูลเก่าแทน"
+
+#: cmdline/apt-get.cc:1433
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr "apt ถูกกำหนดไม่ให้มีการลบใดๆ จึงไม่สามารถดำเนินการถอดถอนอัตโนมัติได้"
+
+#: cmdline/apt-get.cc:1465
+msgid ""
+"The following packages were automatically installed and are no longer "
+"required:"
+msgstr "แพกเกจต่อไปนี้ถูกติดตั้งแบบอัตโนมัติไว้ และไม่ต้องใช้อีกต่อไปแล้ว:"
+
+#: cmdline/apt-get.cc:1467
+msgid "Use 'apt-get autoremove' to remove them."
+msgstr "ใช้ 'apt-get autoremove' เพื่อลบแพกเกจดังกล่าวได้"
+
+#: cmdline/apt-get.cc:1472
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+"ดูเหมือนการถอดถอนอัตโนมัติได้สร้างความเสียหายบางอย่าง ซึ่งไม่ควรเกิดขึ้น\n"
+"กรุณารายงานบั๊กนี้ของแพกเกจ apt"
+
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1754
+msgid "The following information may help to resolve the situation:"
+msgstr "ข้อมูลต่อไปนี้อาจช่วยแก้ปัญหาได้:"
+
+#: cmdline/apt-get.cc:1479
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "เกิดข้อผิดพลาดภายใน: AutoRemover ทำความเสียหาย"
+
+#: cmdline/apt-get.cc:1498
+msgid "Internal error, AllUpgrade broke stuff"
+msgstr "เกิดข้อผิดพลาดภายใน: AllUpgrade ทำความเสียหาย"
+
+#: cmdline/apt-get.cc:1545
+#, c-format
+msgid "Couldn't find task %s"
+msgstr "ไม่พบงาน %s"
+
+#: cmdline/apt-get.cc:1660 cmdline/apt-get.cc:1696
+#, c-format
+msgid "Couldn't find package %s"
+msgstr "ไม่พบแพกเกจ %s"
+
+#: cmdline/apt-get.cc:1683
+#, c-format
+msgid "Note, selecting %s for regex '%s'\n"
+msgstr "หมายเหตุ: จะเลือก %s สำหรับนิพจน์เรกิวลาร์ '%s'\n"
+
+#: cmdline/apt-get.cc:1713
+#, c-format
+msgid "%s set to manual installed.\n"
+msgstr "กำหนด %s ให้เป็นการติดตั้งแบบเลือกเองแล้ว\n"
+
+#: cmdline/apt-get.cc:1726
+msgid "You might want to run `apt-get -f install' to correct these:"
+msgstr "คุณอาจเรียก `apt-get -f install' เพื่อแก้ปัญหานี้ได้:"
+
+#: cmdline/apt-get.cc:1729
+msgid ""
+"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
+"solution)."
+msgstr ""
+"มีปัญหาความขึ้นต่อกันระหว่างแพกเกจ กรุณาลองใช้ 'apt-get -f install' โดยไม่ระบุแพกเกจ "
+"(หรือจะระบุทางแก้ก็ได้)"
+
+#: cmdline/apt-get.cc:1741
+msgid ""
+"Some packages could not be installed. This may mean that you have\n"
+"requested an impossible situation or if you are using the unstable\n"
+"distribution that some required packages have not yet been created\n"
+"or been moved out of Incoming."
+msgstr ""
+"ไม่สามารถติดตั้งบางแพกเกจได้ คุณอาจระบุเงื่อนไขการติดตั้งที่เป็นไปไม่ได้\n"
+"หรือถ้าคุณกำลังใช้รุ่น unstable ก็เป็นไปได้ว่าแพกเกจที่จำเป็นบางรายการ\n"
+"ยังไม่ถูกสร้างขึ้น หรือถูกย้ายออกจาก Incoming"
+
+#: cmdline/apt-get.cc:1749
+msgid ""
+"Since you only requested a single operation it is extremely likely that\n"
+"the package is simply not installable and a bug report against\n"
+"that package should be filed."
+msgstr ""
+"และเนื่องจากคุณได้สั่งดำเนินการเพียงรายการเดียวเท่านั้น ก็เป็นไปได้สูงว่าแพกเกจนี้เสีย\n"
+"คุณควรจะรายงานบั๊กสำหรับแพกเกจนี้"
+
+#: cmdline/apt-get.cc:1757
+msgid "Broken packages"
+msgstr "แพกเกจมีปัญหา"
+
+#: cmdline/apt-get.cc:1786
+msgid "The following extra packages will be installed:"
+msgstr "จะติดตั้งแพกเกจเพิ่มเติมต่อไปนี้:"
+
+#: cmdline/apt-get.cc:1875
+msgid "Suggested packages:"
+msgstr "แพกเกจที่แนะนำ:"
+
+#: cmdline/apt-get.cc:1876
+msgid "Recommended packages:"
+msgstr "แพกเกจที่ควรใช้ร่วมกัน:"
+
+#: cmdline/apt-get.cc:1904
+msgid "Calculating upgrade... "
+msgstr "กำลังคำนวณการปรับรุ่น... "
+
+#: cmdline/apt-get.cc:1907 methods/ftp.cc:702 methods/connect.cc:101
+msgid "Failed"
+msgstr "ล้มเหลว"
+
+#: cmdline/apt-get.cc:1912
+msgid "Done"
+msgstr "เสร็จแล้ว"
+
+#: cmdline/apt-get.cc:1979 cmdline/apt-get.cc:1987
+msgid "Internal error, problem resolver broke stuff"
+msgstr "เกิดข้อผิดพลาดภายใน: กลไกการแก้ปัญหาทำความเสียหาย"
+
+#: cmdline/apt-get.cc:2087
+msgid "Must specify at least one package to fetch source for"
+msgstr "ต้องระบุแพกเกจอย่างน้อยหนึ่งแพกเกจที่จะดาวน์โหลดซอร์สโค้ด"
+
+#: cmdline/apt-get.cc:2117 cmdline/apt-get.cc:2351
+#, c-format
+msgid "Unable to find a source package for %s"
+msgstr "ไม่พบแพกเกจซอร์สโค้ดสำหรับ %s"
+
+#: cmdline/apt-get.cc:2166
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "จะข้ามแฟ้ม '%s' ที่ดาวน์โหลดไว้แล้ว\n"
+
+#: cmdline/apt-get.cc:2190
+#, c-format
+msgid "You don't have enough free space in %s"
+msgstr "คุณมีพื้นที่ว่างเหลือไม่พอใน %s"
+
+#: cmdline/apt-get.cc:2195
+#, c-format
+msgid "Need to get %sB/%sB of source archives.\n"
+msgstr "ต้องดาวน์โหลดซอร์สโค้ด %sB/%sB\n"
+
+#: cmdline/apt-get.cc:2198
+#, c-format
+msgid "Need to get %sB of source archives.\n"
+msgstr "ต้องดาวน์โหลดซอร์สโค้ด %sB\n"
+
+#: cmdline/apt-get.cc:2204
+#, c-format
+msgid "Fetch source %s\n"
+msgstr "ดาวน์โหลดซอร์ส %s\n"
+
+#: cmdline/apt-get.cc:2235
+msgid "Failed to fetch some archives."
+msgstr "ไม่สามารถดาวน์โหลดบางแฟ้ม"
+
+#: cmdline/apt-get.cc:2263
+#, c-format
+msgid "Skipping unpack of already unpacked source in %s\n"
+msgstr "จะข้ามการแตกซอร์สของซอร์สที่แตกไว้แล้วใน %s\n"
+
+#: cmdline/apt-get.cc:2275
+#, c-format
+msgid "Unpack command '%s' failed.\n"
+msgstr "คำสั่งแตกแฟ้ม '%s' ล้มเหลว\n"
+
+#: cmdline/apt-get.cc:2276
+#, c-format
+msgid "Check if the 'dpkg-dev' package is installed.\n"
+msgstr "กรุณาตรวจสอบว่าได้ติดตั้งแพกเกจ 'dpkg-dev' แล้ว\n"
+
+#: cmdline/apt-get.cc:2293
+#, c-format
+msgid "Build command '%s' failed.\n"
+msgstr "คำสั่ง build '%s' ล้มเหลว\n"
+
+#: cmdline/apt-get.cc:2312
+msgid "Child process failed"
+msgstr "โพรเซสลูกล้มเหลว"
+
+#: cmdline/apt-get.cc:2328
+msgid "Must specify at least one package to check builddeps for"
+msgstr "ต้องระบุแพกเกจอย่างน้อยหนึ่งแพกเกจที่จะตรวจสอบสิ่งที่ต้องการสำหรับการ build"
+
+#: cmdline/apt-get.cc:2356
+#, c-format
+msgid "Unable to get build-dependency information for %s"
+msgstr "ไม่สามารถอ่านข้อมูลสิ่งที่ต้องการสำหรับการ build ของ %s"
+
+#: cmdline/apt-get.cc:2376
+#, c-format
+msgid "%s has no build depends.\n"
+msgstr "%s ไม่ต้องการสิ่งใดสำหรับ build\n"
+
+#: cmdline/apt-get.cc:2428
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because the package %s cannot be "
+"found"
+msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะไม่พบแพกเกจ %s"
+
+#: cmdline/apt-get.cc:2480
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because no available versions of "
+"package %s can satisfy version requirements"
+msgstr ""
+"ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะไม่มีแพกเกจ %s "
+"รุ่นที่จะสอดคล้องกับความต้องการรุ่นของแพกเกจได้"
+
+#: cmdline/apt-get.cc:2515
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้: แพกเกจ %s ที่ติดตั้งไว้ใหม่เกินไป"
+
+#: cmdline/apt-get.cc:2540
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: %s"
+msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้: %s"
+
+#: cmdline/apt-get.cc:2554
+#, c-format
+msgid "Build-dependencies for %s could not be satisfied."
+msgstr "ไม่สามารถติดตั้งสิ่งที่จำเป็นสำหรับการ build ของ %s ได้"
+
+#: cmdline/apt-get.cc:2558
+msgid "Failed to process build dependencies"
+msgstr "ติดตั้งสิ่งที่จำเป็นสำหรับการ build ไม่สำเร็จ"
+
+#: cmdline/apt-get.cc:2590
+msgid "Supported modules:"
+msgstr "มอดูลที่รองรับ:"
+
+#: cmdline/apt-get.cc:2631
+msgid ""
+"Usage: apt-get [options] command\n"
+" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
+" apt-get [options] source pkg1 [pkg2 ...]\n"
+"\n"
+"apt-get is a simple command line interface for downloading and\n"
+"installing packages. The most frequently used commands are update\n"
+"and install.\n"
+"\n"
+"Commands:\n"
+" update - Retrieve new lists of packages\n"
+" upgrade - Perform an upgrade\n"
+" install - Install new packages (pkg is libc6 not libc6.deb)\n"
+" remove - Remove packages\n"
+" purge - Remove and purge packages\n"
+" source - Download source archives\n"
+" build-dep - Configure build-dependencies for source packages\n"
+" dist-upgrade - Distribution upgrade, see apt-get(8)\n"
+" dselect-upgrade - Follow dselect selections\n"
+" clean - Erase downloaded archive files\n"
+" autoclean - Erase old downloaded archive files\n"
+" check - Verify that there are no broken dependencies\n"
+"\n"
+"Options:\n"
+" -h This help text.\n"
+" -q Loggable output - no progress indicator\n"
+" -qq No output except for errors\n"
+" -d Download only - do NOT install or unpack archives\n"
+" -s No-act. Perform ordering simulation\n"
+" -y Assume Yes to all queries and do not prompt\n"
+" -f Attempt to continue if the integrity check fails\n"
+" -m Attempt to continue if archives are unlocatable\n"
+" -u Show a list of upgraded packages as well\n"
+" -b Build the source package after fetching it\n"
+" -V Show verbose version numbers\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+"See the apt-get(8), sources.list(5) and apt.conf(5) manual\n"
+"pages for more information and options.\n"
+" This APT has Super Cow Powers.\n"
+msgstr ""
+"วิธีใช้: apt-get [ตัวเลือก] คำสั่ง\n"
+" apt-get [ตัวเลือก] install|remove pkg1 [pkg2 ...]\n"
+" apt-get [ตัวเลือก] source pkg1 [pkg2 ...]\n"
+"\n"
+"apt-get เป็นคำสั่งง่ายๆ สำหรับดาวน์โหลดและติดตั้งแพกเกจ คำสั่งที่ใช้บ่อยที่สุดก็คือ\n"
+"update และ install\n"
+"\n"
+"คำสั่ง:\n"
+" update - ดาวน์โหลดรายชื่อแพกเกจชุดใหม่\n"
+" upgrade - ปรับรุ่นแพกเกจต่างๆ ขึ้น\n"
+" install - ติดตั้งแพกเกจใหม่ (pkg อยู่ในรูปเช่น libc6 ไม่ใช่ libc6.deb)\n"
+" remove - ถอดถอนแพกเกจ\n"
+" purge - ถอดถอนแพกเกจพร้อมลบค่าตั้งทั้งหมด\n"
+" source - ดาวน์โหลดซอร์สโค้ดของแพกเกจ\n"
+" build-dep - ติดตั้งสิ่งที่จำเป็นสำหรับการ build ของแพกเกจซอร์สโค้ด\n"
+" dist-upgrade - ปรับรุ่นขึ้นแบบข้ามรุ่นจัดแจก ดู apt-get(8)\n"
+" dselect-upgrade - ทำตามสิ่งที่เลือกโดย dselect\n"
+" clean - ลบแฟ้มแพกเกจที่ดาวน์โหลดมา\n"
+" autoclean - ลบแฟ้มแพกเกจเก่าที่ดาวน์โหลดมา\n"
+" check - ตรวจสอบว่าไม่มีความเชื่อมโยงที่เสียระหว่างแพกเกจ\n"
+"\n"
+"ตัวเลือก:\n"
+" -h แสดงข้อความช่วยเหลือนี้\n"
+" -q แสดงผลลัพธ์แบบบันทึกลงแฟ้มได้ - ไม่ต้องแสดงความคืบหน้า\n"
+" -qq ไม่ต้องแสดงผลลัพธ์ ยกเว้นข้อผิดพลาด\n"
+" -d ดาวน์โหลดอย่างเดียว - *ไม่ต้อง* ติดตั้งหรือแตกแพกเกจ\n"
+" -s ไม่ต้องทำจริง เพียงจำลองลำดับการทำงานเท่านั้น\n"
+" -y ตอบ Yes สำหรับทุกคำถามโดยไม่ต้องถาม\n"
+" -f พยายามดำเนินการต่อถ้าพบความผิดปกติของฐานข้อมูลแพกเกจ\n"
+" -m พยายามดำเนินการต่อถ้าหาแฟ้มแพกเกจไม่พบ\n"
+" -u แสดงรายชื่อของแพกเกจที่จะปรับรุ่นทั้งหมดด้วย\n"
+" -b build แพกเกจซอร์สหลังจากดาวน์โหลดมาแล้วด้วย\n"
+" -V แสดงเลขรุ่นแบบยาวของโปรแกรม\n"
+" -c=? อ่านแฟ้มค่าตั้งนี้\n"
+" -o=? กำหนดตัวเลือกค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n"
+"กรุณาอ่านข้อมูลและตัวเลือกเพิ่มเติมจาก manual page apt-get(8), sources.list(5)\n"
+"และ apt.conf(5)\n"
+" APT นี้มีพลังของ Super Cow\n"
+
+#: cmdline/acqprogress.cc:55
+msgid "Hit "
+msgstr "เจอ "
+
+#: cmdline/acqprogress.cc:79
+msgid "Get:"
+msgstr "ดึง:"
+
+#: cmdline/acqprogress.cc:110
+msgid "Ign "
+msgstr "ข้าม "
+
+#: cmdline/acqprogress.cc:114
+msgid "Err "
+msgstr "ปัญหา "
+
+#: cmdline/acqprogress.cc:135
+#, c-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr "ดาวน์โหลด %sB ใน %s (%sB/s)\n"
+
+#: cmdline/acqprogress.cc:225
+#, c-format
+msgid " [Working]"
+msgstr " [กำลังทำงาน]"
+
+#: cmdline/acqprogress.cc:271
+#, c-format
+msgid ""
+"Media change: please insert the disc labeled\n"
+" '%s'\n"
+"in the drive '%s' and press enter\n"
+msgstr ""
+"เปลี่ยนแผ่น: กรุณาใส่แผ่นชื่อ\n"
+" '%s'\n"
+"ลงในไดรว์ %s แล้วกด enter\n"
+
+#: cmdline/apt-sortpkgs.cc:86
+msgid "Unknown package record!"
+msgstr "พบระเบียนแพกเกจที่ไม่รู้จัก!"
+
+#: cmdline/apt-sortpkgs.cc:150
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+" -h This help text\n"
+" -s Use source file sorting\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"วิธีใช้: apt-sortpkgs [ตัวเลือก] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs เป็นเครื่องมืออย่างง่ายสำหรับเรียงลำดับแฟ้มรายชื่อแพกเกจ ตัวเลือก -s\n"
+"ใช้สำหรับระบุชนิดของแฟ้มที่เรียง\n"
+"\n"
+"ตัวเลือก:\n"
+" -h แสดงข้อความช่วยเหลือนี้\n"
+" -s เรียงตามแฟ้มซอร์สโค้ด\n"
+" -c=? อ่านแฟ้มค่าตั้งนี้\n"
+" -o=? กำหนดตัวเลือกค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n"
+
+#: dselect/install:32
+msgid "Bad default setting!"
+msgstr "ค่าตั้งปริยายผิดพลาด!"
+
+#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93
+#: dselect/install:104 dselect/update:45
+msgid "Press enter to continue."
+msgstr "กด enter เพื่อดำเนินการต่อ"
+
+#: dselect/install:100
+msgid "Some errors occurred while unpacking. I'm going to configure the"
+msgstr "เกิดข้อผิดพลาดขณะแตกแพกเกจ โปรแกรมจะตั้งค่าแพกเกจที่ติดตั้งแล้ว"
+
+#: dselect/install:101
+msgid "packages that were installed. This may result in duplicate errors"
+msgstr "อาจทำให้เกิดข้อความแจ้งข้อผิดพลาดซ้ำ หรือข้อผิดพลาดเนื่องจากแพกเกจที่ต้องใช้ขาดหาย"
+
+#: dselect/install:102
+msgid "or errors caused by missing dependencies. This is OK, only the errors"
+msgstr "ซึ่งไม่มีปัญหาอะไร มีเฉพาะข้อผิดพลาดก่อนหน้าข้อความนี้เท่านั้นที่สำคัญ"
+
+#: dselect/install:103
+msgid ""
+"above this message are important. Please fix them and run [I]nstall again"
+msgstr "กรุณาแก้ปัญหาเหล่านั้น แล้วเรียกติดตั้งใหม่อีกครั้ง"
+
+#: dselect/update:30
+msgid "Merging available information"
+msgstr "กำลังผสานรายชื่อแพกเกจที่มี"
+
+#: apt-inst/contrib/extracttar.cc:114
+msgid "Failed to create pipes"
+msgstr "สร้างไปป์ไม่สำเร็จ"
+
+#: apt-inst/contrib/extracttar.cc:141
+msgid "Failed to exec gzip "
+msgstr "เรียก gzip ไม่สำเร็จ"
+
+#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204
+msgid "Corrupted archive"
+msgstr "แฟ้มจัดเก็บเสียหาย"
+
+#: apt-inst/contrib/extracttar.cc:193
+msgid "Tar checksum failed, archive corrupted"
+msgstr "checksum ของแฟ้ม tar ผิดพลาด แฟ้มจัดเก็บเสียหาย"
+
+#: apt-inst/contrib/extracttar.cc:296
+#, c-format
+msgid "Unknown TAR header type %u, member %s"
+msgstr "พบชนิด %u ของข้อมูลส่วนหัว TAR ที่ไม่รู้จัก ที่สมาชิก %s"
+
+#: apt-inst/contrib/arfile.cc:70
+msgid "Invalid archive signature"
+msgstr "เอกลักษณ์ archive ไม่ถูกต้อง"
+
+#: apt-inst/contrib/arfile.cc:78
+msgid "Error reading archive member header"
+msgstr "เกิดข้อผิดพลาดขณะอ่านข้อมูลส่วนหัวของสมาชิก archive"
+
+#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102
+msgid "Invalid archive member header"
+msgstr "ข้อมูลส่วนหัวของสมาชิก archive ไม่ถูกต้อง"
+
+#: apt-inst/contrib/arfile.cc:128
+msgid "Archive is too short"
+msgstr "archive สั้นเกินไป"
+
+#: apt-inst/contrib/arfile.cc:132
+msgid "Failed to read the archive headers"
+msgstr "อ่านข้อมูลส่วนหัวของ archive ไม่สำเร็จ"
+
+#: apt-inst/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "DropNode ถูกเรียกใช้กับโหนดที่ยังลิงก์อยู่"
+
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "หาสมาชิกในตาราง hash ไม่สำเร็จ!"
+
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "จองเนื้อที่สำหรับ diversion ไม่สำเร็จ"
+
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "ข้อผิดพลาดภายในที่ AddDiversion"
+
+#: apt-inst/filelist.cc:477
+#, c-format
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "พยายามเขียนทับ diversion: %s -> %s กับ %s/%s"
+
+#: apt-inst/filelist.cc:506
+#, c-format
+msgid "Double add of diversion %s -> %s"
+msgstr "เพิ่ม diversion %s -> %s ซ้ำสอง"
+
+#: apt-inst/filelist.cc:549
+#, c-format
+msgid "Duplicate conf file %s/%s"
+msgstr "แฟ้มค่าตั้ง %s/%s ซ้ำ"
+
+#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49
+#, c-format
+msgid "Failed to write file %s"
+msgstr "ไม่สามารถเขียนแฟ้ม %s"
+
+#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100
+#, c-format
+msgid "Failed to close file %s"
+msgstr "ไม่สามารถปิดแฟ้ม %s"
+
+#: apt-inst/extract.cc:93 apt-inst/extract.cc:164
+#, c-format
+msgid "The path %s is too long"
+msgstr "พาธ %s ยาวเกินไป"
+
+#: apt-inst/extract.cc:124
+#, c-format
+msgid "Unpacking %s more than once"
+msgstr "พยายามแตกแพกเกจ %s มากกว่าหนึ่งครั้ง"
+
+#: apt-inst/extract.cc:134
+#, c-format
+msgid "The directory %s is diverted"
+msgstr "ไดเรกทอรี %s ถูก divert"
+
+#: apt-inst/extract.cc:144
+#, c-format
+msgid "The package is trying to write to the diversion target %s/%s"
+msgstr "แพกเกจนี้พยายามเขียนลงปลายทางของ diversion %s/%s"
+
+#: apt-inst/extract.cc:154 apt-inst/extract.cc:297
+msgid "The diversion path is too long"
+msgstr "พาธของ diversion ยาวเกินไป"
+
+#: apt-inst/extract.cc:240
+#, c-format
+msgid "The directory %s is being replaced by a non-directory"
+msgstr "ไดเรกทอรี %s กำลังจะถูกแทนที่ด้วยสิ่งที่ไม่ใช่ไดเรกทอรี"
+
+#: apt-inst/extract.cc:280
+msgid "Failed to locate node in its hash bucket"
+msgstr "หาโหนดใน bucket ของ hash ไม่พบ"
+
+#: apt-inst/extract.cc:284
+msgid "The path is too long"
+msgstr "พาธยาวเกินไป"
+
+#: apt-inst/extract.cc:414
+#, c-format
+msgid "Overwrite package match with no version for %s"
+msgstr "พบแพกเกจที่เขียนทับโดยไม่มีข้อมูลรุ่นสำหรับ %s"
+
+#: apt-inst/extract.cc:431
+#, c-format
+msgid "File %s/%s overwrites the one in the package %s"
+msgstr "แฟ้ม %s/%s เขียนทับแฟ้มในแพกเกจ %s"
+
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748
+#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
+#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#, c-format
+msgid "Unable to read %s"
+msgstr "ไม่สามารถอ่าน %s"
+
+#: apt-inst/extract.cc:491
+#, c-format
+msgid "Unable to stat %s"
+msgstr "ไม่สามารถ stat %s"
+
+#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
+#, c-format
+msgid "Failed to remove %s"
+msgstr "ไม่สามารถลบ %s"
+
+#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
+#, c-format
+msgid "Unable to create %s"
+msgstr "ไม่สามารถสร้าง %s"
+
+#: apt-inst/deb/dpkgdb.cc:114
+#, c-format
+msgid "Failed to stat %sinfo"
+msgstr "ไม่สามารถ stat %sinfo"
+
+#: apt-inst/deb/dpkgdb.cc:119
+msgid "The info and temp directories need to be on the same filesystem"
+msgstr "ไดเรกทอรี info และ temp ต้องอยู่ในระบบแฟ้มเดียวกัน"
+
+#. Build the status cache
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:748
+#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822
+#: apt-pkg/pkgcachegen.cc:945
+msgid "Reading package lists"
+msgstr "กำลังอ่านรายชื่อแพกเกจ"
+
+#: apt-inst/deb/dpkgdb.cc:176
+#, c-format
+msgid "Failed to change to the admin dir %sinfo"
+msgstr "ไม่สามารถเปลี่ยนไปยังไดเรกทอรีระบบ %sinfo"
+
+#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351
+#: apt-inst/deb/dpkgdb.cc:444
+msgid "Internal error getting a package name"
+msgstr "เกิดข้อผิดพลาดภายในขณะอ่านชื่อแพกเกจ"
+
+#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
+msgid "Reading file listing"
+msgstr "กำลังอ่านรายชื่อแฟ้ม"
+
+#: apt-inst/deb/dpkgdb.cc:212
+#, c-format
+msgid ""
+"Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
+"then make it empty and immediately re-install the same version of the "
+"package!"
+msgstr ""
+"เปิดแฟ้มรายชื่อแฟ้ม '%sinfo/%s' ไม่สำเร็จ ถ้าคุณไม่สามารถเรียกแฟ้มนี้คืนได้ "
+"ก็ให้สร้างแฟ้มดังกล่าวให้เป็นแฟ้มเปล่า แล้วติดตั้งแพกเกจรุ่นเดิมซ้ำทันที"
+
+#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
+#, c-format
+msgid "Failed reading the list file %sinfo/%s"
+msgstr "อ่านแฟ้มรายชื่อแฟ้ม %sinfo/%s ไม่สำเร็จ"
+
+#: apt-inst/deb/dpkgdb.cc:262
+msgid "Internal error getting a node"
+msgstr "เกิดข้อผิดพลาดภายในขณะอ่านโหนด"
+
+#: apt-inst/deb/dpkgdb.cc:305
+#, c-format
+msgid "Failed to open the diversions file %sdiversions"
+msgstr "เปิดแฟ้ม diversion %sdiversions ไม่สำเร็จ"
+
+#: apt-inst/deb/dpkgdb.cc:320
+msgid "The diversion file is corrupted"
+msgstr "แฟ้ม diversion เสียหาย"
+
+#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332
+#: apt-inst/deb/dpkgdb.cc:337
+#, c-format
+msgid "Invalid line in the diversion file: %s"
+msgstr "ข้อมูลผิดพลาดในแฟ้ม diversion: %s"
+
+#: apt-inst/deb/dpkgdb.cc:358
+msgid "Internal error adding a diversion"
+msgstr "เกิดข้อผิดพลาดภายในขณะเพิ่ม diversion"
+
+#: apt-inst/deb/dpkgdb.cc:379
+msgid "The pkg cache must be initialized first"
+msgstr "ต้องกำหนดค่าตั้งต้นแคชของแพกเกจก่อน"
+
+#: apt-inst/deb/dpkgdb.cc:439
+#, c-format
+msgid "Failed to find a Package: header, offset %lu"
+msgstr "หาข้อมูลส่วนหัว Package: ไม่พบ ที่ออฟเซ็ต %lu"
+
+#: apt-inst/deb/dpkgdb.cc:461
+#, c-format
+msgid "Bad ConfFile section in the status file. Offset %lu"
+msgstr "หมวด ConfFile เสียหายในแฟ้ม status ที่ออฟเซ็ต %lu"
+
+#: apt-inst/deb/dpkgdb.cc:466
+#, c-format
+msgid "Error parsing MD5. Offset %lu"
+msgstr "เกิดข้อผิดพลาดขณะแจง MD5 ที่ออฟเซ็ต %lu"
+
+#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43
+#, c-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "แฟ้มนี้ไม่ใช่แพกเกจ DEB ที่ใช้การได้ ขาดสมาชิก '%s'"
+
+#: apt-inst/deb/debfile.cc:50
+#, c-format
+msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
+msgstr "แฟ้มนี้ไม่ใช่แพกเกจ DEB ที่ใช้การได้ ขาดสมาชิก '%s', '%s' หรือ '%s'"
+
+#: apt-inst/deb/debfile.cc:110
+#, c-format
+msgid "Couldn't change to %s"
+msgstr "ไม่สามารถเปลี่ยนไดเรกทอรีไปยัง %s"
+
+#: apt-inst/deb/debfile.cc:140
+msgid "Internal error, could not locate member"
+msgstr "ข้อผิดพลาดภายใน: ไม่พบสมาชิก"
+
+#: apt-inst/deb/debfile.cc:173
+msgid "Failed to locate a valid control file"
+msgstr "ไม่พบแฟ้มควบคุมที่ใช้การได้"
+
+#: apt-inst/deb/debfile.cc:258
+msgid "Unparsable control file"
+msgstr "ไม่สามารถแจงแฟ้มควบคุมได้"
+
+#: methods/cdrom.cc:114
+#, c-format
+msgid "Unable to read the cdrom database %s"
+msgstr "ไม่สามารถอ่านฐานข้อมูลซีดีรอม %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 ""
+"กรุณาใช้ apt-cdrom เพื่อให้ APT รู้จักซีดีรอมนี้ apt-get update ไม่สามารถใช้เพิ่มซีดีรอมใหม่ได้"
+
+#: methods/cdrom.cc:131
+msgid "Wrong CD-ROM"
+msgstr "ซีดีรอมผิดแผ่น"
+
+#: methods/cdrom.cc:166
+#, c-format
+msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
+msgstr "ไม่สามารถเลิกเมานท์ซีดีรอมใน %s แผ่นอาจกำลังถูกใช้งานอยู่"
+
+#: methods/cdrom.cc:171
+msgid "Disk not found."
+msgstr "ไม่พบแผ่น"
+
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
+msgid "File not found"
+msgstr "ไม่พบแฟ้ม"
+
+#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141
+#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243
+msgid "Failed to stat"
+msgstr "stat ไม่สำเร็จ"
+
+#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147
+#: methods/rred.cc:240
+msgid "Failed to set modification time"
+msgstr "กำหนดเวลาแก้ไขไม่สำเร็จ"
+
+#: methods/file.cc:44
+msgid "Invalid URI, local URIS must not start with //"
+msgstr "URI ไม่ถูกต้อง URI ของแฟ้มในเครื่องต้องขึ้นต้นด้วย //"
+
+#. Login must be before getpeername otherwise dante won't work.
+#: methods/ftp.cc:162
+msgid "Logging in"
+msgstr "เข้าระบบ"
+
+#: methods/ftp.cc:168
+msgid "Unable to determine the peer name"
+msgstr "ไม่สามารถอ่านชื่อของอีกฝ่ายได้"
+
+#: methods/ftp.cc:173
+msgid "Unable to determine the local name"
+msgstr "ไม่สามารถอ่านชื่อของเครื่องนี้ได้"
+
+#: methods/ftp.cc:204 methods/ftp.cc:232
+#, c-format
+msgid "The server refused the connection and said: %s"
+msgstr "เซิร์ฟเวอร์ปฏิเสธการเชื่อมต่อโดยรายงานว่า: %s"
+
+#: methods/ftp.cc:210
+#, c-format
+msgid "USER failed, server said: %s"
+msgstr "USER ล้มเหลว เซิร์ฟเวอร์ตอบว่า: %s"
+
+#: methods/ftp.cc:217
+#, c-format
+msgid "PASS failed, server said: %s"
+msgstr "PASS ล้มเหลว เซิร์ฟเวอร์ตอบว่า: %s"
+
+#: methods/ftp.cc:237
+msgid ""
+"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
+"is empty."
+msgstr "มีการระบุพร็อกซี แต่ไม่มีสคริปต์สำหรับเข้าระบบ ค่า Acquire::ftp:ProxyLogin ว่างเปล่า"
+
+#: methods/ftp.cc:265
+#, c-format
+msgid "Login script command '%s' failed, server said: %s"
+msgstr "คำสั่งสคริปต์เข้าระบบ '%s' ล้มเหลว เซิร์ฟเวอร์ตอบว่า: %s"
+
+#: methods/ftp.cc:291
+#, c-format
+msgid "TYPE failed, server said: %s"
+msgstr "TYPE ล้มเหลว เซิร์ฟเวอร์ตอบว่า: %s"
+
+#: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226
+msgid "Connection timeout"
+msgstr "หมดเวลารอเชื่อมต่อ"
+
+#: methods/ftp.cc:335
+msgid "Server closed the connection"
+msgstr "เซิร์ฟเวอร์ปิดการเชื่อมต่อ"
+
+#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:469 methods/rsh.cc:190
+msgid "Read error"
+msgstr "การอ่านข้อมูลผิดพลาด"
+
+#: methods/ftp.cc:345 methods/rsh.cc:197
+msgid "A response overflowed the buffer."
+msgstr "คำตอบท่วมบัฟเฟอร์"
+
+#: methods/ftp.cc:362 methods/ftp.cc:374
+msgid "Protocol corruption"
+msgstr "มีความเสียหายของโพรโทคอล"
+
+#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:508 methods/rsh.cc:232
+msgid "Write error"
+msgstr "การเขียนข้อมูลผิดพลาด"
+
+#: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729
+msgid "Could not create a socket"
+msgstr "ไม่สามารถสร้างซ็อกเก็ต"
+
+#: methods/ftp.cc:698
+msgid "Could not connect data socket, connection timed out"
+msgstr "ไม่สามารถเชื่อมต่อซ็อกเก็ตข้อมูล เนื่องจากหมดเวลาคอย"
+
+#: methods/ftp.cc:704
+msgid "Could not connect passive socket."
+msgstr "ไม่สามารถเชื่อมต่อซ็อกเกตแบบ passive"
+
+#: methods/ftp.cc:722
+msgid "getaddrinfo was unable to get a listening socket"
+msgstr "getaddrinfo ไม่สามารถนำซ็อกเก็ตที่รอรับการเชื่อมต่อมาใช้"
+
+#: methods/ftp.cc:736
+msgid "Could not bind a socket"
+msgstr "ไม่สามารถ bind ซ็อกเก็ต"
+
+#: methods/ftp.cc:740
+msgid "Could not listen on the socket"
+msgstr "ไม่สามารถ listen ที่ซ็อกเก็ต"
+
+#: methods/ftp.cc:747
+msgid "Could not determine the socket's name"
+msgstr "ไม่สามารถระบุชื่อซ็อกเก็ต"
+
+#: methods/ftp.cc:779
+msgid "Unable to send PORT command"
+msgstr "ไม่สามารถส่งคำสั่ง PORT"
+
+#: methods/ftp.cc:789
+#, c-format
+msgid "Unknown address family %u (AF_*)"
+msgstr "ไม่รู้จักตระกูลที่อยู่ %u (AF_*)"
+
+#: methods/ftp.cc:798
+#, c-format
+msgid "EPRT failed, server said: %s"
+msgstr "EPRT ล้มเหลว เซิร์ฟเวอร์ตอบว่า: %s"
+
+#: methods/ftp.cc:818
+msgid "Data socket connect timed out"
+msgstr "หมดเวลารอเชื่อมต่อซ็อกเก็ตข้อมูล"
+
+#: methods/ftp.cc:825
+msgid "Unable to accept connection"
+msgstr "ไม่สามารถรับการเชื่อมต่อ"
+
+#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
+msgid "Problem hashing file"
+msgstr "เกิดปัญหาขณะคำนวณค่า hash ของแฟ้ม"
+
+#: methods/ftp.cc:877
+#, c-format
+msgid "Unable to fetch file, server said '%s'"
+msgstr "ไม่สามารถดาวน์โหลดแฟ้ม เซิร์ฟเวอร์ตอบว่า: '%s'"
+
+#: methods/ftp.cc:892 methods/rsh.cc:322
+msgid "Data socket timed out"
+msgstr "หมดเวลาคอยที่ซ็อกเก็ตข้อมูล"
+
+#: methods/ftp.cc:922
+#, c-format
+msgid "Data transfer failed, server said '%s'"
+msgstr "ถ่ายโอนข้อมูลไม่สำเร็จ เซิร์ฟเวอร์ตอบว่า '%s'"
+
+#. Get the files information
+#: methods/ftp.cc:997
+msgid "Query"
+msgstr "สอบถาม"
+
+#: methods/ftp.cc:1109
+msgid "Unable to invoke "
+msgstr "ไม่สามารถเรียก "
+
+#: methods/connect.cc:64
+#, c-format
+msgid "Connecting to %s (%s)"
+msgstr "เชื่อมต่อไปยัง %s (%s)"
+
+#: methods/connect.cc:71
+#, c-format
+msgid "[IP: %s %s]"
+msgstr "[IP: %s %s]"
+
+#: methods/connect.cc:80
+#, c-format
+msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
+msgstr "ไม่สามารถสร้างซ็อกเก็ตสำหรับ %s (f=%u t=%u p=%u)"
+
+#: methods/connect.cc:86
+#, c-format
+msgid "Cannot initiate the connection to %s:%s (%s)."
+msgstr "ไม่สามารถเริ่มการเชื่อมต่อไปยัง %s:%s (%s)"
+
+#: methods/connect.cc:93
+#, c-format
+msgid "Could not connect to %s:%s (%s), connection timed out"
+msgstr "ไม่สามารถเชื่อมต่อไปยัง %s:%s (%s) เนื่องจากหมดเวลาคอย"
+
+#: methods/connect.cc:108
+#, c-format
+msgid "Could not connect to %s:%s (%s)."
+msgstr "ไม่สามารถเชื่อมต่อไปยัง %s:%s (%s)"
+
+#. We say this mainly because the pause here is for the
+#. ssh connection that is still going
+#: methods/connect.cc:136 methods/rsh.cc:425
+#, c-format
+msgid "Connecting to %s"
+msgstr "เชื่อมต่อไปยัง %s"
+
+#: methods/connect.cc:167
+#, c-format
+msgid "Could not resolve '%s'"
+msgstr "ไม่สามารถเปิดหาที่อยู่ '%s'"
+
+#: methods/connect.cc:173
+#, c-format
+msgid "Temporary failure resolving '%s'"
+msgstr "เกิดข้อผิดพลาดชั่วคราวขณะเปิดหาที่อยู่ '%s'"
+
+#: methods/connect.cc:176
+#, c-format
+msgid "Something wicked happened resolving '%s:%s' (%i)"
+msgstr "เกิดปัญหาร้ายแรงบางอย่างขณะเปิดหาที่อยู่ '%s:%s' (%i)"
+
+#: methods/connect.cc:223
+#, c-format
+msgid "Unable to connect to %s %s:"
+msgstr "ไม่สามารถเชื่อมต่อไปยัง %s %s:"
+
+#: methods/gpgv.cc:65
+#, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "ไม่สามารถเข้าใช้พวงกุญแจ: '%s'"
+
+#: methods/gpgv.cc:100
+msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+msgstr "E: รายการอาร์กิวเมนต์ใน Acquire::gpgv::Options ยาวเกินไป จะจบการทำงาน"
+
+#: methods/gpgv.cc:204
+msgid ""
+"Internal error: Good signature, but could not determine key fingerprint?!"
+msgstr "ข้อผิดพลาดภายใน: ลายเซ็นใช้การได้ แต่ไม่สามารถระบุลายนิ้วมือของกุญแจ?!"
+
+#: methods/gpgv.cc:209
+msgid "At least one invalid signature was encountered."
+msgstr "พบลายเซ็นที่ใช้การไม่ได้อย่างน้อยหนึ่งรายการ"
+
+#: methods/gpgv.cc:213
+#, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
+msgstr "ไม่สามารถเรียก '%s' เพื่อตรวจสอบลายเซ็น (ได้ติดตั้ง gnupg ไว้หรือไม่?)"
+
+#: methods/gpgv.cc:218
+msgid "Unknown error executing gpgv"
+msgstr "เกิดข้อผิดพลาดไม่ทราบสาเหตุขณะเรียก gpgv"
+
+#: methods/gpgv.cc:249
+msgid "The following signatures were invalid:\n"
+msgstr "ลายเซ็นต่อไปนี้ใช้การไม่ได้:\n"
+
+#: methods/gpgv.cc:256
+msgid ""
+"The following signatures couldn't be verified because the public key is not "
+"available:\n"
+msgstr "ลายเซ็นต่อไปนี้ไม่สามารถตรวจสอบได้ เพราะไม่มีกุญแจสาธารณะ:\n"
+
+#: methods/gzip.cc:64
+#, c-format
+msgid "Couldn't open pipe for %s"
+msgstr "ไม่สามารถเปิดไปป์สำหรับ %s"
+
+#: methods/gzip.cc:109
+#, c-format
+msgid "Read error from %s process"
+msgstr "เกิดข้อผิดพลาดขณะอ่านจากโพรเซส %s"
+
+#: methods/http.cc:377
+msgid "Waiting for headers"
+msgstr "รอหัวข้อมูล"
+
+#: methods/http.cc:523
+#, c-format
+msgid "Got a single header line over %u chars"
+msgstr "ได้รับบรรทัดข้อมูลส่วนหัวยาวเกิน %u อักขระ"
+
+#: methods/http.cc:531
+msgid "Bad header line"
+msgstr "บรรทัดข้อมูลส่วนหัวผิดพลาด"
+
+#: methods/http.cc:550 methods/http.cc:557
+msgid "The HTTP server sent an invalid reply header"
+msgstr "เซิร์ฟเวอร์ HTTP ส่งข้อมูลส่วนหัวตอบมาไม่ถูกต้อง"
+
+#: methods/http.cc:586
+msgid "The HTTP server sent an invalid Content-Length header"
+msgstr "เซิร์ฟเวอร์ HTTP ส่งข้อมูลส่วนหัว Content-Length มาไม่ถูกต้อง"
+
+#: methods/http.cc:601
+msgid "The HTTP server sent an invalid Content-Range header"
+msgstr "เซิร์ฟเวอร์ HTTP ส่งข้อมูลส่วนหัว Content-Range มาไม่ถูกต้อง"
+
+#: methods/http.cc:603
+msgid "This HTTP server has broken range support"
+msgstr "การสนับสนุน Content-Range ที่เซิร์ฟเวอร์ HTTP ผิดพลาด"
+
+#: methods/http.cc:627
+msgid "Unknown date format"
+msgstr "พบรูปแบบวันที่ที่ไม่รู้จัก"
+
+#: methods/http.cc:774
+msgid "Select failed"
+msgstr "select ไม่สำเร็จ"
+
+#: methods/http.cc:779
+msgid "Connection timed out"
+msgstr "หมดเวลารอเชื่อมต่อ"
+
+#: methods/http.cc:802
+msgid "Error writing to output file"
+msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้มผลลัพธ์"
+
+#: methods/http.cc:833
+msgid "Error writing to file"
+msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้ม"
+
+#: methods/http.cc:861
+msgid "Error writing to the file"
+msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้ม"
+
+#: methods/http.cc:875
+msgid "Error reading from server. Remote end closed connection"
+msgstr "เกิดข้อผิดพลาดขณะอ่านข้อมูลจากเซิร์ฟเวอร์ ปลายทางอีกด้านหนึ่งปิดการเชื่อมต่อ"
+
+#: methods/http.cc:877
+msgid "Error reading from server"
+msgstr "เกิดข้อผิดพลาดขณะอ่านข้อมูลจากเซิร์ฟเวอร์"
+
+#: methods/http.cc:1104
+msgid "Bad header data"
+msgstr "ข้อมูลส่วนหัวผิดพลาด"
+
+#: methods/http.cc:1121 methods/http.cc:1176
+msgid "Connection failed"
+msgstr "เชื่อมต่อไม่สำเร็จ"
+
+#: methods/http.cc:1228
+msgid "Internal error"
+msgstr "ข้อผิดพลาดภายใน"
+
+#: apt-pkg/contrib/mmap.cc:78
+msgid "Can't mmap an empty file"
+msgstr "ไม่สามารถ mmap แฟ้มเปล่า"
+
+#: apt-pkg/contrib/mmap.cc:83
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "ไม่สามารถสร้าง mmap ขนาด %lu ไบต์"
+
+#: apt-pkg/contrib/strutl.cc:978
+#, c-format
+msgid "Selection %s not found"
+msgstr "ไม่พบรายการเลือก %s"
+
+#: apt-pkg/contrib/configuration.cc:434
+#, c-format
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "พบตัวย่อของชนิดที่ข้อมูลไม่รู้จัก: '%c'"
+
+#: apt-pkg/contrib/configuration.cc:492
+#, c-format
+msgid "Opening configuration file %s"
+msgstr "ขณะเปิดแฟ้มค่าตั้ง %s"
+
+#: apt-pkg/contrib/configuration.cc:510
+#, c-format
+msgid "Line %d too long (max %u)"
+msgstr "บรรทัด %d ยาวเกินไป (สูงสุด %u)"
+
+#: apt-pkg/contrib/configuration.cc:606
+#, c-format
+msgid "Syntax error %s:%u: Block starts with no name."
+msgstr "ไวยากรณ์ผิดพลาด %s:%u: เริ่มบล็อคโดยไม่มีชื่อ"
+
+#: apt-pkg/contrib/configuration.cc:625
+#, c-format
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "ไวยากรณ์ผิดพลาด %s:%u: แท็กผิดรูปแบบ"
+
+#: apt-pkg/contrib/configuration.cc:642
+#, c-format
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "ไวยากรณ์ผิดพลาด %s:%u: มีขยะเกินหลังค่า"
+
+#: apt-pkg/contrib/configuration.cc:682
+#, c-format
+msgid "Syntax error %s:%u: Directives can only be done at the top level"
+msgstr "ไวยากรณ์ผิดพลาด %s:%u: สามารถใช้ directive ที่ระดับบนสุดได้เท่านั้น"
+
+#: apt-pkg/contrib/configuration.cc:689
+#, c-format
+msgid "Syntax error %s:%u: Too many nested includes"
+msgstr "ไวยากรณ์ผิดพลาด %s:%u: ใช้ include ซ้อนกันมากเกินไป"
+
+#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698
+#, c-format
+msgid "Syntax error %s:%u: Included from here"
+msgstr "ไวยากรณ์ผิดพลาด %s:%u: include จากที่นี่"
+
+#: apt-pkg/contrib/configuration.cc:702
+#, c-format
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "ไวยากรณ์ผิดพลาด %s:%u: พบ directive '%s' ที่ไม่รองรับ"
+
+#: apt-pkg/contrib/configuration.cc:736
+#, c-format
+msgid "Syntax error %s:%u: Extra junk at end of file"
+msgstr "ไวยากรณ์ผิดพลาด %s:%u: มีขยะเกินหลังจบแฟ้ม"
+
+#: apt-pkg/contrib/progress.cc:152
+#, c-format
+msgid "%c%s... Error!"
+msgstr "%c%s... ผิดพลาด!"
+
+#: apt-pkg/contrib/progress.cc:154
+#, c-format
+msgid "%c%s... Done"
+msgstr "%c%s... เสร็จแล้ว"
+
+#: apt-pkg/contrib/cmndline.cc:77
+#, c-format
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "ไม่รู้จักตัวเลือกบรรทัดคำสั่ง '%c' [จาก %s]"
+
+#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111
+#: apt-pkg/contrib/cmndline.cc:119
+#, c-format
+msgid "Command line option %s is not understood"
+msgstr "ไม่เข้าใจตัวเลือกบรรทัดคำสั่ง %s"
+
+#: apt-pkg/contrib/cmndline.cc:124
+#, c-format
+msgid "Command line option %s is not boolean"
+msgstr "ตัวเลือกบรรทัดคำสั่ง %s ไม่ได้เป็นค่าบูลีน"
+
+#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184
+#, c-format
+msgid "Option %s requires an argument."
+msgstr "ตัวเลือก %s ต้องมีอาร์กิวเมนต์"
+
+#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204
+#, c-format
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr "ตัวเลือก %s: การกำหนดรายการค่าตั้งต้องมี =<val>"
+
+#: apt-pkg/contrib/cmndline.cc:234
+#, c-format
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "ตัวเลือก %s ต้องการอาร์กิวเมนต์จำนวนเต็ม ไม่ใช่ '%s'"
+
+#: apt-pkg/contrib/cmndline.cc:265
+#, c-format
+msgid "Option '%s' is too long"
+msgstr "ตัวเลือก '%s' ยาวเกินไป"
+
+#: apt-pkg/contrib/cmndline.cc:298
+#, c-format
+msgid "Sense %s is not understood, try true or false."
+msgstr "ไม่เข้าใจค่าบูลีน %s กรุณาลองใช้ true หรือ false"
+
+#: apt-pkg/contrib/cmndline.cc:348
+#, c-format
+msgid "Invalid operation %s"
+msgstr "ไม่รู้จักคำสั่ง %s"
+
+#: apt-pkg/contrib/cdromutl.cc:52
+#, c-format
+msgid "Unable to stat the mount point %s"
+msgstr "ไม่สามารถ stat จุดเมานท์ %s"
+
+#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40
+#, c-format
+msgid "Unable to change to %s"
+msgstr "ไม่สามารถเปลี่ยนไดเรกทอรีไปยัง %s"
+
+#: apt-pkg/contrib/cdromutl.cc:187
+msgid "Failed to stat the cdrom"
+msgstr "ไม่สามารถ stat ซีดีรอม"
+
+#: apt-pkg/contrib/fileutl.cc:80
+#, c-format
+msgid "Not using locking for read only lock file %s"
+msgstr "จะไม่ใช้การล็อคกับแฟ้มล็อค %s ที่อ่านได้อย่างเดียว"
+
+#: apt-pkg/contrib/fileutl.cc:85
+#, c-format
+msgid "Could not open lock file %s"
+msgstr "ไม่สามารถเปิดแฟ้มล็อค %s"
+
+#: apt-pkg/contrib/fileutl.cc:103
+#, c-format
+msgid "Not using locking for nfs mounted lock file %s"
+msgstr "จะไม่ใช้การล็อคกับแฟ้มล็อค %s ที่เมานท์ผ่าน nfs"
+
+#: apt-pkg/contrib/fileutl.cc:107
+#, c-format
+msgid "Could not get lock %s"
+msgstr "ไม่สามารถล็อค %s"
+
+#: apt-pkg/contrib/fileutl.cc:375
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "รอโพรเซส %s แต่ตัวโพรเซสไม่อยู่"
+
+#: apt-pkg/contrib/fileutl.cc:385
+#, c-format
+msgid "Sub-process %s received a segmentation fault."
+msgstr "โพรเซสย่อย %s เกิดข้อผิดพลาดของการใช้ย่านหน่วยความจำ (segmentation fault)"
+
+#: apt-pkg/contrib/fileutl.cc:388
+#, c-format
+msgid "Sub-process %s returned an error code (%u)"
+msgstr "โพรเซสย่อย %s คืนค่าข้อผิดพลาด (%u)"
+
+#: apt-pkg/contrib/fileutl.cc:390
+#, c-format
+msgid "Sub-process %s exited unexpectedly"
+msgstr "โพรเซสย่อย %s จบการทำงานกระทันหัน"
+
+#: apt-pkg/contrib/fileutl.cc:434
+#, c-format
+msgid "Could not open file %s"
+msgstr "ไม่สามารถเปิดแฟ้ม %s"
+
+#: apt-pkg/contrib/fileutl.cc:490
+#, c-format
+msgid "read, still have %lu to read but none left"
+msgstr "read: ยังเหลือ %lu ที่ยังไม่ได้อ่าน แต่ข้อมูลหมดแล้ว"
+
+#: apt-pkg/contrib/fileutl.cc:520
+#, c-format
+msgid "write, still have %lu to write but couldn't"
+msgstr "write: ยังเหลือ %lu ที่ยังไม่ได้เขียน แต่ไม่สามารถเขียนได้"
+
+#: apt-pkg/contrib/fileutl.cc:595
+msgid "Problem closing the file"
+msgstr "เกิดปัญหาขณะปิดแฟ้ม"
+
+#: apt-pkg/contrib/fileutl.cc:601
+msgid "Problem unlinking the file"
+msgstr "เกิดปัญหาขณะลบแฟ้ม"
+
+#: apt-pkg/contrib/fileutl.cc:612
+msgid "Problem syncing the file"
+msgstr "เกิดปัญหาขณะ sync แฟ้ม"
+
+#: apt-pkg/pkgcache.cc:132
+msgid "Empty package cache"
+msgstr "แคชของแพกเกจว่างเปล่า"
+
+#: apt-pkg/pkgcache.cc:138
+msgid "The package cache file is corrupted"
+msgstr "แฟ้มแคชของแพกเกจเสียหาย"
+
+#: apt-pkg/pkgcache.cc:143
+msgid "The package cache file is an incompatible version"
+msgstr "แฟ้มแคชของแพกเกจเป็นคนละรุ่นกัน"
+
+#: apt-pkg/pkgcache.cc:148
+#, c-format
+msgid "This APT does not support the versioning system '%s'"
+msgstr "APT รุ่นนี้ไม่รองรับระบบนับรุ่นแบบ '%s'"
+
+#: apt-pkg/pkgcache.cc:153
+msgid "The package cache was built for a different architecture"
+msgstr "แคชของแพกเกจถูกสร้างมาสำหรับสถาปัตยกรรมอื่น"
+
+#: apt-pkg/pkgcache.cc:224
+msgid "Depends"
+msgstr "ต้องใช้"
+
+#: apt-pkg/pkgcache.cc:224
+msgid "PreDepends"
+msgstr "ต้องใช้ขณะติดตั้ง"
+
+#: apt-pkg/pkgcache.cc:224
+msgid "Suggests"
+msgstr "แนะนำ"
+
+#: apt-pkg/pkgcache.cc:225
+msgid "Recommends"
+msgstr "ควรใช้ร่วมกับ"
+
+#: apt-pkg/pkgcache.cc:225
+msgid "Conflicts"
+msgstr "ขัดแย้งกับ"
+
+#: apt-pkg/pkgcache.cc:225
+msgid "Replaces"
+msgstr "แทนที่"
+
+#: apt-pkg/pkgcache.cc:226
+msgid "Obsoletes"
+msgstr "ใช้แทน"
+
+#: apt-pkg/pkgcache.cc:226
+msgid "Breaks"
+msgstr "ทำให้พัง"
+
+#: apt-pkg/pkgcache.cc:237
+msgid "important"
+msgstr "สำคัญ"
+
+#: apt-pkg/pkgcache.cc:237
+msgid "required"
+msgstr "จำเป็น"
+
+#: apt-pkg/pkgcache.cc:237
+msgid "standard"
+msgstr "มาตรฐาน"
+
+#: apt-pkg/pkgcache.cc:238
+msgid "optional"
+msgstr "ตัวเลือก"
+
+#: apt-pkg/pkgcache.cc:238
+msgid "extra"
+msgstr "ส่วนเสริม"
+
+#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
+msgid "Building dependency tree"
+msgstr "กำลังสร้างโครงสร้างลำดับความสัมพันธ์"
+
+#: apt-pkg/depcache.cc:122
+msgid "Candidate versions"
+msgstr "รุ่นแพกเกจที่มี"
+
+#: apt-pkg/depcache.cc:151
+msgid "Dependency generation"
+msgstr "สร้างลำดับความสัมพันธ์"
+
+#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
+msgid "Reading state information"
+msgstr "กำลังอ่านข้อมูลสถานะ"
+
+#: apt-pkg/depcache.cc:219
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "ไม่สามารถเปิดแฟ้มสถานะ %s"
+
+#: apt-pkg/depcache.cc:225
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "ไม่สามารถเขียนแฟ้มสถานะชั่วคราว %s"
+
+#: apt-pkg/tagfile.cc:102
+#, c-format
+msgid "Unable to parse package file %s (1)"
+msgstr "ไม่สามารถแจงแฟ้มแพกเกจ %s (1)"
+
+#: apt-pkg/tagfile.cc:189
+#, c-format
+msgid "Unable to parse package file %s (2)"
+msgstr "ไม่สามารถแจงแฟ้มแพกเกจ %s (2)"
+
+#: apt-pkg/sourcelist.cc:90
+#, c-format
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (URI)"
+
+#: apt-pkg/sourcelist.cc:92
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (dist)"
+
+#: apt-pkg/sourcelist.cc:95
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ขณะแจง URI)"
+
+#: apt-pkg/sourcelist.cc:101
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (dist แบบสัมบูรณ์)"
+
+#: apt-pkg/sourcelist.cc:108
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ขณะแจง dist)"
+
+#: apt-pkg/sourcelist.cc:199
+#, c-format
+msgid "Opening %s"
+msgstr "กำลังเปิด %s"
+
+#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s ยาวเกินไป"
+
+#: apt-pkg/sourcelist.cc:236
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ชนิด)"
+
+#: apt-pkg/sourcelist.cc:240
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "ไม่รู้จักชนิด '%s' ที่บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s"
+
+#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
+#, c-format
+msgid "Malformed line %u in source list %s (vendor id)"
+msgstr "บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (id ผู้ผลิต)"
+
+#: apt-pkg/packagemanager.cc:399
+#, c-format
+msgid ""
+"This installation run will require temporarily removing the essential "
+"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
+"you really want to do it, activate the APT::Force-LoopBreak option."
+msgstr ""
+"การติดตั้งครั้งนี้จำเป็นต้องลบแพกเกจ %s ชั่วคราว "
+"อันเนื่องมาจากความขัดแย้งหรือความขึ้นต่อกันระหว่างติดตั้งที่เป็นวงรอบ "
+"ซึ่งแพกเกจดังกล่าวเป็นแพกเกจที่จำเป็นสำหรับระบบ การลบดังกล่าวมักเป็นอันตราย "
+"แต่ถ้าคุณต้องการทำเช่นนั้นจริงๆ ก็ให้เปิดตัวเลือก APT::Force-LoopBreak"
+
+#: apt-pkg/pkgrecords.cc:32
+#, c-format
+msgid "Index file type '%s' is not supported"
+msgstr "ไม่รองรับแฟ้มดัชนีชนิด '%s'"
+
+#: apt-pkg/algorithms.cc:247
+#, c-format
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgstr "จำเป็นต้องติดตั้งแพกเกจ %s ซ้ำ แต่หาตัวแพกเกจไม่พบ"
+
+#: apt-pkg/algorithms.cc:1103
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
+msgstr ""
+"ข้อผิดพลาด: pkgProblemResolver::Resolve สร้างคำตอบที่ทำให้เกิดแพกเกจเสีย "
+"อาจเกิดจากแพกเกจที่ถูกกำหนดให้คงรุ่นไว้"
+
+#: apt-pkg/algorithms.cc:1105
+msgid "Unable to correct problems, you have held broken packages."
+msgstr "ไม่สามารถแก้ปัญหาได้ คุณได้คงรุ่นแพกเกจที่เสียอยู่ไว้"
+
+#: apt-pkg/acquire.cc:59
+#, c-format
+msgid "Lists directory %spartial is missing."
+msgstr "ไม่มีไดเรกทอรีรายชื่อแพกเกจ %spartial"
+
+#: apt-pkg/acquire.cc:63
+#, c-format
+msgid "Archive directory %spartial is missing."
+msgstr "ไม่มีไดเรกทอรีแพกเกจ %spartial"
+
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:827
+#, c-format
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "กำลังดาวน์โหลดแฟ้มที่ %li จาก %li (เหลืออีก %s)"
+
+#: apt-pkg/acquire.cc:829
+#, c-format
+msgid "Retrieving file %li of %li"
+msgstr "กำลังดาวน์โหลดแฟ้มที่ %li จาก %li"
+
+#: apt-pkg/acquire-worker.cc:110
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "ไม่พบไดรเวอร์สำหรับวิธีการ %s"
+
+#: apt-pkg/acquire-worker.cc:159
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "ไม่สามารถเรียกทำงานวิธีการ %s"
+
+#: apt-pkg/acquire-worker.cc:396
+#, c-format
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "กรุณาใส่แผ่นชื่อ: '%s' ลงในไดรว์ '%s' แล้วกด enter"
+
+#: apt-pkg/init.cc:124
+#, c-format
+msgid "Packaging system '%s' is not supported"
+msgstr "ไม่รองรับระบบแพกเกจ '%s'"
+
+#: apt-pkg/init.cc:140
+msgid "Unable to determine a suitable packaging system type"
+msgstr "ไม่สามารถระบุชนิดของระบบแพกเกจที่เหมาะสมได้"
+
+#: apt-pkg/clean.cc:57
+#, c-format
+msgid "Unable to stat %s."
+msgstr "ไม่สามารถ stat %s"
+
+#: apt-pkg/srcrecords.cc:44
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "คุณต้องเพิ่ม URI ชนิด 'source' ใน sources.list ของคุณด้วย"
+
+#: apt-pkg/cachefile.cc:69
+msgid "The package lists or status file could not be parsed or opened."
+msgstr "ไม่สามารถแจงหรือเปิดรายชื่อแพกเกจหรือสถานะแพกเกจได้"
+
+#: apt-pkg/cachefile.cc:73
+msgid "You may want to run apt-get update to correct these problems"
+msgstr "คุณอาจเรียก `apt-get update' เพื่อแก้ปัญหาเหล่านี้ได้"
+
+#: apt-pkg/policy.cc:267
+msgid "Invalid record in the preferences file, no Package header"
+msgstr "ระเบียนผิดรูปแบบในแฟ้มค่าปรับแต่ง: ไม่มีข้อมูลส่วนหัว 'Package'"
+
+#: apt-pkg/policy.cc:289
+#, c-format
+msgid "Did not understand pin type %s"
+msgstr "ไม่เข้าใจชนิดการตรึง %s"
+
+#: apt-pkg/policy.cc:297
+msgid "No priority (or zero) specified for pin"
+msgstr "ไม่ได้ระบุลำดับความสำคัญ (หรือค่าศูนย์) สำหรับการตรึง"
+
+#: apt-pkg/pkgcachegen.cc:72
+msgid "Cache has an incompatible versioning system"
+msgstr "แคชมีระบบนับรุ่นที่ไม่ตรงกัน"
+
+#: apt-pkg/pkgcachegen.cc:115
+#, c-format
+msgid "Error occurred while processing %s (NewPackage)"
+msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (NewPackage)"
+
+#: apt-pkg/pkgcachegen.cc:130
+#, c-format
+msgid "Error occurred while processing %s (UsePackage1)"
+msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (UsePackage1)"
+
+#: apt-pkg/pkgcachegen.cc:153
+#, c-format
+msgid "Error occurred while processing %s (NewFileDesc1)"
+msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (NewFileDesc1)"
+
+#: apt-pkg/pkgcachegen.cc:178
+#, c-format
+msgid "Error occurred while processing %s (UsePackage2)"
+msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (UsePackage2)"
+
+#: apt-pkg/pkgcachegen.cc:182
+#, c-format
+msgid "Error occurred while processing %s (NewFileVer1)"
+msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (NewFileVer1)"
+
+#: apt-pkg/pkgcachegen.cc:213
+#, c-format
+msgid "Error occurred while processing %s (NewVersion1)"
+msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (NewVersion1)"
+
+#: apt-pkg/pkgcachegen.cc:217
+#, c-format
+msgid "Error occurred while processing %s (UsePackage3)"
+msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (UsePackage3)"
+
+#: apt-pkg/pkgcachegen.cc:221
+#, c-format
+msgid "Error occurred while processing %s (NewVersion2)"
+msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (NewVersion2)"
+
+#: apt-pkg/pkgcachegen.cc:245
+#, c-format
+msgid "Error occurred while processing %s (NewFileDesc2)"
+msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (NewFileDesc2)"
+
+#: apt-pkg/pkgcachegen.cc:251
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนชื่อแพกเกจที่ APT สามารถรองรับได้แล้ว"
+
+#: apt-pkg/pkgcachegen.cc:254
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนรุ่นแพกเกจที่ APT สามารถรองรับได้แล้ว"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนคำบรรยายแพกเกจที่ APT สามารถรองรับได้แล้ว"
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนความสัมพันธ์ระหว่างแพกเกจที่ APT สามารถรองรับได้แล้ว"
+
+#: apt-pkg/pkgcachegen.cc:288
+#, c-format
+msgid "Error occurred while processing %s (FindPkg)"
+msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (FindPkg)"
+
+#: apt-pkg/pkgcachegen.cc:301
+#, c-format
+msgid "Error occurred while processing %s (CollectFileProvides)"
+msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (CollectFileProvides)"
+
+#: apt-pkg/pkgcachegen.cc:307
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "ไม่พบแพกเกจ %s %s ขณะประมวลผลความขึ้นต่อแฟ้ม"
+
+#: apt-pkg/pkgcachegen.cc:678
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "ไม่สามารถ stat รายการแพกเกจซอร์ส %s"
+
+#: apt-pkg/pkgcachegen.cc:763
+msgid "Collecting File Provides"
+msgstr "กำลังเก็บข้อมูลแฟ้มที่ตระเตรียมให้"
+
+#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897
+msgid "IO Error saving source cache"
+msgstr "เกิดข้อผิดพลาด IO ขณะบันทึกแคชของซอร์ส"
+
+#: apt-pkg/acquire-item.cc:127
+#, c-format
+msgid "rename failed, %s (%s -> %s)."
+msgstr "เปลี่ยนชื่อไม่สำเร็จ: %s (%s -> %s)"
+
+#: apt-pkg/acquire-item.cc:401
+msgid "MD5Sum mismatch"
+msgstr "MD5Sum ไม่ตรงกัน"
+
+#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1405
+msgid "Hash Sum mismatch"
+msgstr "Hash Sum ไม่ตรงกัน"
+
+#: apt-pkg/acquire-item.cc:1097
+msgid "There is no public key available for the following key IDs:\n"
+msgstr "ไม่มีกุญแจสาธารณะสำหรับกุญแจหมายเลขต่อไปนี้:\n"
+
+#: apt-pkg/acquire-item.cc:1210
+#, 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 คุณอาจต้องแก้ปัญหาแพกเกจนี้เอง (ไม่มี arch)"
+
+#: apt-pkg/acquire-item.cc:1269
+#, c-format
+msgid ""
+"I wasn't able to locate file for the %s package. This might mean you need to "
+"manually fix this package."
+msgstr "ไม่พบแฟ้มสำหรับแพกเกจ %s คุณอาจต้องแก้ปัญหาแพกเกจนี้เอง"
+
+#: apt-pkg/acquire-item.cc:1310
+#, c-format
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
+msgstr "แฟ้มดัชนีแพกเกจเสียหาย ไม่มีข้อมูล Filename: สำหรับแพกเกจ %s"
+
+#: apt-pkg/acquire-item.cc:1397
+msgid "Size mismatch"
+msgstr "ขนาดไม่ตรงกัน"
+
+#: apt-pkg/vendorlist.cc:66
+#, c-format
+msgid "Vendor block %s contains no fingerprint"
+msgstr "บล็อคผู้ผลิต %s ไม่มีลายนิ้วมือ"
+
+#: apt-pkg/cdrom.cc:529
+#, c-format
+msgid ""
+"Using CD-ROM mount point %s\n"
+"Mounting CD-ROM\n"
+msgstr ""
+"กำลังใช้จุดเมานท์ซีดีรอม %s\n"
+"กำลังเมานท์ซีดีรอม\n"
+
+#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:620
+msgid "Identifying.. "
+msgstr "กำลังตรวจสอบชื่อแผ่น..."
+
+#: apt-pkg/cdrom.cc:563
+#, c-format
+msgid "Stored label: %s \n"
+msgstr "ชื่อที่เก็บไว้: %s\n"
+
+#: apt-pkg/cdrom.cc:583
+#, c-format
+msgid "Using CD-ROM mount point %s\n"
+msgstr "กำลังใช้จุดเมานท์ซีดีรอม %s\n"
+
+#: apt-pkg/cdrom.cc:601
+msgid "Unmounting CD-ROM\n"
+msgstr "กำลังเลิกเมานท์ซีดีรอม\n"
+
+#: apt-pkg/cdrom.cc:605
+msgid "Waiting for disc...\n"
+msgstr "กำลังรอแผ่น...\n"
+
+#. Mount the new CDROM
+#: apt-pkg/cdrom.cc:613
+msgid "Mounting CD-ROM...\n"
+msgstr "กำลังเมานท์ซีดีรอม...\n"
+
+#: apt-pkg/cdrom.cc:631
+msgid "Scanning disc for index files..\n"
+msgstr "กำลังสำรวจข้อมูลในแผ่นเพื่อหาแฟ้มดัชนี...\n"
+
+#: apt-pkg/cdrom.cc:671
+#, c-format
+msgid ""
+"Found %i package indexes, %i source indexes, %i translation indexes and %i "
+"signatures\n"
+msgstr ""
+"พบดัชนีแพกเกจ %i รายการ, ดัชนีซอร์ส %i รายการ, ดัชนีคำแปล %i รายการ และลายเซ็น %i "
+"รายการ\n"
+
+#: apt-pkg/cdrom.cc:708
+#, c-format
+msgid "Found label '%s'\n"
+msgstr "พบชื่อแผ่น '%s'\n"
+
+#: apt-pkg/cdrom.cc:737
+msgid "That is not a valid name, try again.\n"
+msgstr "ไม่ใช่ชื่อที่ใช้ได้ กรุณาลองใหม่\n"
+
+#: apt-pkg/cdrom.cc:753
+#, c-format
+msgid ""
+"This disc is called: \n"
+"'%s'\n"
+msgstr ""
+"แผ่นนี้เรียกชื่อว่า:\n"
+"'%s'\n"
+
+#: apt-pkg/cdrom.cc:757
+msgid "Copying package lists..."
+msgstr "กำลังคัดลอกรายชื่อแพกเกจ..."
+
+#: apt-pkg/cdrom.cc:783
+msgid "Writing new source list\n"
+msgstr "กำลังเขียนรายชื่อแหล่งแพกเกจแหล่งใหม่...\n"
+
+#: apt-pkg/cdrom.cc:792
+msgid "Source list entries for this disc are:\n"
+msgstr "บรรทัดรายชื่อแหล่งแพกเกจสำหรับแผ่นนี้คือ:\n"
+
+#: apt-pkg/cdrom.cc:834
+msgid "Unmounting CD-ROM...\n"
+msgstr "กำลังเลิกเมานท์ซีดีรอม...\n"
+
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
+#, c-format
+msgid "Wrote %i records.\n"
+msgstr "เขียนแล้ว %i ระเบียน\n"
+
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
+#, c-format
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "เขียนแล้ว %i ระเบียน โดยมีแฟ้มขาดหาย %i แฟ้ม\n"
+
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "เขียนแล้ว %i ระเบียน โดยมีแฟ้มผิดขนาด %i แฟ้ม\n"
+
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
+#, c-format
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
+msgstr "เขียนแล้ว %i ระเบียน โดยมีแฟ้มขาดหาย %i แฟ้ม และแฟ้มผิดขนาด %i แฟ้ม\n"
+
+#: apt-pkg/deb/dpkgpm.cc:522
+#, c-format
+msgid "Preparing %s"
+msgstr "กำลังเตรียม %s"
+
+#: apt-pkg/deb/dpkgpm.cc:523
+#, c-format
+msgid "Unpacking %s"
+msgstr "กำลังแตกแพกเกจ %s"
+
+#: apt-pkg/deb/dpkgpm.cc:528
+#, c-format
+msgid "Preparing to configure %s"
+msgstr "กำลังเตรียมตั้งค่า %s"
+
+#: apt-pkg/deb/dpkgpm.cc:529
+#, c-format
+msgid "Configuring %s"
+msgstr "กำลังตั้งค่า %s"
+
+#: apt-pkg/deb/dpkgpm.cc:530
+#, c-format
+msgid "Installed %s"
+msgstr "ติดตั้ง %s แล้ว"
+
+#: apt-pkg/deb/dpkgpm.cc:535
+#, c-format
+msgid "Preparing for removal of %s"
+msgstr "กำลังเตรียมถอดถอน %s"
+
+#: apt-pkg/deb/dpkgpm.cc:536
+#, c-format
+msgid "Removing %s"
+msgstr "กำลังถอดถอน %s"
+
+#: apt-pkg/deb/dpkgpm.cc:537
+#, c-format
+msgid "Removed %s"
+msgstr "ถอดถอน %s แล้ว"
+
+#: apt-pkg/deb/dpkgpm.cc:542
+#, c-format
+msgid "Preparing to completely remove %s"
+msgstr "กำลังเตรียมถอดถอน %s อย่างสมบูรณ์"
+
+#: apt-pkg/deb/dpkgpm.cc:543
+#, c-format
+msgid "Completely removed %s"
+msgstr "ถอดถอน %s อย่างสมบูรณ์แล้ว"
+
+#: apt-pkg/deb/dpkgpm.cc:566
+#, c-format
+msgid "Directory '%s' missing"
+msgstr "ไม่มีไดเรกทอรี '%s'"
+
+#: apt-pkg/deb/dpkgpm.cc:709
+#, c-format
+msgid "openpty failed\n"
+msgstr "openpty ล้มเหลว\n"
+
+#: methods/rred.cc:219
+msgid "Could not patch file"
+msgstr "ไม่สามารถแพตช์แฟ้ม"
+
+#: methods/rsh.cc:330
+msgid "Connection closed prematurely"
+msgstr "การเชื่อมต่อถูกปิดก่อนเวลาอันควร"
diff --git a/po/tl.po b/po/tl.po
index 5bd82ceb2..c08d2e320 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-06 06:51+0200\n"
+"POT-Creation-Date: 2007-08-04 09:09+0200\n"
"PO-Revision-Date: 2007-03-29 21:36+0800\n"
"Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n"
"Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n"
@@ -162,9 +162,9 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2584 cmdline/apt-sortpkgs.cc:144
-#, c-format
-msgid "%s %s for %s %s compiled on %s %s\n"
+#: cmdline/apt-get.cc:2585 cmdline/apt-sortpkgs.cc:144
+#, fuzzy, c-format
+msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s para sa %s %s kinompile noong %s %s\n"
#: cmdline/apt-cache.cc:1721
@@ -665,7 +665,7 @@ msgstr "Bigo ang pagpangalan muli ng %s tungong %s"
msgid "Y"
msgstr "O"
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1673
#, c-format
msgid "Regex compilation error - %s"
msgstr "Error sa pag-compile ng regex - %s"
@@ -830,11 +830,11 @@ msgstr ""
msgid "Internal error, Ordering didn't finish"
msgstr "Error na internal, hindi natapos ang pagsaayos na pagkasunud-sunod"
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2011 cmdline/apt-get.cc:2044
msgid "Unable to lock the download directory"
msgstr "Hindi maaldaba ang directory ng download"
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2092 cmdline/apt-get.cc:2333
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr "Hindi mabasa ang talaan ng pagkukunan (sources)."
@@ -866,7 +866,7 @@ msgstr ""
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Matapos magbuklat ay %sB na puwang sa disk ang mapapalaya.\n"
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2186
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2187
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Hindi matantsa ang libreng puwang sa %s"
@@ -903,7 +903,7 @@ msgstr "Abort."
msgid "Do you want to continue [Y/n]? "
msgstr "Nais niyo bang magpatuloy [O/h]? "
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2229
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2230
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Bigo sa pagkuha ng %s %s\n"
@@ -912,7 +912,7 @@ msgstr "Bigo sa pagkuha ng %s %s\n"
msgid "Some files failed to download"
msgstr "May mga talaksang hindi nakuha"
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2238
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2239
msgid "Download complete and in download only mode"
msgstr "Kumpleto ang pagkakuha ng mga talaksan sa modong pagkuha lamang"
@@ -1047,7 +1047,7 @@ msgid ""
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1754
msgid "The following information may help to resolve the situation:"
msgstr ""
"Ang sumusunod na impormasyon ay maaaring makatulong sa pag-ayos ng problema:"
@@ -1061,32 +1061,32 @@ msgstr "Error na internal, may nasira ang problem resolver"
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Internal error, nakasira ng bagay-bagay ang AllUpgrade"
-#: cmdline/apt-get.cc:1544
+#: cmdline/apt-get.cc:1545
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "Hindi mahanap ang paketeng %s"
-#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
+#: cmdline/apt-get.cc:1660 cmdline/apt-get.cc:1696
#, c-format
msgid "Couldn't find package %s"
msgstr "Hindi mahanap ang paketeng %s"
-#: cmdline/apt-get.cc:1682
+#: cmdline/apt-get.cc:1683
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Paunawa, pinili ang %s para sa regex '%s'\n"
-#: cmdline/apt-get.cc:1712
+#: cmdline/apt-get.cc:1713
#, fuzzy, c-format
msgid "%s set to manual installed.\n"
msgstr "ngunit ang %s ay iluluklok"
-#: cmdline/apt-get.cc:1725
+#: cmdline/apt-get.cc:1726
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
"Maaaring patakbuhin niyo ang `apt-get -f install' upang ayusin ang mga ito:"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1729
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1094,7 +1094,7 @@ msgstr ""
"May mga dependensiyang kulang. Subukan ang 'apt-get -f install' na walang "
"mga pakete (o magtakda ng solusyon)."
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1741
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1105,7 +1105,7 @@ msgstr ""
"o kung kayo'y gumagamit ng pamudmod na unstable ay may ilang mga paketeng\n"
"kailangan na hindi pa nalikha o linipat mula sa Incoming."
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1749
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1115,115 +1115,115 @@ msgstr ""
"hindi talaga mailuklok at kailangang magpadala ng bug report tungkol sa\n"
"pakete na ito."
-#: cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1757
msgid "Broken packages"
msgstr "Sirang mga pakete"
-#: cmdline/apt-get.cc:1785
+#: cmdline/apt-get.cc:1786
msgid "The following extra packages will be installed:"
msgstr "Ang mga sumusunod na extra na pakete ay luluklokin:"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Suggested packages:"
msgstr "Mga paketeng mungkahi:"
-#: cmdline/apt-get.cc:1875
+#: cmdline/apt-get.cc:1876
msgid "Recommended packages:"
msgstr "Mga paketeng rekomendado:"
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1904
msgid "Calculating upgrade... "
msgstr "Sinusuri ang pag-upgrade... "
-#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1907 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Bigo"
-#: cmdline/apt-get.cc:1911
+#: cmdline/apt-get.cc:1912
msgid "Done"
msgstr "Tapos"
-#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
+#: cmdline/apt-get.cc:1979 cmdline/apt-get.cc:1987
msgid "Internal error, problem resolver broke stuff"
msgstr "Error na internal, may nasira ang problem resolver"
-#: cmdline/apt-get.cc:2086
+#: cmdline/apt-get.cc:2087
msgid "Must specify at least one package to fetch source for"
msgstr "Kailangang magtakda ng kahit isang pakete na kunan ng source"
-#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2350
+#: cmdline/apt-get.cc:2117 cmdline/apt-get.cc:2351
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Hindi mahanap ang paketeng source para sa %s"
-#: cmdline/apt-get.cc:2165
+#: cmdline/apt-get.cc:2166
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Linaktawan ang nakuha na na talaksan '%s'\n"
-#: cmdline/apt-get.cc:2189
+#: cmdline/apt-get.cc:2190
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Kulang kayo ng libreng puwang sa %s"
-#: cmdline/apt-get.cc:2194
+#: cmdline/apt-get.cc:2195
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Kailangang kumuha ng %sB/%sB ng arkibong source.\n"
-#: cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2198
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Kailangang kumuha ng %sB ng arkibong source.\n"
-#: cmdline/apt-get.cc:2203
+#: cmdline/apt-get.cc:2204
#, c-format
msgid "Fetch source %s\n"
msgstr "Kunin ang Source %s\n"
-#: cmdline/apt-get.cc:2234
+#: cmdline/apt-get.cc:2235
msgid "Failed to fetch some archives."
msgstr "Bigo sa pagkuha ng ilang mga arkibo."
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2263
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Linaktawan ang pagbuklat ng nabuklat na na source sa %s\n"
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2275
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Bigo ang utos ng pagbuklat '%s'.\n"
-#: cmdline/apt-get.cc:2275
+#: cmdline/apt-get.cc:2276
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Paki-siguro na nakaluklok ang paketeng 'dpkg-dev'.\n"
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2293
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Utos na build '%s' ay bigo.\n"
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:2312
msgid "Child process failed"
msgstr "Bigo ang prosesong anak"
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2328
msgid "Must specify at least one package to check builddeps for"
msgstr "Kailangang magtakda ng kahit isang pakete na susuriin ang builddeps"
-#: cmdline/apt-get.cc:2355
+#: cmdline/apt-get.cc:2356
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Hindi makuha ang impormasyong build-dependency para sa %s"
-#: cmdline/apt-get.cc:2375
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "%s has no build depends.\n"
msgstr "Walang build depends ang %s.\n"
-#: cmdline/apt-get.cc:2427
+#: cmdline/apt-get.cc:2428
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1232,7 +1232,7 @@ msgstr ""
"Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi "
"mahanap"
-#: cmdline/apt-get.cc:2479
+#: cmdline/apt-get.cc:2480
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1241,32 +1241,32 @@ msgstr ""
"Dependensiyang %s para sa %s ay hindi mabuo dahil walang magamit na bersyon "
"ng paketeng %s na tumutugon sa kinakailangang bersyon"
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2515
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Bigo sa pagbuo ng dependensiyang %s para sa %s: Ang naka-instol na paketeng %"
"s ay bagong-bago pa lamang."
-#: cmdline/apt-get.cc:2539
+#: cmdline/apt-get.cc:2540
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Bigo sa pagbuo ng dependensiyang %s para sa %s: %s"
-#: cmdline/apt-get.cc:2553
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Hindi mabuo ang build-dependencies para sa %s."
-#: cmdline/apt-get.cc:2557
+#: cmdline/apt-get.cc:2558
msgid "Failed to process build dependencies"
msgstr "Bigo sa pagproseso ng build dependencies"
-#: cmdline/apt-get.cc:2589
+#: cmdline/apt-get.cc:2590
msgid "Supported modules:"
msgstr "Suportadong mga Module:"
-#: cmdline/apt-get.cc:2630
+#: cmdline/apt-get.cc:2631
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1691,26 +1691,26 @@ msgstr "Error sa pag-parse ng MD5. Offset %lu"
msgid "This is not a valid DEB archive, missing '%s' member"
msgstr "Hindi ito tanggap na arkibong DEB, may kulang na miyembrong '%s'"
-#: apt-inst/deb/debfile.cc:48
-#, c-format
-msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
+#: apt-inst/deb/debfile.cc:50
+#, fuzzy, c-format
+msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
msgstr ""
"Hindi ito tanggap na arkibong DEB, may kulang na miyembrong '%s' o '%s'"
-#: apt-inst/deb/debfile.cc:108
+#: apt-inst/deb/debfile.cc:110
#, c-format
msgid "Couldn't change to %s"
msgstr "Hindi makalipat sa %s"
-#: apt-inst/deb/debfile.cc:134
+#: apt-inst/deb/debfile.cc:140
msgid "Internal error, could not locate member"
msgstr "Internal error, hindi mahanap ang miyembro"
-#: apt-inst/deb/debfile.cc:167
+#: apt-inst/deb/debfile.cc:173
msgid "Failed to locate a valid control file"
msgstr "Bigo sa paghanap ng tanggap na talaksang control"
-#: apt-inst/deb/debfile.cc:252
+#: apt-inst/deb/debfile.cc:258
msgid "Unparsable control file"
msgstr "Di maintindihang talaksang control"
@@ -2077,15 +2077,15 @@ msgstr "Error sa pagbasa mula sa server, sinarhan ng remote ang koneksyon"
msgid "Error reading from server"
msgstr "Error sa pagbasa mula sa server"
-#: methods/http.cc:1108
+#: methods/http.cc:1104
msgid "Bad header data"
msgstr "Maling datos sa panimula"
-#: methods/http.cc:1125
+#: methods/http.cc:1121 methods/http.cc:1176
msgid "Connection failed"
msgstr "Bigo ang koneksyon"
-#: methods/http.cc:1216
+#: methods/http.cc:1228
msgid "Internal error"
msgstr "Internal na error"
@@ -2115,7 +2115,7 @@ msgstr "Binubuksan ang talaksang pagsasaayos %s"
#: apt-pkg/contrib/configuration.cc:510
#, fuzzy, c-format
-msgid "Line %d too long (max %lu)"
+msgid "Line %d too long (max %u)"
msgstr "Labis ang haba ng linyang %d (max %d)"
#: apt-pkg/contrib/configuration.cc:606
@@ -2374,29 +2374,29 @@ msgstr "optional"
msgid "extra"
msgstr "extra"
-#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129
+#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
msgid "Building dependency tree"
msgstr "Ginagawa ang puno ng mga dependensiya"
-#: apt-pkg/depcache.cc:101
+#: apt-pkg/depcache.cc:122
msgid "Candidate versions"
msgstr "Bersyong Kandidato"
-#: apt-pkg/depcache.cc:130
+#: apt-pkg/depcache.cc:151
msgid "Dependency generation"
msgstr "Pagbuo ng Dependensiya"
-#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174
+#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
#, fuzzy
msgid "Reading state information"
msgstr "Pinagsasama ang magagamit na impormasyon"
-#: apt-pkg/depcache.cc:198
+#: apt-pkg/depcache.cc:219
#, fuzzy, c-format
msgid "Failed to open StateFile %s"
msgstr "Bigo ang pagbukas ng %s"
-#: apt-pkg/depcache.cc:204
+#: apt-pkg/depcache.cc:225
#, fuzzy, c-format
msgid "Failed to write temporary StateFile %s"
msgstr "Bigo sa pagsulat ng talaksang %s"
@@ -2531,18 +2531,18 @@ msgstr "Ang driver ng paraang %s ay hindi mahanap."
msgid "Method %s did not start correctly"
msgstr "Hindi umandar ng tama ang paraang %s"
-#: apt-pkg/acquire-worker.cc:381
+#: apt-pkg/acquire-worker.cc:396
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
"Ikasa ang disk na may pangalang: '%s' sa drive '%s' at pindutin ang enter."
-#: apt-pkg/init.cc:126
+#: apt-pkg/init.cc:124
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Hindi suportado ang sistema ng paketeng '%s'"
-#: apt-pkg/init.cc:142
+#: apt-pkg/init.cc:140
msgid "Unable to determine a suitable packaging system type"
msgstr "Hindi matuklasan ang akmang uri ng sistema ng pakete "
@@ -2680,16 +2680,20 @@ msgstr "IO Error sa pag-imbak ng source cache"
msgid "rename failed, %s (%s -> %s)."
msgstr "pagpalit ng pangalan ay bigo, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:401
msgid "MD5Sum mismatch"
msgstr "Di tugmang MD5Sum"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1405
+#, fuzzy
+msgid "Hash Sum mismatch"
+msgstr "Di tugmang MD5Sum"
+
+#: apt-pkg/acquire-item.cc:1097
msgid "There is no public key available for the following key IDs:\n"
msgstr "Walang public key na magamit para sa sumusunod na key ID:\n"
-#: apt-pkg/acquire-item.cc:1219
+#: apt-pkg/acquire-item.cc:1210
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2698,7 +2702,7 @@ msgstr ""
"Hindi ko mahanap ang talaksan para sa paketeng %s. Maaaring kailanganin "
"niyong ayusin ng de kamay ang paketeng ito. (dahil sa walang arch)"
-#: apt-pkg/acquire-item.cc:1278
+#: apt-pkg/acquire-item.cc:1269
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2707,7 +2711,7 @@ msgstr ""
"Hindi ko mahanap ang talaksan para sa paketeng %s. Maaaring kailanganin "
"niyong ayusin ng de kamay ang paketeng ito."
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1310
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2715,7 +2719,7 @@ msgstr ""
"Sira ang talaksang index ng mga pakete. Walang Filename: field para sa "
"paketeng %s."
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1397
msgid "Size mismatch"
msgstr "Di tugmang laki"
@@ -2808,78 +2812,88 @@ msgstr "Mga nakatala sa Listahan ng Source para sa Disc na ito ay:\n"
msgid "Unmounting CD-ROM...\n"
msgstr "Ina-unmount ang CD-ROM..."
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
#, c-format
msgid "Wrote %i records.\n"
msgstr "Nagsulat ng %i na record.\n"
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Nagsulat ng %i na record na may %i na talaksang kulang.\n"
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Nagsulat ng %i na record na may %i na talaksang mismatch\n"
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
"Nagsulat ng %i na record na may %i na talaksang kulang at %i na talaksang "
"mismatch\n"
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:522
#, c-format
msgid "Preparing %s"
msgstr "Hinahanda ang %s"
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:523
#, c-format
msgid "Unpacking %s"
msgstr "Binubuklat ang %s"
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:528
#, c-format
msgid "Preparing to configure %s"
msgstr "Hinahanda ang %s upang isaayos"
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:529
#, c-format
msgid "Configuring %s"
msgstr "Isasaayos ang %s"
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:530
#, c-format
msgid "Installed %s"
msgstr "Iniluklok ang %s"
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:535
#, c-format
msgid "Preparing for removal of %s"
msgstr "Naghahanda para sa pagtanggal ng %s"
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:536
#, c-format
msgid "Removing %s"
msgstr "Tinatanggal ang %s"
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:537
#, c-format
msgid "Removed %s"
msgstr "Tinanggal ang %s"
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:542
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Naghahanda upang tanggalin ng lubusan ang %s"
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:543
#, c-format
msgid "Completely removed %s"
msgstr "Natanggal ng lubusan ang %s"
+#: apt-pkg/deb/dpkgpm.cc:566
+#, fuzzy, c-format
+msgid "Directory '%s' missing"
+msgstr "Nawawala ang directory ng talaan %spartial."
+
+#: apt-pkg/deb/dpkgpm.cc:709
+#, fuzzy, c-format
+msgid "openpty failed\n"
+msgstr "Bigo ang pagpili"
+
#: methods/rred.cc:219
msgid "Could not patch file"
msgstr "Hindi mai-patch ang talaksan"
diff --git a/po/uk.po b/po/uk.po
index 6291cb807..40813d77b 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-all\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-06 06:51+0200\n"
+"POT-Creation-Date: 2007-08-04 09:09+0200\n"
"PO-Revision-Date: 2006-07-29 15:57+0300\n"
"Last-Translator: Artem Bondarenko <artem.brz@gmail.com>\n"
"Language-Team: Українська <uk@li.org>\n"
@@ -158,9 +158,9 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2584 cmdline/apt-sortpkgs.cc:144
-#, c-format
-msgid "%s %s for %s %s compiled on %s %s\n"
+#: cmdline/apt-get.cc:2585 cmdline/apt-sortpkgs.cc:144
+#, fuzzy, c-format
+msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s для %s %s скомпільовано %s %s\n"
#: cmdline/apt-cache.cc:1721
@@ -663,7 +663,7 @@ msgstr "Не вдалося перейменувати %s в %s"
msgid "Y"
msgstr "Т"
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1673
#, c-format
msgid "Regex compilation error - %s"
msgstr "Помилка компіляції регулярного виразу - %s"
@@ -828,11 +828,11 @@ msgstr "Пакунки необхідно видалити, але видале�
msgid "Internal error, Ordering didn't finish"
msgstr "Внутрішня помилка, Ordering не завершилася"
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2011 cmdline/apt-get.cc:2044
msgid "Unable to lock the download directory"
msgstr "Неможливо заблокувати теку для завантаження"
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2092 cmdline/apt-get.cc:2333
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr "Неможливо прочитати перелік джерел."
@@ -862,7 +862,7 @@ msgid "After unpacking %sB disk space will be freed.\n"
msgstr ""
"Після розпакування об'єм зайнятого дискового простору зменшиться на %sB.\n"
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2186
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2187
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Не вдалося визначити кількість вільного місця в %s"
@@ -901,7 +901,7 @@ msgstr "Перервано."
msgid "Do you want to continue [Y/n]? "
msgstr "Бажаєте продовжити [Т/н]? "
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2229
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2230
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Не вдалося завантажити %s %s\n"
@@ -910,7 +910,7 @@ msgstr "Не вдалося завантажити %s %s\n"
msgid "Some files failed to download"
msgstr "Деякі файли не вдалося завантажити"
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2238
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2239
msgid "Download complete and in download only mode"
msgstr "Вказано режим \"тільки завантаження\", і завантаження завершено"
@@ -1047,7 +1047,7 @@ msgid ""
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1754
msgid "The following information may help to resolve the situation:"
msgstr "Наступна інформація можливо допоможе Вам:"
@@ -1060,33 +1060,33 @@ msgstr "Внутрішня помилка, вирішувач проблем в�
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Внутрішня помилка, AllUpgrade все поламав"
-#: cmdline/apt-get.cc:1544
+#: cmdline/apt-get.cc:1545
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "Не можу знайти пакунок %s"
-#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
+#: cmdline/apt-get.cc:1660 cmdline/apt-get.cc:1696
#, c-format
msgid "Couldn't find package %s"
msgstr "Не можу знайти пакунок %s"
-#: cmdline/apt-get.cc:1682
+#: cmdline/apt-get.cc:1683
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Помітьте, регулярний вираз %2$s призводить до вибору %1$s\n"
-#: cmdline/apt-get.cc:1712
+#: cmdline/apt-get.cc:1713
#, fuzzy, c-format
msgid "%s set to manual installed.\n"
msgstr "але %s буде встановлений"
-#: cmdline/apt-get.cc:1725
+#: cmdline/apt-get.cc:1726
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
"Можливо, для виправлення цих помилок Ви захочете скористатися 'apt-get -f "
"install':"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1729
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1094,7 +1094,7 @@ msgstr ""
"Незадоволені залежності. Спробуйте виконати 'apt-get -f install', не "
"вказуючи імені пакунка (або знайдіть інше рішення)."
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1741
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1105,7 +1105,7 @@ msgstr ""
"або ж використаєте нестабільний дистрибутив, і запитані Вами пакунки\n"
"ще не створені або були вилучені з Incoming."
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1749
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1115,121 +1115,121 @@ msgstr ""
"пакунок просто не може бути встановлений через помилки в самому пакунку.\n"
"Необхідно відіслати звіт про цю помилку."
-#: cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1757
msgid "Broken packages"
msgstr "Зламані пакунки"
-#: cmdline/apt-get.cc:1785
+#: cmdline/apt-get.cc:1786
msgid "The following extra packages will be installed:"
msgstr "Будуть встановлені наступні додаткові пакунки:"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Suggested packages:"
msgstr "Пропоновані пакунки:"
-#: cmdline/apt-get.cc:1875
+#: cmdline/apt-get.cc:1876
msgid "Recommended packages:"
msgstr "Рекомендовані пакунки:"
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1904
msgid "Calculating upgrade... "
msgstr "Обчислення оновлень... "
-#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1907 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Невдача"
-#: cmdline/apt-get.cc:1911
+#: cmdline/apt-get.cc:1912
msgid "Done"
msgstr "Виконано"
-#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
+#: cmdline/apt-get.cc:1979 cmdline/apt-get.cc:1987
msgid "Internal error, problem resolver broke stuff"
msgstr "Внутрішня помилка, вирішувач проблем все поламав"
-#: cmdline/apt-get.cc:2086
+#: cmdline/apt-get.cc:2087
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Вкажіть як мінімум один пакунок, для якого необхідно завантажити вихідні "
"тексти"
-#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2350
+#: cmdline/apt-get.cc:2117 cmdline/apt-get.cc:2351
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Неможливо знайти пакунок з вихідними текстами для %s"
-#: cmdline/apt-get.cc:2165
+#: cmdline/apt-get.cc:2166
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Пропускаємо вже завантажений файл '%s'\n"
-#: cmdline/apt-get.cc:2189
+#: cmdline/apt-get.cc:2190
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Недостатньо місця в %s"
-#: cmdline/apt-get.cc:2194
+#: cmdline/apt-get.cc:2195
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Необхідно завантажити %sB/%sB з архівів вихідних текстів.\n"
-#: cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2198
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Потрібно завантажити %sB архівів з вихідними текстами.\n"
-#: cmdline/apt-get.cc:2203
+#: cmdline/apt-get.cc:2204
#, c-format
msgid "Fetch source %s\n"
msgstr "Завантаження вихідних текстів %s\n"
-#: cmdline/apt-get.cc:2234
+#: cmdline/apt-get.cc:2235
msgid "Failed to fetch some archives."
msgstr "Деякі архіви не вдалося завантажити."
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2263
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
"Розпакування вихідних текстів пропущено, тому що в %s вже перебувають "
"розпаковані вихідні тексти\n"
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2275
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Команда розпакування '%s' завершилася невдало.\n"
-#: cmdline/apt-get.cc:2275
+#: cmdline/apt-get.cc:2276
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Перевірте, чи встановлений пакунок 'dpkg-dev'.\n"
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2293
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Команда побудови '%s' закінчилася невдало.\n"
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:2312
msgid "Child process failed"
msgstr "Породжений процес завершився невдало"
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2328
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Для перевірки залежностей для побудови необхідно вказати як мінімум один "
"пакунок"
-#: cmdline/apt-get.cc:2355
+#: cmdline/apt-get.cc:2356
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Неможливо одержати інформацію про залежності для побудови %s"
-#: cmdline/apt-get.cc:2375
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s не має залежностей для побудови.\n"
-#: cmdline/apt-get.cc:2427
+#: cmdline/apt-get.cc:2428
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1237,7 +1237,7 @@ msgid ""
msgstr ""
"Залежність типу %s для %s не може бути задоволена, бо пакунок %s не знайдено"
-#: cmdline/apt-get.cc:2479
+#: cmdline/apt-get.cc:2480
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1246,32 +1246,32 @@ msgstr ""
"Залежність типу %s для %s не може бути задоволена, бо ні одна з версій "
"пакунка %s не задовольняє умови"
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2515
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Не вдалося задовольнити залежність типу %s для пакунка %s: Встановлений "
"пакунок %s новіше, аніж треба"
-#: cmdline/apt-get.cc:2539
+#: cmdline/apt-get.cc:2540
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Неможливо задовольнити залежність типу %s для пакунка %s: %s"
-#: cmdline/apt-get.cc:2553
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Залежності для побудови %s не можуть бути задоволені."
-#: cmdline/apt-get.cc:2557
+#: cmdline/apt-get.cc:2558
msgid "Failed to process build dependencies"
msgstr "Обробка залежностей для побудови закінчилася невдало"
-#: cmdline/apt-get.cc:2589
+#: cmdline/apt-get.cc:2590
msgid "Supported modules:"
msgstr "Підтримувані модулі:"
-#: cmdline/apt-get.cc:2630
+#: cmdline/apt-get.cc:2631
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1705,25 +1705,25 @@ msgstr "Помилка обробки MD5. Зсув %lu"
msgid "This is not a valid DEB archive, missing '%s' member"
msgstr "Невірний DEB архів, відсутній член '%s'"
-#: apt-inst/deb/debfile.cc:48
-#, c-format
-msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
+#: apt-inst/deb/debfile.cc:50
+#, fuzzy, c-format
+msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
msgstr "Невірний DEB архів, відсутній член '%s' чи '%s'"
-#: apt-inst/deb/debfile.cc:108
+#: apt-inst/deb/debfile.cc:110
#, c-format
msgid "Couldn't change to %s"
msgstr "Неможливо змінити %s"
-#: apt-inst/deb/debfile.cc:134
+#: apt-inst/deb/debfile.cc:140
msgid "Internal error, could not locate member"
msgstr "Внутрішня помилка, не можу знайти member"
-#: apt-inst/deb/debfile.cc:167
+#: apt-inst/deb/debfile.cc:173
msgid "Failed to locate a valid control file"
msgstr "Не вдалося знайти правильний контрольний (control) файл"
-#: apt-inst/deb/debfile.cc:252
+#: apt-inst/deb/debfile.cc:258
msgid "Unparsable control file"
msgstr "Контрольний файл не можливо обробити"
@@ -2092,15 +2092,15 @@ msgstr "Помилка читання з сервера. Віддалена ст
msgid "Error reading from server"
msgstr "Помилка читання з сервера"
-#: methods/http.cc:1108
+#: methods/http.cc:1104
msgid "Bad header data"
msgstr "Погана заголовкова інформація"
-#: methods/http.cc:1125
+#: methods/http.cc:1121 methods/http.cc:1176
msgid "Connection failed"
msgstr "З'єднання не вдалося"
-#: methods/http.cc:1216
+#: methods/http.cc:1228
msgid "Internal error"
msgstr "Внутрішня помилка"
@@ -2130,7 +2130,7 @@ msgstr "Відкривається конфігураційний файл %s"
#: apt-pkg/contrib/configuration.cc:510
#, fuzzy, c-format
-msgid "Line %d too long (max %lu)"
+msgid "Line %d too long (max %u)"
msgstr "Лінія %d занадто довга (максимум %d)"
#: apt-pkg/contrib/configuration.cc:606
@@ -2390,29 +2390,29 @@ msgstr "Необов'язкові (Optional)"
msgid "extra"
msgstr "Додаткові (Extra)"
-#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129
+#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
msgid "Building dependency tree"
msgstr "Побудова дерева залежностей"
-#: apt-pkg/depcache.cc:101
+#: apt-pkg/depcache.cc:122
msgid "Candidate versions"
msgstr "Версії кандидатів"
-#: apt-pkg/depcache.cc:130
+#: apt-pkg/depcache.cc:151
msgid "Dependency generation"
msgstr "Ґенерація залежностей"
-#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174
+#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
#, fuzzy
msgid "Reading state information"
msgstr "Об'єднання інформації про доступні пакунки"
-#: apt-pkg/depcache.cc:198
+#: apt-pkg/depcache.cc:219
#, fuzzy, c-format
msgid "Failed to open StateFile %s"
msgstr "Не вдалося відкрити %s"
-#: apt-pkg/depcache.cc:204
+#: apt-pkg/depcache.cc:225
#, fuzzy, c-format
msgid "Failed to write temporary StateFile %s"
msgstr "Не вдалося записати файл %s"
@@ -2547,18 +2547,18 @@ msgstr "Драйвер для метода %s не знайдено."
msgid "Method %s did not start correctly"
msgstr "Метод %s не стартував коректно"
-#: apt-pkg/acquire-worker.cc:381
+#: apt-pkg/acquire-worker.cc:396
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
"Будь-ласка, вставте диск з поміткою: '%s' в CD привід '%s' і натисніть Enter."
-#: apt-pkg/init.cc:126
+#: apt-pkg/init.cc:124
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Система пакування '%s' не підтримується"
-#: apt-pkg/init.cc:142
+#: apt-pkg/init.cc:140
msgid "Unable to determine a suitable packaging system type"
msgstr "Неможливо визначити тип необхідної системи пакування "
@@ -2692,17 +2692,21 @@ msgstr "Помилка IO під час збереження джерельно�
msgid "rename failed, %s (%s -> %s)."
msgstr "Не вдалося перейменувати, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:401
msgid "MD5Sum mismatch"
msgstr "Невідповідність MD5Sum"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1405
+#, fuzzy
+msgid "Hash Sum mismatch"
+msgstr "Невідповідність MD5Sum"
+
+#: apt-pkg/acquire-item.cc:1097
#, fuzzy
msgid "There is no public key available for the following key IDs:\n"
msgstr "Відсутній публічний ключ для заданих ID ключа:\n"
-#: apt-pkg/acquire-item.cc:1219
+#: apt-pkg/acquire-item.cc:1210
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2711,7 +2715,7 @@ msgstr ""
"Я не можу знайти файл для пакунку %s. Можливо, Ви захочете власноруч "
"виправити цей пакунок. (due to missing arch)"
-#: apt-pkg/acquire-item.cc:1278
+#: apt-pkg/acquire-item.cc:1269
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2720,14 +2724,14 @@ msgstr ""
"Я не можу знайти файл для пакунку %s. Можливо, Ви захочете власноруч "
"виправити цей пакунок."
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1310
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"Індексні файли пакунків пошкоджені. Немає поля Filename для пакунку %s."
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1397
msgid "Size mismatch"
msgstr "Невідповідність розміру"
@@ -2818,76 +2822,86 @@ msgstr "Перелік джерел для цього диску:\n"
msgid "Unmounting CD-ROM...\n"
msgstr "Демонтується CD-ROM..."
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
#, c-format
msgid "Wrote %i records.\n"
msgstr "Записано %i записів.\n"
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Записано %i записів з %i відсутніми файлами.\n"
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Записано %i записів з %i невідповідними файлам\n"
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "Записано %i записів з %i відсутніми і %i невідповідними файлами\n"
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:522
#, c-format
msgid "Preparing %s"
msgstr "Підготовка %s"
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:523
#, c-format
msgid "Unpacking %s"
msgstr "Розпакування %s"
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:528
#, c-format
msgid "Preparing to configure %s"
msgstr "Підготовка до конфігурації %s"
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:529
#, c-format
msgid "Configuring %s"
msgstr "Конфігурація %s"
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:530
#, c-format
msgid "Installed %s"
msgstr "Встановлено %s"
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:535
#, c-format
msgid "Preparing for removal of %s"
msgstr "Підготовка до видалення %s"
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:536
#, c-format
msgid "Removing %s"
msgstr "Видаляється %s"
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:537
#, c-format
msgid "Removed %s"
msgstr "Видалено %s"
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:542
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Підготовка до повного видалення %s"
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:543
#, c-format
msgid "Completely removed %s"
msgstr "Повністю видалено %s"
+#: apt-pkg/deb/dpkgpm.cc:566
+#, fuzzy, c-format
+msgid "Directory '%s' missing"
+msgstr "Lists тека %spartial відсутня."
+
+#: apt-pkg/deb/dpkgpm.cc:709
+#, fuzzy, c-format
+msgid "openpty failed\n"
+msgstr "Вибір не вдався"
+
#: methods/rred.cc:219
msgid "Could not patch file"
msgstr "Неможливо накласти латку на файл"
diff --git a/po/vi.po b/po/vi.po
index e9f19f342..c5d01a10c 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,15 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-06 06:51+0200\n"
-"PO-Revision-Date: 2007-06-21 15:56+0930\n"
+"POT-Creation-Date: 2007-08-04 09:09+0200\n"
+"PO-Revision-Date: 2007-09-03 16:36+0930\n"
"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LocFactoryEditor 1.6.4a1\n"
+"X-Generator: LocFactoryEditor 1.7b1\n"
#: cmdline/apt-cache.cc:143
#, c-format
@@ -46,7 +46,7 @@ msgstr " Gói ảo đơn: "
#: cmdline/apt-cache.cc:290
msgid " Mixed virtual packages: "
-msgstr " Gói ảo hỗn hợp:"
+msgstr " Gói ảo hỗn hợp: "
#: cmdline/apt-cache.cc:291
msgid " Missing: "
@@ -54,39 +54,39 @@ msgstr " Thiếu : "
#: cmdline/apt-cache.cc:293
msgid "Total distinct versions: "
-msgstr "Tổng số phiên bản riêng: "
+msgstr "Tổng phiên bản riêng: "
#: cmdline/apt-cache.cc:295
msgid "Total Distinct Descriptions: "
-msgstr "Tổng số mô tả riêng: "
+msgstr "Tổng mô tả riêng: "
#: cmdline/apt-cache.cc:297
msgid "Total dependencies: "
-msgstr "Tổng số phụ thuộc: "
+msgstr "Tổng đồ phụ thuộc: "
#: cmdline/apt-cache.cc:300
msgid "Total ver/file relations: "
-msgstr "Tổng số liên quan phiên bản và tập tin: "
+msgstr "Tổng liên quan phiên bản và tập tin: "
#: cmdline/apt-cache.cc:302
msgid "Total Desc/File relations: "
-msgstr "Tổng số liên quan mô tả/tập tin:"
+msgstr "Tổng liên quan mô tả/tập tin: "
#: cmdline/apt-cache.cc:304
msgid "Total Provides mappings: "
-msgstr "Tổng số ảnh xạ Miễn là: "
+msgstr "Tổng ảnh xạ Miễn là: "
#: cmdline/apt-cache.cc:316
msgid "Total globbed strings: "
-msgstr "Tổng số chuỗi mở rộng mẫu tìm kiếm: "
+msgstr "Tổng chuỗi mở rộng mẫu tìm kiếm: "
#: cmdline/apt-cache.cc:330
msgid "Total dependency version space: "
-msgstr "Tổng chỗ phiên bản phụ thuộc:"
+msgstr "Tổng chỗ phiên bản phụ thuộc: "
#: cmdline/apt-cache.cc:335
msgid "Total slack space: "
-msgstr "Tổng chỗ nghỉ:"
+msgstr "Tổng chỗ nghỉ: "
#: cmdline/apt-cache.cc:343
msgid "Total space accounted for: "
@@ -160,10 +160,10 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2584 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2585 cmdline/apt-sortpkgs.cc:144
#, c-format
-msgid "%s %s for %s %s compiled on %s %s\n"
-msgstr "%s %s cho %s %s được biên dịch vào %s %s\n"
+msgid "%s %s for %s compiled on %s %s\n"
+msgstr "%s %s cho %s được biên dịch vào %s %s\n"
#: cmdline/apt-cache.cc:1721
msgid ""
@@ -684,7 +684,7 @@ msgstr "Việc đổi tên %s thành %s bị lỗi"
msgid "Y"
msgstr "C"
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1673
#, c-format
msgid "Regex compilation error - %s"
msgstr "Lỗi biên dich biểu thức chính quy - %s"
@@ -847,11 +847,11 @@ msgstr "Cần phải gỡ bỏ một số gói, nhưng mà khả năng Gỡ bỏ
msgid "Internal error, Ordering didn't finish"
msgstr "Gặp lỗi nội bộ: tiến trình Sắp xếp chưa xong"
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2011 cmdline/apt-get.cc:2044
msgid "Unable to lock the download directory"
msgstr "Không thể khóa thư mục tải về"
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2092 cmdline/apt-get.cc:2333
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr "Không thể đọc danh sách nguồn."
@@ -881,7 +881,7 @@ msgstr "Sau khi đã giải nén, sẻ chiếm %sB sức chứa đĩa thêm.\n"
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Sau khi đã giải nén, sẽ giải phóng %sB sức chữa đĩa thêm.\n"
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2186
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2187
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Không thể quyết định chỗ rảnh trong %s"
@@ -919,7 +919,7 @@ msgstr "Hủy bỏ."
msgid "Do you want to continue [Y/n]? "
msgstr "Bạn có muốn tiếp tục không? [Y/n] [C/k] "
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2229
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2230
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Việc gói %s bị lỗi %s\n"
@@ -928,7 +928,7 @@ msgstr "Việc gói %s bị lỗi %s\n"
msgid "Some files failed to download"
msgstr "Một số tập tin không tải về được"
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2238
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2239
msgid "Download complete and in download only mode"
msgstr "Mới tải về xong và trong chế độ chỉ tải về"
@@ -1066,7 +1066,7 @@ msgstr ""
"Ừm, có vẻ là Bộ Gỡ bỏ Tự động đã hủy cái gì, một trường hợp thực sự không "
"nên xảy ra. Hãy thông báo lỗi về apt."
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1754
msgid "The following information may help to resolve the situation:"
msgstr "Có lẽ thông tin theo đây sẽ giúp đỡ quyết định trường hợp:"
@@ -1078,31 +1078,31 @@ msgstr "Lỗi nội bộ : Bộ Gỡ bỏ Tự động đã làm hư gì."
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Lỗi nội bộ: AllUpgrade (toàn bộ nâng cấp) đã ngắt gì"
-#: cmdline/apt-get.cc:1544
+#: cmdline/apt-get.cc:1545
#, c-format
msgid "Couldn't find task %s"
msgstr "Không tìm thấy tác vụ %s"
-#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
+#: cmdline/apt-get.cc:1660 cmdline/apt-get.cc:1696
#, c-format
msgid "Couldn't find package %s"
msgstr "Không tìm thấy gói %s"
-#: cmdline/apt-get.cc:1682
+#: cmdline/apt-get.cc:1683
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Ghi chú : đang chọn %s cho biểu thức chính quy « %s »\n"
-#: cmdline/apt-get.cc:1712
+#: cmdline/apt-get.cc:1713
#, c-format
msgid "%s set to manual installed.\n"
msgstr "%s được đặt thành « được cài đặt thủ công ».\n"
-#: cmdline/apt-get.cc:1725
+#: cmdline/apt-get.cc:1726
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Có lẽ bạn hãy chạy lênh « apt-get -f install » để sửa hết:"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1729
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1110,7 +1110,7 @@ msgstr ""
"Gói còn phụ thuộc vào phần mềm chưa có. Hãy cố chạy lệnh « apt-get -f "
"install » mà không có gói nào (hoặc ghi rõ cách quyết định)."
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1741
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1122,7 +1122,7 @@ msgstr ""
"bất định, có lẽ chưa tạo một số gói cần thiết,\n"
"hoặc chưa di chuyển chúng ra phần Incoming (Đến)."
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1749
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1132,123 +1132,123 @@ msgstr ""
"gói này đơn giản không có khả năng cài đặt, thì bạn hay\n"
"thông báo lỗi về gói này."
-#: cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1757
msgid "Broken packages"
msgstr "Gói bị ngắt"
-#: cmdline/apt-get.cc:1785
+#: cmdline/apt-get.cc:1786
msgid "The following extra packages will be installed:"
msgstr "Những gói thêm theo đây sẽ được cài đặt:"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Suggested packages:"
msgstr "Gói được đệ nghị:"
-#: cmdline/apt-get.cc:1875
+#: cmdline/apt-get.cc:1876
msgid "Recommended packages:"
msgstr "Gói được khuyên:"
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1904
msgid "Calculating upgrade... "
msgstr "Đang tính nâng cấp... "
-#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1907 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Bị lỗi"
-#: cmdline/apt-get.cc:1911
+#: cmdline/apt-get.cc:1912
msgid "Done"
msgstr "Xong"
-#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
+#: cmdline/apt-get.cc:1979 cmdline/apt-get.cc:1987
msgid "Internal error, problem resolver broke stuff"
msgstr "Lỗi nội bộ: bộ tháo gỡ vấn đề đã ngắt gì"
-#: cmdline/apt-get.cc:2086
+#: cmdline/apt-get.cc:2087
msgid "Must specify at least one package to fetch source for"
msgstr "Phải ghi rõ ít nhất một gói cần lấy nguồn cho nó"
-#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2350
+#: cmdline/apt-get.cc:2117 cmdline/apt-get.cc:2351
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Không tìm thấy gói nguồn cho %s"
-#: cmdline/apt-get.cc:2165
+#: cmdline/apt-get.cc:2166
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Đang bỏ qua tập tin đã được tải về « %s »\n"
-#: cmdline/apt-get.cc:2189
+#: cmdline/apt-get.cc:2190
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Không đủ sức chứa còn rảnh trong %s"
-#: cmdline/apt-get.cc:2194
+#: cmdline/apt-get.cc:2195
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Cần phải lấy %sB/%sB kho nguồn.\n"
-#: cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2198
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Cần phải lấy %sB kho nguồn.\n"
-#: cmdline/apt-get.cc:2203
+#: cmdline/apt-get.cc:2204
#, c-format
msgid "Fetch source %s\n"
msgstr "Lấy nguồn %s\n"
-#: cmdline/apt-get.cc:2234
+#: cmdline/apt-get.cc:2235
msgid "Failed to fetch some archives."
msgstr "Việc lấy một số kho bị lỗi."
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2263
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Đang bỏ qua giải nén nguồn đã giải nén trong %s\n"
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2275
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Lệnh giải nén « %s » bị lỗi.\n"
-#: cmdline/apt-get.cc:2275
+#: cmdline/apt-get.cc:2276
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Hãy kiểm tra xem gói « dpkg-dev » có được cài đặt chưa.\n"
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2293
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Lệnh xây dụng « %s » bị lỗi.\n"
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:2312
msgid "Child process failed"
msgstr "Tiến trình con bị lỗi"
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2328
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Phải ghi rõ ít nhất một gói cần kiểm tra cách phụ thuộc khi xây dụng cho nó"
-#: cmdline/apt-get.cc:2355
+#: cmdline/apt-get.cc:2356
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Không thể lấy thông tin về cách phụ thuộc khi xây dụng cho %s"
-#: cmdline/apt-get.cc:2375
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s không phụ thuộc vào gì khi xây dụng.\n"
-#: cmdline/apt-get.cc:2427
+#: cmdline/apt-get.cc:2428
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "cách phụ thuộc %s cho %s không thể được thỏa vì không tìm thấy gọi %s"
-#: cmdline/apt-get.cc:2479
+#: cmdline/apt-get.cc:2480
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1257,31 +1257,31 @@ msgstr ""
"cách phụ thuộc %s cho %s không thể được thỏa vì không có phiên bản sẵn sàng "
"của gói %s có thể thỏa điều kiện phiên bản."
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2515
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Việc cố thỏa cách phụ thuộc %s cho %s bị lỗi vì gói đã cài đặt %s quá mới"
-#: cmdline/apt-get.cc:2539
+#: cmdline/apt-get.cc:2540
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Việc cố thỏa cách phụ thuộc %s cho %s bị lỗi: %s."
-#: cmdline/apt-get.cc:2553
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Không thể thỏa cách phụ thuộc khi xây dụng cho %s."
-#: cmdline/apt-get.cc:2557
+#: cmdline/apt-get.cc:2558
msgid "Failed to process build dependencies"
msgstr "Việc xử lý cách phụ thuộc khi xây dụng bị lỗi"
-#: cmdline/apt-get.cc:2589
+#: cmdline/apt-get.cc:2590
msgid "Supported modules:"
msgstr "Mô-đun đã hỗ trợ :"
-#: cmdline/apt-get.cc:2630
+#: cmdline/apt-get.cc:2631
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1716,26 +1716,27 @@ msgstr "Gặp lỗi khi phân tách MD5. Hiệu số %lu"
msgid "This is not a valid DEB archive, missing '%s' member"
msgstr "Đây không phải là môt kho DEB hợp lệ vì còn thiếu bộ phạn « %s »"
-#: apt-inst/deb/debfile.cc:48
+#: apt-inst/deb/debfile.cc:50
#, c-format
-msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
+msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
msgstr ""
-"Đây không phải là môt kho DEB hợp lệ vì không có bộ phạn « %s » hay « %s »"
+"Đây không phải là môt kho DEB hợp lệ vì không có bộ phạn « %s », « %s » hay "
+"« %s »"
-#: apt-inst/deb/debfile.cc:108
+#: apt-inst/deb/debfile.cc:110
#, c-format
msgid "Couldn't change to %s"
msgstr "Không thể chuyển đổi sang %s"
-#: apt-inst/deb/debfile.cc:134
+#: apt-inst/deb/debfile.cc:140
msgid "Internal error, could not locate member"
msgstr "Gặp lỗi nội bộ, không thể định vị bộ phạn"
-#: apt-inst/deb/debfile.cc:167
+#: apt-inst/deb/debfile.cc:173
msgid "Failed to locate a valid control file"
msgstr "Việc định vị tập tin điều khiển hợp lệ bị lỗi"
-#: apt-inst/deb/debfile.cc:252
+#: apt-inst/deb/debfile.cc:258
msgid "Unparsable control file"
msgstr "Tập tin điều khiển không có khả năng phân tách"
@@ -2101,15 +2102,15 @@ msgstr "Gặp lỗi khi đọc từ máy phục vụ : cuối ở xa đã đóng
msgid "Error reading from server"
msgstr "Gặp lỗi khi đọc từ máy phục vụ"
-#: methods/http.cc:1108
+#: methods/http.cc:1104
msgid "Bad header data"
msgstr "Dữ liệu dòng đầu sai"
-#: methods/http.cc:1125
+#: methods/http.cc:1121 methods/http.cc:1176
msgid "Connection failed"
msgstr "Kết nối bị ngắt"
-#: methods/http.cc:1216
+#: methods/http.cc:1228
msgid "Internal error"
msgstr "Gặp lỗi nội bộ"
@@ -2139,8 +2140,8 @@ msgstr "Đang mở tập tin cấu hình %s..."
#: apt-pkg/contrib/configuration.cc:510
#, c-format
-msgid "Line %d too long (max %lu)"
-msgstr "Dòng %d quá dài (tối đa %lu)"
+msgid "Line %d too long (max %u)"
+msgstr "Dòng %d quá dài (tối đa %u)"
#: apt-pkg/contrib/configuration.cc:606
#, c-format
@@ -2392,28 +2393,28 @@ msgstr "tùy chọn"
msgid "extra"
msgstr "thêm"
-#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129
+#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
msgid "Building dependency tree"
msgstr "Đang xây dụng cây cách phụ thuộc..."
-#: apt-pkg/depcache.cc:101
+#: apt-pkg/depcache.cc:122
msgid "Candidate versions"
msgstr "Phiên bản ứng cử"
-#: apt-pkg/depcache.cc:130
+#: apt-pkg/depcache.cc:151
msgid "Dependency generation"
msgstr "Tạo ra cách phụ thuộc"
-#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174
+#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
msgid "Reading state information"
msgstr "Đang đọc thông tin tình trạng"
-#: apt-pkg/depcache.cc:198
+#: apt-pkg/depcache.cc:219
#, c-format
msgid "Failed to open StateFile %s"
msgstr "Lỗi mở tập tin tình trạng StateFile %s"
-#: apt-pkg/depcache.cc:204
+#: apt-pkg/depcache.cc:225
#, c-format
msgid "Failed to write temporary StateFile %s"
msgstr "Lỗi ghi tập tin tình trạng StateFile tạm thời %s"
@@ -2548,17 +2549,17 @@ msgstr "Không tìm thấy trình điều khiển phương pháp %s."
msgid "Method %s did not start correctly"
msgstr "Phương pháp %s đã không bắt đầu cho đúng."
-#: apt-pkg/acquire-worker.cc:381
+#: apt-pkg/acquire-worker.cc:396
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Hãy nạp đĩa có nhãn « %s » vào ổ « %s » và bấm nút Enter."
-#: apt-pkg/init.cc:126
+#: apt-pkg/init.cc:124
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Không hỗ trợ hệ thống đóng gói « %s »"
-#: apt-pkg/init.cc:142
+#: apt-pkg/init.cc:140
msgid "Unable to determine a suitable packaging system type"
msgstr "Không thể quyết định kiểu hệ thống đóng gói thích hợp"
@@ -2697,16 +2698,19 @@ msgstr "Lỗi nhập/xuất khi lưu bộ nhớ tạm nguồn"
msgid "rename failed, %s (%s -> %s)."
msgstr "việc thay đổi tên bị lỗi, %s (%s → %s)."
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:401
msgid "MD5Sum mismatch"
msgstr "MD5Sum (tổng kiểm) không khớp được"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1405
+msgid "Hash Sum mismatch"
+msgstr "Sai khớp tổng băm (hash sum)"
+
+#: apt-pkg/acquire-item.cc:1097
msgid "There is no public key available for the following key IDs:\n"
msgstr "Không có khóa công sẵn sàng cho những ID khóa theo đây:\n"
-#: apt-pkg/acquire-item.cc:1219
+#: apt-pkg/acquire-item.cc:1210
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2715,7 +2719,7 @@ msgstr ""
"Không tìm thấy tập tin liên quan đến gói %s. Có lẽ bạn cần phải tự sửa gói "
"này, do thiếu kiến trúc."
-#: apt-pkg/acquire-item.cc:1278
+#: apt-pkg/acquire-item.cc:1269
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2724,7 +2728,7 @@ msgstr ""
"Không tìm thấy tập tin liên quan đến gói %s. Có lẽ bạn cần phải tự sửa gói "
"này."
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1310
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2732,7 +2736,7 @@ msgstr ""
"Các tập tin chỉ mục của gói này bị hỏng. Không có trường Filename: (Tên tập "
"tin:) cho gói %s."
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1397
msgid "Size mismatch"
msgstr "Kích cỡ không khớp được"
@@ -2823,78 +2827,88 @@ msgstr "Các mục nhập danh sách nguồn cho đĩa này:\n"
msgid "Unmounting CD-ROM...\n"
msgstr "Đang tháo lắp đĩa CD-ROM...\n"
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
#, c-format
msgid "Wrote %i records.\n"
msgstr "Mới ghi %i mục ghi.\n"
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Mới ghi %i mục ghi với %i tập tin còn thiếu.\n"
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Mới ghi %i mục ghi với %i tập tin không khớp với nhau\n"
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
"Mới ghi %i mục ghi với %i tập tin còn thiếu và %i tập tin không khớp với "
"nhau\n"
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:522
#, c-format
msgid "Preparing %s"
msgstr "Đang chuẩn bị %s..."
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:523
#, c-format
msgid "Unpacking %s"
msgstr "Đang mở gói %s..."
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:528
#, c-format
msgid "Preparing to configure %s"
msgstr "Đang chuẩn bị cấu hình %s..."
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:529
#, c-format
msgid "Configuring %s"
msgstr "Đang cấu hình %s..."
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:530
#, c-format
msgid "Installed %s"
msgstr "Đã cài đặt %s"
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:535
#, c-format
msgid "Preparing for removal of %s"
msgstr "Đang chuẩn bị gỡ bỏ %s..."
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:536
#, c-format
msgid "Removing %s"
msgstr "Đang gỡ bỏ %s..."
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:537
#, c-format
msgid "Removed %s"
msgstr "Đã gỡ bỏ %s"
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:542
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Đang chuẩn bị gỡ bỏ hoàn toàn %s..."
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:543
#, c-format
msgid "Completely removed %s"
msgstr "Mới gỡ bỏ hoàn toàn %s"
+#: apt-pkg/deb/dpkgpm.cc:566
+#, c-format
+msgid "Directory '%s' missing"
+msgstr "Thiếu thư mục « %s »"
+
+#: apt-pkg/deb/dpkgpm.cc:709
+#, c-format
+msgid "openpty failed\n"
+msgstr "openpty bị lỗi\n"
+
#: methods/rred.cc:219
msgid "Could not patch file"
msgstr "Không thể vá lỗi trong tập tin %s"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 45606092f..82ae505ef 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: 2007-07-06 06:51+0200\n"
+"POT-Creation-Date: 2007-08-04 09:09+0200\n"
"PO-Revision-Date: 2007-03-29 17:14+0800\n"
"Last-Translator: Kov Chai <tchaikov@sjtu.org>\n"
"Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n"
@@ -158,9 +158,9 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2584 cmdline/apt-sortpkgs.cc:144
-#, c-format
-msgid "%s %s for %s %s compiled on %s %s\n"
+#: cmdline/apt-get.cc:2585 cmdline/apt-sortpkgs.cc:144
+#, fuzzy, c-format
+msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s for %s %s ,编译于 %s %s\n"
#: cmdline/apt-cache.cc:1721
@@ -652,7 +652,7 @@ msgstr "无法将 %s 重命名为 %s"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1673
#, c-format
msgid "Regex compilation error - %s"
msgstr "编译正则表达式时出错 - %s"
@@ -813,11 +813,11 @@ msgstr "有软件包需要被卸载,但是卸载动作被程序设置所禁止
msgid "Internal error, Ordering didn't finish"
msgstr "内部错误,Ordering 未能完成"
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2011 cmdline/apt-get.cc:2044
msgid "Unable to lock the download directory"
msgstr "无法对下载目录加锁"
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2092 cmdline/apt-get.cc:2333
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr "无法读取安装源列表。"
@@ -846,7 +846,7 @@ msgstr "解压缩后会消耗掉 %sB 的额外空间。\n"
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "解压缩后将会空出 %sB 的空间。\n"
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2186
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2187
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "无法获知您在 %s 上的空余空间"
@@ -883,7 +883,7 @@ msgstr "中止执行。"
msgid "Do you want to continue [Y/n]? "
msgstr "您希望继续执行吗?[Y/n]"
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2229
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2230
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "无法下载 %s %s\n"
@@ -892,7 +892,7 @@ msgstr "无法下载 %s %s\n"
msgid "Some files failed to download"
msgstr "有一些文件下载失败"
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2238
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2239
msgid "Download complete and in download only mode"
msgstr "下载完毕,目前是“仅下载”模式"
@@ -1025,7 +1025,7 @@ msgid ""
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1754
msgid "The following information may help to resolve the situation:"
msgstr "下列的信息可能会对解决问题有所帮助:"
@@ -1038,31 +1038,31 @@ msgstr "内部错误,problem resolver 坏事了"
msgid "Internal error, AllUpgrade broke stuff"
msgstr "内部错误,AllUpgrade 坏事了"
-#: cmdline/apt-get.cc:1544
+#: cmdline/apt-get.cc:1545
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "无法找到软件包 %s"
-#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
+#: cmdline/apt-get.cc:1660 cmdline/apt-get.cc:1696
#, c-format
msgid "Couldn't find package %s"
msgstr "无法找到软件包 %s"
-#: cmdline/apt-get.cc:1682
+#: cmdline/apt-get.cc:1683
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "注意,根据正则表达式“%2$s”选中了 %1$s\n"
-#: cmdline/apt-get.cc:1712
+#: cmdline/apt-get.cc:1713
#, fuzzy, c-format
msgid "%s set to manual installed.\n"
msgstr "但是 %s 正要被安装"
-#: cmdline/apt-get.cc:1725
+#: cmdline/apt-get.cc:1726
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "您可能需要运行“apt-get -f install”来纠正下列错误:"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1729
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1070,7 +1070,7 @@ msgstr ""
"有未能满足的依赖关系。请尝试不指明软件包的名字来运行“apt-get -f install”(也可"
"以指定一个解决办法)。"
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1741
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1081,7 +1081,7 @@ msgstr ""
"因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n"
"包尚未被创建或是它们还在新到(incoming)目录中。"
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1749
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1090,122 +1090,122 @@ msgstr ""
"您仅要求对单一软件包进行操作,这极有可能是因为该软件包安装不上,同时,\n"
"您最好提交一个针对这个软件包的故障报告。"
-#: cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1757
msgid "Broken packages"
msgstr "无法安装的软件包"
-#: cmdline/apt-get.cc:1785
+#: cmdline/apt-get.cc:1786
msgid "The following extra packages will be installed:"
msgstr "将会安装下列额外的软件包:"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Suggested packages:"
msgstr "建议安装的软件包:"
-#: cmdline/apt-get.cc:1875
+#: cmdline/apt-get.cc:1876
msgid "Recommended packages:"
msgstr "推荐安装的软件包:"
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1904
msgid "Calculating upgrade... "
msgstr "正在筹划升级... "
-#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1907 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "失败"
-#: cmdline/apt-get.cc:1911
+#: cmdline/apt-get.cc:1912
msgid "Done"
msgstr "完成"
-#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
+#: cmdline/apt-get.cc:1979 cmdline/apt-get.cc:1987
msgid "Internal error, problem resolver broke stuff"
msgstr "内部错误,problem resolver 坏事了"
-#: cmdline/apt-get.cc:2086
+#: cmdline/apt-get.cc:2087
msgid "Must specify at least one package to fetch source for"
msgstr "要下载源代码,必须指定至少一个对应的软件包"
-#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2350
+#: cmdline/apt-get.cc:2117 cmdline/apt-get.cc:2351
#, c-format
msgid "Unable to find a source package for %s"
msgstr "无法找到与 %s 对应的源代码包"
-#: cmdline/apt-get.cc:2165
+#: cmdline/apt-get.cc:2166
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "忽略已下载过的文件“%s”\n"
-#: cmdline/apt-get.cc:2189
+#: cmdline/apt-get.cc:2190
#, c-format
msgid "You don't have enough free space in %s"
msgstr "您在 %s 上没有足够的空余空间"
-#: cmdline/apt-get.cc:2194
+#: cmdline/apt-get.cc:2195
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "需要下载 %sB/%sB 的源代码包。\n"
-#: cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2198
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "需要下载 %sB 的源代码包。\n"
-#: cmdline/apt-get.cc:2203
+#: cmdline/apt-get.cc:2204
#, c-format
msgid "Fetch source %s\n"
msgstr "下载源代码 %s\n"
-#: cmdline/apt-get.cc:2234
+#: cmdline/apt-get.cc:2235
msgid "Failed to fetch some archives."
msgstr "有一些包文件无法下载。"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2263
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "对于已经被解包到 %s 目录的源代码包就不再解开了\n"
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2275
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "运行解包的命令“%s”出错。\n"
-#: cmdline/apt-get.cc:2275
+#: cmdline/apt-get.cc:2276
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "请检查是否安装了“dpkg-dev”软件包。\n"
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2293
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "执行构造软件包命令“%s”失败。\n"
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:2312
msgid "Child process failed"
msgstr "子进程出错"
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2328
msgid "Must specify at least one package to check builddeps for"
msgstr "要检查生成软件包的构建依赖关系(builddeps),必须指定至少一个软件包"
-#: cmdline/apt-get.cc:2355
+#: cmdline/apt-get.cc:2356
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "无法获得 %s 的构建依赖关系(build-dependency)信息"
-#: cmdline/apt-get.cc:2375
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "%s has no build depends.\n"
msgstr " %s 没有构建依赖关系信息。\n"
-#: cmdline/apt-get.cc:2427
+#: cmdline/apt-get.cc:2428
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "由于无法找到软件包 %3$s ,因此不能满足 %2$s 所要求的 %1$s 依赖关系"
-#: cmdline/apt-get.cc:2479
+#: cmdline/apt-get.cc:2480
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1214,30 +1214,30 @@ msgstr ""
"由于无法找到符合要求的软件包 %3$s 的可用版本,因此不能满足 %2$s 所要求的 %1"
"$s 依赖关系"
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2515
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr "无法满足 %2$s 所要求 %1$s 依赖关系:已安装的软件包 %3$s 太新了"
-#: cmdline/apt-get.cc:2539
+#: cmdline/apt-get.cc:2540
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "无法满足 %2$s 所要求 %1$s 依赖关系:%3$s"
-#: cmdline/apt-get.cc:2553
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "不能满足软件包 %s 所要求的构建依赖关系。"
-#: cmdline/apt-get.cc:2557
+#: cmdline/apt-get.cc:2558
msgid "Failed to process build dependencies"
msgstr "无法处理构建依赖关系"
-#: cmdline/apt-get.cc:2589
+#: cmdline/apt-get.cc:2590
msgid "Supported modules:"
msgstr "被支持模块:"
-#: cmdline/apt-get.cc:2630
+#: cmdline/apt-get.cc:2631
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1655,25 +1655,25 @@ msgstr "无法解析 MD5 码。文件内偏移量为 %lu"
msgid "This is not a valid DEB archive, missing '%s' member"
msgstr "这不是一个有效的 DEB 包文件,其包内遗漏了“%s”"
-#: apt-inst/deb/debfile.cc:48
-#, c-format
-msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
+#: apt-inst/deb/debfile.cc:50
+#, fuzzy, c-format
+msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
msgstr "这不是一个有效的 DEB 包文件,其包内遗漏了“%s”或者“%s”"
-#: apt-inst/deb/debfile.cc:108
+#: apt-inst/deb/debfile.cc:110
#, c-format
msgid "Couldn't change to %s"
msgstr "无法切换工作目录到 %s"
-#: apt-inst/deb/debfile.cc:134
+#: apt-inst/deb/debfile.cc:140
msgid "Internal error, could not locate member"
msgstr "内部错误,无法定位包内文件"
-#: apt-inst/deb/debfile.cc:167
+#: apt-inst/deb/debfile.cc:173
msgid "Failed to locate a valid control file"
msgstr "无法在打包文件中找到有效的主控文件"
-#: apt-inst/deb/debfile.cc:252
+#: apt-inst/deb/debfile.cc:258
msgid "Unparsable control file"
msgstr "不能解析的主控文件"
@@ -2032,15 +2032,15 @@ msgstr "从服务器读取数据时出错,对方关闭了连接"
msgid "Error reading from server"
msgstr "从服务器读取数据出错"
-#: methods/http.cc:1108
+#: methods/http.cc:1104
msgid "Bad header data"
msgstr "错误的报头数据"
-#: methods/http.cc:1125
+#: methods/http.cc:1121 methods/http.cc:1176
msgid "Connection failed"
msgstr "连接失败"
-#: methods/http.cc:1216
+#: methods/http.cc:1228
msgid "Internal error"
msgstr "内部错误"
@@ -2070,7 +2070,7 @@ msgstr "正在打开配置文件 %s"
#: apt-pkg/contrib/configuration.cc:510
#, fuzzy, c-format
-msgid "Line %d too long (max %lu)"
+msgid "Line %d too long (max %u)"
msgstr "软件包来源档的第 %d 行超长了(长度限制为 %d)。"
#: apt-pkg/contrib/configuration.cc:606
@@ -2323,29 +2323,29 @@ msgstr "可选"
msgid "extra"
msgstr "额外"
-#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129
+#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
msgid "Building dependency tree"
msgstr "正在分析软件包的依赖关系树"
-#: apt-pkg/depcache.cc:101
+#: apt-pkg/depcache.cc:122
msgid "Candidate versions"
msgstr "候选版本"
-#: apt-pkg/depcache.cc:130
+#: apt-pkg/depcache.cc:151
msgid "Dependency generation"
msgstr "生成依赖关系"
-#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174
+#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
#, fuzzy
msgid "Reading state information"
msgstr "正在合并现有信息"
-#: apt-pkg/depcache.cc:198
+#: apt-pkg/depcache.cc:219
#, fuzzy, c-format
msgid "Failed to open StateFile %s"
msgstr "无法打开 %s"
-#: apt-pkg/depcache.cc:204
+#: apt-pkg/depcache.cc:225
#, fuzzy, c-format
msgid "Failed to write temporary StateFile %s"
msgstr "无法写入文件 %s"
@@ -2478,17 +2478,17 @@ msgstr "无法找到获取软件包的渠道 %s 所需的驱动程序。"
msgid "Method %s did not start correctly"
msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动。"
-#: apt-pkg/acquire-worker.cc:381
+#: apt-pkg/acquire-worker.cc:396
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "请把标有 “%s” 的碟片插入驱动器“%s”再按回车键。"
-#: apt-pkg/init.cc:126
+#: apt-pkg/init.cc:124
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "不支持“%s”打包系统"
-#: apt-pkg/init.cc:142
+#: apt-pkg/init.cc:140
msgid "Unable to determine a suitable packaging system type"
msgstr "无法确定适合的打包系统类型"
@@ -2621,16 +2621,20 @@ msgstr "无法写入来源缓存文件"
msgid "rename failed, %s (%s -> %s)."
msgstr "无法重命名文件,%s (%s -> %s)。"
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:401
msgid "MD5Sum mismatch"
msgstr "MD5 校验和不符"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1405
+#, fuzzy
+msgid "Hash Sum mismatch"
+msgstr "MD5 校验和不符"
+
+#: apt-pkg/acquire-item.cc:1097
msgid "There is no public key available for the following key IDs:\n"
msgstr "以下 key ID 没有可用的公钥:\n"
-#: apt-pkg/acquire-item.cc:1219
+#: apt-pkg/acquire-item.cc:1210
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2639,7 +2643,7 @@ msgstr ""
"我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件"
"包。(缘于架构缺失)"
-#: apt-pkg/acquire-item.cc:1278
+#: apt-pkg/acquire-item.cc:1269
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2647,13 +2651,13 @@ msgid ""
msgstr ""
"我无法找到对应 %s 软件包的文件。在这种情况下您可能需要手动修正这个软件包。"
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1310
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。"
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1397
msgid "Size mismatch"
msgstr "大小不符"
@@ -2744,76 +2748,86 @@ msgstr "对应于该光盘的软件包源设置项是:\n"
msgid "Unmounting CD-ROM...\n"
msgstr "正在卸载 CD-ROM 文件系统……"
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
#, c-format
msgid "Wrote %i records.\n"
msgstr "已写入 %i 条记录。\n"
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "已写入 %i 条记录,并有 %i 个文件缺失。\n"
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "已写入 %i 条记录,并有 %i 个文件不吻合\n"
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "已写入 %i 条记录,并有 %i 个缺失,以及 %i 个文件不吻合\n"
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:522
#, c-format
msgid "Preparing %s"
msgstr "正在准备 %s"
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:523
#, c-format
msgid "Unpacking %s"
msgstr "正在解压缩 %s"
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:528
#, c-format
msgid "Preparing to configure %s"
msgstr "正在准备配置 %s"
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:529
#, c-format
msgid "Configuring %s"
msgstr "正在配置 %s"
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:530
#, c-format
msgid "Installed %s"
msgstr "已安装 %s"
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:535
#, c-format
msgid "Preparing for removal of %s"
msgstr "正在准备 %s 的删除操作"
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:536
#, c-format
msgid "Removing %s"
msgstr "正在删除 %s"
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:537
#, c-format
msgid "Removed %s"
msgstr "已删除 %s"
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:542
#, c-format
msgid "Preparing to completely remove %s"
msgstr "正在准备完全删除 %s"
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:543
#, c-format
msgid "Completely removed %s"
msgstr "完全删除了 %s"
+#: apt-pkg/deb/dpkgpm.cc:566
+#, fuzzy, c-format
+msgid "Directory '%s' missing"
+msgstr "软件包列表的目录 %spartial 不见了。"
+
+#: apt-pkg/deb/dpkgpm.cc:709
+#, fuzzy, c-format
+msgid "openpty failed\n"
+msgstr "select 调用出错"
+
#: methods/rred.cc:219
msgid "Could not patch file"
msgstr "无法打开补丁文件"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index fa12145cd..22370557e 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: 2007-07-06 06:51+0200\n"
+"POT-Creation-Date: 2007-08-04 09:09+0200\n"
"PO-Revision-Date: 2006-10-21 16:58+0800\n"
"Last-Translator: Asho Yeh <asho@debian.org.tw>\n"
"Language-Team: Chinese/Traditional <zh-l10n@linux.org.tw>\n"
@@ -159,9 +159,9 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2584 cmdline/apt-sortpkgs.cc:144
-#, c-format
-msgid "%s %s for %s %s compiled on %s %s\n"
+#: cmdline/apt-get.cc:2585 cmdline/apt-sortpkgs.cc:144
+#, fuzzy, c-format
+msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s 是針對於 %s %s 並編譯在 %s %s\n"
#: cmdline/apt-cache.cc:1721
@@ -652,7 +652,7 @@ msgstr "無法將 %s 更名為 %s"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1673
#, c-format
msgid "Regex compilation error - %s"
msgstr "編譯正規表示法出錯 - %s"
@@ -813,11 +813,11 @@ msgstr "有套件需要被移除,但移除動作被禁止。"
msgid "Internal error, Ordering didn't finish"
msgstr "內部錯誤,Ordering didn't finish"
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2011 cmdline/apt-get.cc:2044
msgid "Unable to lock the download directory"
msgstr "無法鎖定下載的目錄"
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2092 cmdline/apt-get.cc:2333
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr "無法讀取來源單。"
@@ -846,7 +846,7 @@ msgstr "解壓縮後將消耗 %sB 的空間。\n"
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "解壓縮後將空出 %sB 的空間。\n"
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2186
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2187
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "%s 無法足夠的空間。"
@@ -883,7 +883,7 @@ msgstr "放棄執行。"
msgid "Do you want to continue [Y/n]? "
msgstr "繼續執行嗎? 是按 [Y] 鍵,否按 [n] 鍵 "
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2229
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2230
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "無法下載『%s』檔案。%s\n"
@@ -892,7 +892,7 @@ msgstr "無法下載『%s』檔案。%s\n"
msgid "Some files failed to download"
msgstr "部份檔案無法下載"
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2238
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2239
msgid "Download complete and in download only mode"
msgstr "下載完畢,目前是“僅下載”模式"
@@ -1024,7 +1024,7 @@ msgid ""
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1754
msgid "The following information may help to resolve the situation:"
msgstr "底下的資訊有助於解決現在的情況:"
@@ -1037,31 +1037,31 @@ msgstr "內部錯誤,problem resolver 處理失敗"
msgid "Internal error, AllUpgrade broke stuff"
msgstr "內部錯誤,AllUpgrade 造成錯誤"
-#: cmdline/apt-get.cc:1544
+#: cmdline/apt-get.cc:1545
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "無法找到 %s 套件。"
-#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
+#: cmdline/apt-get.cc:1660 cmdline/apt-get.cc:1696
#, c-format
msgid "Couldn't find package %s"
msgstr "無法找到 %s 套件。"
-#: cmdline/apt-get.cc:1682
+#: cmdline/apt-get.cc:1683
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "注意,根據正規表示法“%2$s”選擇了 %1$s\n"
-#: cmdline/apt-get.cc:1712
+#: cmdline/apt-get.cc:1713
#, fuzzy, c-format
msgid "%s set to manual installed.\n"
msgstr "但是『%s』卻將被安裝。"
-#: cmdline/apt-get.cc:1725
+#: cmdline/apt-get.cc:1726
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "用『apt-get -f install』指令或許能修正這些問題。"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1729
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1069,7 +1069,7 @@ msgstr ""
"無法滿足的相依關係。請嘗試不指定套件明成來執行“apt-get -f install”(或指>\n"
"定一個解決辦法)。"
-#: cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:1741
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1080,7 +1080,7 @@ msgstr ""
"或是您使用不穩定(unstable)發行版而這些需要的套件尚未完成\n"
"或從 Incoming 目錄移除。"
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1749
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1090,122 +1090,122 @@ msgstr ""
"該套件無法安裝,您最好提交一個針對這個套件\n"
"的臭蟲報告。"
-#: cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1757
msgid "Broken packages"
msgstr "損毀的套件"
-#: cmdline/apt-get.cc:1785
+#: cmdline/apt-get.cc:1786
msgid "The following extra packages will be installed:"
msgstr "下列的【新】套件都將被安裝:"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Suggested packages:"
msgstr "建議(Suggested)的套件:"
-#: cmdline/apt-get.cc:1875
+#: cmdline/apt-get.cc:1876
msgid "Recommended packages:"
msgstr "推薦(Recommended)的套件:"
-#: cmdline/apt-get.cc:1903
+#: cmdline/apt-get.cc:1904
msgid "Calculating upgrade... "
msgstr "籌畫升級套件中..."
-#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1907 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "失敗"
-#: cmdline/apt-get.cc:1911
+#: cmdline/apt-get.cc:1912
msgid "Done"
msgstr "完成"
-#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
+#: cmdline/apt-get.cc:1979 cmdline/apt-get.cc:1987
msgid "Internal error, problem resolver broke stuff"
msgstr "內部錯誤,problem resolver 處理失敗"
-#: cmdline/apt-get.cc:2086
+#: cmdline/apt-get.cc:2087
msgid "Must specify at least one package to fetch source for"
msgstr "必須指定至少一個對應的套件才能下載源碼"
-#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2350
+#: cmdline/apt-get.cc:2117 cmdline/apt-get.cc:2351
#, c-format
msgid "Unable to find a source package for %s"
msgstr "無法找到 %s 套件的源碼"
-#: cmdline/apt-get.cc:2165
+#: cmdline/apt-get.cc:2166
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "略過已被下載的檔案“%s”\n"
-#: cmdline/apt-get.cc:2189
+#: cmdline/apt-get.cc:2190
#, c-format
msgid "You don't have enough free space in %s"
msgstr "『%s』內沒有足夠的空間。"
-#: cmdline/apt-get.cc:2194
+#: cmdline/apt-get.cc:2195
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "需要下載 %2$sB 中 %1$sB 的原始檔案。\n"
-#: cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2198
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "需要下載 %sB 的原始檔案。\n"
-#: cmdline/apt-get.cc:2203
+#: cmdline/apt-get.cc:2204
#, c-format
msgid "Fetch source %s\n"
msgstr "下載源碼 %s\n"
-#: cmdline/apt-get.cc:2234
+#: cmdline/apt-get.cc:2235
msgid "Failed to fetch some archives."
msgstr "無法下載某些檔案。"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2263
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "略過已經被解開到 %s 目錄的源碼檔案\n"
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2275
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "執行解開套件指令 '%s' 時失敗。\n"
-#: cmdline/apt-get.cc:2275
+#: cmdline/apt-get.cc:2276
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "請檢查是否安裝了“dpkg-dev”套件。\n"
-#: cmdline/apt-get.cc:2292
+#: cmdline/apt-get.cc:2293
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "執行建立套件指令 '%s' 時失敗。\n"
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:2312
msgid "Child process failed"
msgstr "子程序失敗"
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2328
msgid "Must specify at least one package to check builddeps for"
msgstr "必須指定至少一個套件才能檢查其建立相依關係(builddeps)"
-#: cmdline/apt-get.cc:2355
+#: cmdline/apt-get.cc:2356
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "無法取得 %s 的建構相依關係。"
-#: cmdline/apt-get.cc:2375
+#: cmdline/apt-get.cc:2376
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s 無建立相依關係訊息。\n"
-#: cmdline/apt-get.cc:2427
+#: cmdline/apt-get.cc:2428
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "由於無法找到套件 %3$s ,因此不能滿足 %2$s 所要求的 %1$s 相依關係"
-#: cmdline/apt-get.cc:2479
+#: cmdline/apt-get.cc:2480
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1214,30 +1214,30 @@ msgstr ""
"由於無法找到符合要求的套件 %3$s 的可用版本,因此不能滿足 %2$s 所要求的 %1$s 的"
"相依關係"
-#: cmdline/apt-get.cc:2514
+#: cmdline/apt-get.cc:2515
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr "無法滿足 %2$s 所要求 %1$s 相依關係:已安裝的套件 %3$s 太新了"
-#: cmdline/apt-get.cc:2539
+#: cmdline/apt-get.cc:2540
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "無法滿足 %2$s 所要求 %1$s 相依關係:%3$s"
-#: cmdline/apt-get.cc:2553
+#: cmdline/apt-get.cc:2554
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "無法滿足套件 %s 所要求的建構相依關係。"
-#: cmdline/apt-get.cc:2557
+#: cmdline/apt-get.cc:2558
msgid "Failed to process build dependencies"
msgstr "無法處理建構相依關係"
-#: cmdline/apt-get.cc:2589
+#: cmdline/apt-get.cc:2590
msgid "Supported modules:"
msgstr "支援模組:"
-#: cmdline/apt-get.cc:2630
+#: cmdline/apt-get.cc:2631
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1657,25 +1657,25 @@ msgstr "解析 MD5 錯誤。位移(offset) %lu"
msgid "This is not a valid DEB archive, missing '%s' member"
msgstr "無效的 DEB 檔案,遺失 %s 成員"
-#: apt-inst/deb/debfile.cc:48
-#, c-format
-msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
+#: apt-inst/deb/debfile.cc:50
+#, fuzzy, c-format
+msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
msgstr "無效的 DEB 檔案,遺失 '%s' 或 '%s' 成員"
-#: apt-inst/deb/debfile.cc:108
+#: apt-inst/deb/debfile.cc:110
#, c-format
msgid "Couldn't change to %s"
msgstr "無法變換目錄至 %s"
-#: apt-inst/deb/debfile.cc:134
+#: apt-inst/deb/debfile.cc:140
msgid "Internal error, could not locate member"
msgstr "內部錯誤:無法找到成員"
-#: apt-inst/deb/debfile.cc:167
+#: apt-inst/deb/debfile.cc:173
msgid "Failed to locate a valid control file"
msgstr "找不到有效的 control 檔案"
-#: apt-inst/deb/debfile.cc:252
+#: apt-inst/deb/debfile.cc:258
msgid "Unparsable control file"
msgstr "無法分析的 control 檔案"
@@ -2033,15 +2033,15 @@ msgstr "從遠端主機讀取錯誤,關閉連線"
msgid "Error reading from server"
msgstr "從伺服器讀取發生錯誤"
-#: methods/http.cc:1108
+#: methods/http.cc:1104
msgid "Bad header data"
msgstr "壞的標頭資料"
-#: methods/http.cc:1125
+#: methods/http.cc:1121 methods/http.cc:1176
msgid "Connection failed"
msgstr "連線失敗"
-#: methods/http.cc:1216
+#: methods/http.cc:1228
msgid "Internal error"
msgstr "內部錯誤"
@@ -2071,7 +2071,7 @@ msgstr "開啟組態檔 %s"
#: apt-pkg/contrib/configuration.cc:510
#, fuzzy, c-format
-msgid "Line %d too long (max %lu)"
+msgid "Line %d too long (max %u)"
msgstr "第 %d 行太長(最長 %d)"
#: apt-pkg/contrib/configuration.cc:606
@@ -2324,29 +2324,29 @@ msgstr "次要"
msgid "extra"
msgstr "添加"
-#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129
+#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
msgid "Building dependency tree"
msgstr "了解套件依存關係中"
-#: apt-pkg/depcache.cc:101
+#: apt-pkg/depcache.cc:122
msgid "Candidate versions"
msgstr "候選版本"
-#: apt-pkg/depcache.cc:130
+#: apt-pkg/depcache.cc:151
msgid "Dependency generation"
msgstr "產生套件依存關係"
-#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174
+#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
#, fuzzy
msgid "Reading state information"
msgstr "結合現有資料中"
-#: apt-pkg/depcache.cc:198
+#: apt-pkg/depcache.cc:219
#, fuzzy, c-format
msgid "Failed to open StateFile %s"
msgstr "無法開啟 %s"
-#: apt-pkg/depcache.cc:204
+#: apt-pkg/depcache.cc:225
#, fuzzy, c-format
msgid "Failed to write temporary StateFile %s"
msgstr "寫入檔案 %s 失敗"
@@ -2474,17 +2474,17 @@ msgstr "找不到安裝方式『%s』的驅動程式。"
msgid "Method %s did not start correctly"
msgstr "安裝方式『%s』沒有正確啟動。"
-#: apt-pkg/acquire-worker.cc:381
+#: apt-pkg/acquire-worker.cc:396
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "更換媒體:請把名為 '%s' 的光碟置入 '%s' 碟機,然後按 [Enter] 鍵。"
-#: apt-pkg/init.cc:126
+#: apt-pkg/init.cc:124
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "本軟體不支持『%s』包裝法。"
-#: apt-pkg/init.cc:142
+#: apt-pkg/init.cc:140
msgid "Unable to determine a suitable packaging system type"
msgstr "無法明白系統類別。"
@@ -2617,36 +2617,40 @@ msgstr "無法寫入來源暫存檔。"
msgid "rename failed, %s (%s -> %s)."
msgstr "檔名因『%s』更換失敗 (%s → %s)。"
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:401
msgid "MD5Sum mismatch"
msgstr "MD5 檢查碼不符合。"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1405
+#, fuzzy
+msgid "Hash Sum mismatch"
+msgstr "MD5 檢查碼不符合。"
+
+#: apt-pkg/acquire-item.cc:1097
msgid "There is no public key available for the following key IDs:\n"
msgstr "以下 key ID 沒有可用的公鑰:\n"
-#: apt-pkg/acquire-item.cc:1219
+#: apt-pkg/acquire-item.cc:1210
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package. (due to missing arch)"
msgstr "找不到套件『%s』需要的某檔案。請您修理這個套件再試試。"
-#: apt-pkg/acquire-item.cc:1278
+#: apt-pkg/acquire-item.cc:1269
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"manually fix this package."
msgstr "找不到套件『%s』需要的某檔案。請您修理這個套件再試試。"
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1310
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "套件『%s』索引檔損壞—缺少『Filename:』欄。"
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1397
msgid "Size mismatch"
msgstr "檔案大小不符合。"
@@ -2737,76 +2741,86 @@ msgstr "該碟片的來源列表項目為:\n"
msgid "Unmounting CD-ROM...\n"
msgstr "卸載光碟機中..."
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
#, c-format
msgid "Wrote %i records.\n"
msgstr "寫入 %i 筆紀錄。\n"
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "寫入 %i 筆遺失 %i 個檔案的紀錄。\n"
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "寫入 %i 筆 %i 個不匹配檔案的紀錄。\n"
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "寫入 %i 筆遺失 %i 個檔案和 %i 個不匹配檔案的紀錄。\n"
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:522
#, c-format
msgid "Preparing %s"
msgstr "準備配置%s中"
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:523
#, c-format
msgid "Unpacking %s"
msgstr "解開%s中"
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:528
#, c-format
msgid "Preparing to configure %s"
msgstr "準備設定%s檔"
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:529
#, c-format
msgid "Configuring %s"
msgstr "設定%s中"
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:530
#, c-format
msgid "Installed %s"
msgstr "已安裝%s"
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:535
#, c-format
msgid "Preparing for removal of %s"
msgstr "正在準備 %s 的刪除操作"
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:536
#, c-format
msgid "Removing %s"
msgstr "移除%s中"
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:537
#, c-format
msgid "Removed %s"
msgstr "已移除%s"
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:542
#, c-format
msgid "Preparing to completely remove %s"
msgstr "準備完整移除 %s"
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:543
#, c-format
msgid "Completely removed %s"
msgstr "已完整移除%s"
+#: apt-pkg/deb/dpkgpm.cc:566
+#, fuzzy, c-format
+msgid "Directory '%s' missing"
+msgstr "找不到『%spartial』清單目錄。"
+
+#: apt-pkg/deb/dpkgpm.cc:709
+#, fuzzy, c-format
+msgid "openpty failed\n"
+msgstr "Select 失敗"
+
#: methods/rred.cc:219
msgid "Could not patch file"
msgstr "無法開啟『%s』檔案。"
diff --git a/test/fake-status b/test/fake-status
new file mode 100644
index 000000000..9e6366d5b
--- /dev/null
+++ b/test/fake-status
@@ -0,0 +1,16 @@
+Package: libglib2.0-0
+Status: install ok installed
+Priority: optional
+Section: libs
+Installed-Size: 1376
+Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
+Architecture: all
+Source: glib2.0
+Version: 2.13.7-1ubuntu1
+Description: The GLib library of C routines
+ GLib is a library containing many useful C routines for things such
+ as trees, hashes, lists, and strings. It is a useful general-purpose
+ C library used by projects such as GTK+, GIMP, and GNOME.
+ .
+ This package contains the shared libraries.
+Original-Maintainer: Loic Minier <lool@dooz.org>
diff --git a/test/local-repo/Packages b/test/local-repo/Packages
new file mode 100644
index 000000000..fe62fc038
--- /dev/null
+++ b/test/local-repo/Packages
@@ -0,0 +1,11 @@
+Package: gdebi-test4
+Architecture: all
+Version: 1.0
+Conflicts: apt (<= 0.1)
+Filename: ./gdebi-test4.deb
+Size: 2306
+MD5sum: 0952a2b4a566215e0794c7603f3fcfcc
+SHA1: 318688ea2d53352a1bdb669ebd2cd4847f6c4e7c
+SHA256: 35f600b57253cef807a1da7c5deb06e7821de9223842a310a77b4da87cf51e2c
+Description: testpackage for gdebi - Conflicts: apt (<= 0.1)
+
diff --git a/test/local-repo/Packages.gz b/test/local-repo/Packages.gz
new file mode 100644
index 000000000..b5d528435
--- /dev/null
+++ b/test/local-repo/Packages.gz
Binary files differ
diff --git a/test/local-repo/Packages.gz.save b/test/local-repo/Packages.gz.save
new file mode 100644
index 000000000..c73f56395
--- /dev/null
+++ b/test/local-repo/Packages.gz.save
Binary files differ
diff --git a/test/local-repo/Release b/test/local-repo/Release
new file mode 100644
index 000000000..7f206ef25
--- /dev/null
+++ b/test/local-repo/Release
@@ -0,0 +1,13 @@
+Date: Thu, 09 Aug 2007 10:13:06 UTC
+MD5Sum:
+ 29f79161fafe1f0c393e7fc6ddcb99b5 338 Packages
+ 2f885b2ebdb77d3354ba63d8b5aad614 269 Packages.gz
+ d41d8cd98f00b204e9800998ecf8427e 0 Release
+SHA1:
+ d8860d409a8b0db443fbf254e2d6afbfc9bc04a8 338 Packages
+ 8b668a7b730ceb4d702737a13a723959c20b67df 269 Packages.gz
+ da39a3ee5e6b4b0d3255bfef95601890afd80709 0 Release
+SHA256:
+ 39aa9fc59d868a71030d24aeaa4b574d7a11a10ea79491a0881f8d755b36a06d 338 Packages
+ 62898623498ebf8304647db1ba2d33e4d8ec0e3e45250c2b66907c812b099297 269 Packages.gz
+ e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 0 Release
diff --git a/test/local-repo/Release.gpg b/test/local-repo/Release.gpg
new file mode 100644
index 000000000..e1c309566
--- /dev/null
+++ b/test/local-repo/Release.gpg
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQBGuui6liSD4VZixzQRApSlAJ9D6G1QXvtXH1jH1I4SStsb1VsImQCbBPfp
++1p0bDANcBVY+GckjJvFRkY=
+=a0AR
+-----END PGP SIGNATURE-----
diff --git a/test/local-repo/gdebi-test4.deb b/test/local-repo/gdebi-test4.deb
new file mode 100644
index 000000000..9eb92d1b4
--- /dev/null
+++ b/test/local-repo/gdebi-test4.deb
Binary files differ
diff --git a/test/pre-upload-check.py b/test/pre-upload-check.py
new file mode 100755
index 000000000..373683360
--- /dev/null
+++ b/test/pre-upload-check.py
@@ -0,0 +1,170 @@
+#!/usr/bin/python
+
+import sys
+import os
+import glob
+import os.path
+from subprocess import call, PIPE
+
+import unittest
+
+stdout = os.open("/dev/null",0) #sys.stdout
+stderr = os.open("/dev/null",0) # sys.stderr
+
+apt_args = [] # ["-o","Debug::pkgAcquire::Auth=true"]
+
+
+class testAuthentication(unittest.TestCase):
+ """
+ test if the authentication is working, the repository
+ of the test-data can be found here:
+ bzr get http://people.ubuntu.com/~mvo/bzr/apt/apt-auth-test-suit/
+ """
+
+ # some class wide data
+ apt = "apt-get"
+ pkg = "libglib2.0-data"
+ pkgver = "2.13.6-1ubuntu1"
+ pkgpath = "/var/cache/apt/archives/libglib2.0-data_2.13.6-1ubuntu1_all.deb"
+
+ def setUp(self):
+ for f in glob.glob("testkeys/*,key"):
+ call(["apt-key", "add", f], stdout=stdout, stderr=stderr)
+
+ def _cleanup(self):
+ " make sure we get new lists and no i-m-s "
+ call(["rm","-f", "/var/lib/apt/lists/*"])
+ if os.path.exists(self.pkgpath):
+ os.unlink(self.pkgpath)
+
+ def _expectedRes(self, resultstr):
+ if resultstr == 'ok':
+ return 0
+ elif resultstr == 'broken':
+ return 100
+
+
+ def testPackages(self):
+ for f in glob.glob("testsources.list/sources.list*package*"):
+ self._cleanup()
+ (prefix, testtype, result) = f.split("-")
+ expected_res = self._expectedRes(result)
+ # update first
+ call([self.apt,"update",
+ "-o","Dir::Etc::sourcelist=./%s" % f]+apt_args,
+ stdout=stdout, stderr=stderr)
+ # then get the pkg
+ cmd = ["install", "-y", "-d", "--reinstall",
+ "%s=%s" % (self.pkg, self.pkgver),
+ "-o","Dir::state::Status=./fake-status"]
+ res = call([self.apt, "-o","Dir::Etc::sourcelist=./%s" % f]+cmd+apt_args,
+ stdout=stdout, stderr=stderr)
+ self.assert_(res == expected_res,
+ "test '%s' failed (got %s expected %s" % (f,res,expected_res))
+
+
+ def testGPG(self):
+ for f in glob.glob("testsources.list/sources.list*gpg*"):
+ self._cleanup()
+ (prefix, testtype, result) = f.split("-")
+ expected_res = self._expectedRes(result)
+ # update first
+ call([self.apt,"update",
+ "-o","Dir::Etc::sourcelist=./%s" % f]+apt_args,
+ stdout=stdout, stderr=stderr)
+ cmd = ["install", "-y", "-d", "--reinstall",
+ "%s=%s" % (self.pkg, self.pkgver),
+ "-o","Dir::state::Status=./fake-status"]
+ res = call([self.apt, "-o","Dir::Etc::sourcelist=./%s" % f]+
+ cmd+apt_args,
+ stdout=stdout, stderr=stderr)
+ self.assert_(res == expected_res,
+ "test '%s' failed (got %s expected %s" % (f,res,expected_res))
+
+ def testRelease(self):
+ for f in glob.glob("testsources.list/sources.list*release*"):
+ self._cleanup()
+ (prefix, testtype, result) = f.split("-")
+ expected_res = self._expectedRes(result)
+ cmd = ["update"]
+ res = call([self.apt,"-o","Dir::Etc::sourcelist=./%s" % f]+cmd+apt_args,
+ stdout=stdout, stderr=stderr)
+ self.assert_(res == expected_res,
+ "test '%s' failed (got %s expected %s" % (f,res,expected_res))
+ if expected_res == 0:
+ self.assert_(len(glob.glob("/var/lib/apt/lists/partial/*")) == 0,
+ "partial/ dir has leftover files: %s" % glob.glob("/var/lib/apt/lists/partial/*"))
+
+
+class testLocalRepositories(unittest.TestCase):
+ " test local repository regressions "
+
+ repo_dir = "local-repo"
+ apt = "apt-get"
+ pkg = "gdebi-test4"
+
+ def setUp(self):
+ self.repo = os.path.abspath(os.path.join(os.getcwd(), self.repo_dir))
+ self.sources = os.path.join(self.repo, "sources.list")
+ s = open(self.sources,"w")
+ s.write("deb file://%s/ /\n" % self.repo)
+ s.close()
+
+ def testLocalRepoAuth(self):
+ # two times to get at least one i-m-s hit
+ for i in range(2):
+ self.assert_(os.path.exists(self.sources))
+ cmd = [self.apt,"update","-o", "Dir::Etc::sourcelist=%s" % self.sources]+apt_args
+ res = call(cmd, stdout=stdout, stderr=stderr)
+ self.assertEqual(res, 0, "local repo test failed")
+ self.assert_(os.path.exists(os.path.join(self.repo,"Packages.gz")),
+ "Packages.gz vanished from local repo")
+
+ def testLocalRepo2(self):
+ repo = os.path.abspath(os.path.join(os.getcwd(), self.repo_dir+"2"))
+ sources = os.path.join(self.repo, "sources.list")
+ s = open(sources,"w")
+ s.write("deb file://%s/ /\n" % repo)
+ s.close()
+
+ # two times to get at least one i-m-s hit
+ for i in range(2):
+ self.assert_(os.path.exists(sources))
+ cmd = [self.apt,"update","-o", "Dir::Etc::sourcelist=%s" % sources]+apt_args
+ res = call(cmd, stdout=stdout, stderr=stderr)
+ self.assertEqual(res, 0, "local repo2 test failed")
+ self.assert_(os.path.exists(os.path.join(repo,"Packages.gz")),
+ "Packages.gz vanished from local repo")
+
+ def testInstallFromLocalRepo(self):
+ apt = [self.apt,"-o", "Dir::Etc::sourcelist=%s"% self.sources]+apt_args
+ cmd = apt+["update"]
+ res = call(cmd, stdout=stdout, stderr=stderr)
+ self.assertEqual(res, 0)
+ res = call(apt+["-y","install","--reinstall",self.pkg],
+ stdout=stdout, stderr=stderr)
+ self.assert_(res == 0,
+ "installing %s failed (got %s)" % (self.pkg, res))
+ res = call(apt+["-y","remove",self.pkg],
+ stdout=stdout, stderr=stderr)
+ self.assert_(res == 0,
+ "removing %s failed (got %s)" % (self.pkg, res))
+
+ def testPythonAptInLocalRepo(self):
+ import apt, apt_pkg
+ apt_pkg.Config.Set("Dir::Etc::sourcelist",self.sources)
+ cache = apt.Cache()
+ cache.update()
+ pkg = cache["apt"]
+ self.assert_(pkg.name == 'apt')
+
+
+
+if __name__ == "__main__":
+ print "Runing simple testsuit on current apt-get and libapt"
+ if len(sys.argv) > 1 and sys.argv[1] == "-v":
+ stdout = sys.stdout
+ stderr = sys.stderr
+ unittest.main()
+
+
diff --git a/test/testkeys/mvo.key b/test/testkeys/mvo.key
new file mode 100644
index 000000000..e1ab50119
--- /dev/null
+++ b/test/testkeys/mvo.key
@@ -0,0 +1,1182 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+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
+XGNZaqeIRgQTEQIABgUCPxVtRQAKCRC7VaR/yQHDPnjcAJ9es1zm1Kbba+MQpMJ/
+W7LoojAEQACg/qe/YgPY8kc3XIT3GTAxt4uU2NqIRgQTEQIABgUCPxZZigAKCRDn
+yduv41bvwEH/AKDAx7U7T+mag4+nQgJt3fVtBaBotgCfUc8zZ1GoO+4nl6J16HaS
+383ZMoOIRgQSEQIABgUCPxcIVwAKCRB3+BUzuw7ox4LhAJ985s36sd3XVShLnNSs
+oWwBCASHuwCeMR+G2M9etc91AwWmWTAa7Cm5oyqIRgQTEQIABgUCPxZaGQAKCRD0
+tLDMeX6/q2ixAJ9s5BGe4RAXi6h8crxOe69xY8Z2UgCfa95gIjyGx/78TvCxTld1
+rN6qsQCIRgQQEQIABgUCPxe0rAAKCRBGzFxj8xilakodAJ44FYFEomCpZ8fZiY/9
+kuQaxxSvagCgulF5/z2p5KjhzG3WB/ujP+VIhSSIRgQTEQIABgUCPxfUcgAKCRBT
+trgdwTzuB6pxAJ95M7TpYjim9ooeyC1t8escuno0LACeOe4iq+6JWhZcow3us448
+Duvc+IKJAQEEExECAMEFAj8Whg2GFIAAAAAAGgBjc2lnbmF0dXJlLW5vdGVzQHBl
+bmd1aW4uZGUiaHR0cDovL3d3dy5wZW5ndWluLmRlL35iYi9jb250YWN0L3BncC9z
+aWduaW5ncy9ub3Rlcy5FQTcxQjI5NjQ1OTc0RDhCMzQzRTgyMUU5NjI0ODNFMTU2
+NjJDNzM0LmFzYyIzGmh0dHA6Ly93d3cucGVuZ3Vpbi5kZS9+YmIvY29udGFjdC9w
+Z3AvcG9saWN5L3YxLjEvAAoJEKseS2BGdWseknkAn1m1/xMVTIsJr18NZWVWaduY
+SisWAJ9zpOZlUDvxUgygPf8qxpw/+QjhLYkB1wQTAQIAwQUCPxaF/4YUgAAAAAAa
+AGNzaWduYXR1cmUtbm90ZXNAcGVuZ3Vpbi5kZSJodHRwOi8vd3d3LnBlbmd1aW4u
+ZGUvfmJiL2NvbnRhY3QvcGdwL3NpZ25pbmdzL25vdGVzLkVBNzFCMjk2NDU5NzRE
+OEIzNDNFODIxRTk2MjQ4M0UxNTY2MkM3MzQuYXNjIjMaaHR0cDovL3d3dy5wZW5n
+dWluLmRlL35iYi9jb250YWN0L3BncC9wb2xpY3kvdjEuMS8ACgkQGaJoCYg4/ZRS
+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
+CRCUT8anamoLvKHtAJ0TyFAX6asPnzbpFBjLtY6bzFqeBgCeMUofVcspoa/0/YBa
+A8hSD9Qd/I6IRgQTEQIABgUCPxvrDwAKCRDYDvNai7Unr5ilAJ46rCD0b3Ywssdg
+c/bBBUS9kgUzkACguVCo26BCv86vOgOBe2wQr9qEPZKIRgQQEQIABgUCPyfZIgAK
+CRBvI4vCT9paDCFcAJ96KZRIVSLr+IrMrYoHd/H4r/R9uQCgioG+kSWctJYlqMxo
+4fatptDbM4CIRgQSEQIABgUCPyfefgAKCRCfzyzNPz5kJqT2AJ9qA0P5h9X1TZ2t
+ckVTEt1NRX9ydQCeOsbIvSvlfxdI72Bbpb6Uj8k1uwaIRgQTEQIABgUCPygYAgAK
+CRAEMjbrEHMZdzbaAJ9TNJBBoYV7cPOsEtIm4546RqsOgwCePRaDLbRQ+zojgFYE
+0l7c5G2kacOIjQQTEQIATQUCPyjtT0YaaHR0cDovL3d3dy50cmFzaC5uZXQvfnRo
+b21hc2IvY3J5cHRvL2tleXNpZ25pbmcva2V5c2lnbmluZy52ZXIxLjAudHh0AAoJ
+EKR5zcRatGBq87MAn0fdtv+HO8PkzE0jwcJTFq2mBMVAAKC/cq4wlxqxRnnHq0QB
+vHPbR1ZKv4kBYwQTAQIATQUCPyjtWUYaaHR0cDovL3d3dy50cmFzaC5uZXQvfnRo
+b21hc2IvY3J5cHRvL2tleXNpZ25pbmcva2V5c2lnbmluZy52ZXIxLjAudHh0AAoJ
+EPl8+eM6S39dX/sH/3xKPJriQO+GAhgL206tg3CC0HD7szn4zstqcokgLuIDhnBU
+dnEHq8RH5Cm9y31wfSJBhs3dhJD6cLEBKxZmO05T2eklYeGyhRzL2MH7PAj5oIHx
+Xds7ue9k1OJbBlEugj0SQaO3twWv8DM68ynpSV89r7vYQXDIB+rDJBSUy38f2Sf6
+QEf31nThMgOo3zxg0HTnFqTZxF/Zxl+qXb29g/LIVo9Ro95AI62DDLbeBbo3ofX6
+pb9+iLLBO7gEp+jzLYWITpbS3yG3N+3kxJUSxHFkTVVnKUWdkkF2ba5VcdWOU8h0
+qCjds6Bd6AL9r1d9+OTAGNJo1/hKJmHB5i71HAmIjQQTEQIATQUCPyjtZEYaaHR0
+cDovL3d3dy50cmFzaC5uZXQvfnRob21hc2IvY3J5cHRvL2tleXNpZ25pbmcva2V5
+c2lnbmluZy52ZXIxLjAudHh0AAoJEHkFdo91hPXYWbwAn0wIO2rpKpKPbfLlYPLR
+qogcYL7MAJ43Jo7qeNvX7+R1Y2egJKUMtJv/GIhGBBMRAgAGBQI/KO1zAAoJEPnQ
+FPA4yYWN1J0An2MMMdigRu72LLgPs9y+N/OcBo53AKDR4YObuiiSusq05/0/IpRP
+SpyFUohGBBMRAgAGBQI/KO1+AAoJEF0Pf0ng5J80GzgAoOw2yq4lnPopbXJT7NbT
+SzYUdQhpAKD5nJtD1PBQfMEWX7+E9Q2eeq5LMIicBBMBAgAGBQI/KO2JAAoJEBuw
+i78qkjIl634EAI1vXWW3JV4mRLWURiatAXE6ELl1t6zkcacP+VfsSpABqKw+/6Ga
+rnpnS4/9Eg4RC9F1uHcx3HrZiWoJMdrmJX89QHuCF7t4d7DJk9HOSlL3LkGCe9m+
+Z1rflATrtr1MykMly8P2w8GeEsegeP/qpXA5M0IT5R5Ydq8/bcDayvBXiEYEExEC
+AAYFAj8tVsEACgkQLJg+WtKKVdaquQCg1IXH52P/zc3SAg2BS9fwUrFfT6sAoLLv
+pZMGtQr4Ls1ENx1vLn2/5tYSiEYEEhECAAYFAj8ueAkACgkQEgljnRFKqFzSIACg
+4Czty3NmmCDd7ZytqaDYpnluyZQAoNXXygq5k5mFRSrYBNbKLQ2pTmcpiEYEExEC
+AAYFAj8tjjgACgkQTvSphPLKucgE6gCgh9l3Htk/cN9inNeozu2BxwCVnTcAn34l
+GxnITs3t11dr5fgeWntxWojQiEYEExECAAYFAj8zVvQACgkQyg4WnCj6OIrOcwCf
+WFi3qRdARzOjOzHc7e3wkE2Y1HIAn0sI6DnpFArA2q0B4+QATJtwNWNYiEYEEhEC
+AAYFAj8fL+EACgkQ2tp5zXiKP0wi6gCfZqoOI9vrerzDqwaHpusmhWZNHf4AoLxr
+H4N+VDTFpyf2fcF6kOjTdOI8iEYEExECAAYFAj85JnEACgkQRcAhR2mr3VTtWgCf
+RkvdJ+JLLABz0Rf8jUElesJAKg4An0T9vtCGack3TYp20xrkVjB1Y5E5iI4EExEC
+AE4FAj8fB3FHGmh0dHA6Ly93d3cubWF0aGVtYXRpay51bmktYmllbGVmZWxkLmRl
+L35tbXV0ei9zaWduLXBvbGljeS0yMDAzLTA3Lmh0bWwACgkQ3oWD+L2/6Dit8ACf
+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
+RQAKCRC7VaR/yQHDPgwwAKDDo5Oczmfsy/K+rNhp0EdN8tTpYQCgyJyfezJ3lACl
+gkZe3KJSjcWvsI6IRgQTEQIABgUCPxZZiQAKCRDnyduv41bvwB61AJ9WP2XS6gBZ
+e8fgWb0oSNupfrL1TwCgvDsfeZ8+228+PuOBa9EmPqn4Z8yIRgQSEQIABgUCPxcI
+VgAKCRB3+BUzuw7ox3SyAJ9lEoZio+Jqvu7yDsMy0v2W9H8BrwCaAu226tR8QQgp
+efrzX7CFlqUp2oCIRgQTEQIABgUCPxZaFQAKCRD0tLDMeX6/q79tAJ95QA3Y7Vha
+p/yq3/sU6rGdWv1gHACdGOlr2jlePeNjyM8XP7m/aTyTA3aIRgQQEQIABgUCPxe0
+rgAKCRBGzFxj8xilarPqAJ9CVDPJRDwCTEzyxU/aXPUcD2IIQgCfUwWviRTpr4Sl
+hYQSLPInA8XRL3mIRgQTEQIABgUCPxfUbwAKCRBTtrgdwTzuBxZAAKChuDlCWIgR
+y0RLB43upNulVEMhPgCgy3nvJsoNNdGtApgalnD3PCtADC6JAQEEExECAMEFAj8W
+hgyGFIAAAAAAGgBjc2lnbmF0dXJlLW5vdGVzQHBlbmd1aW4uZGUiaHR0cDovL3d3
+dy5wZW5ndWluLmRlL35iYi9jb250YWN0L3BncC9zaWduaW5ncy9ub3Rlcy5FQTcx
+QjI5NjQ1OTc0RDhCMzQzRTgyMUU5NjI0ODNFMTU2NjJDNzM0LmFzYyIzGmh0dHA6
+Ly93d3cucGVuZ3Vpbi5kZS9+YmIvY29udGFjdC9wZ3AvcG9saWN5L3YxLjEvAAoJ
+EKseS2BGdWsetVoAoKC8/BexDahmSBm6ByFHjdnUNnqjAKCnraKOQoRD9mHRkhYL
+hs6Kb6B/e4kB1wQTAQIAwQUCPxaF+YYUgAAAAAAaAGNzaWduYXR1cmUtbm90ZXNA
+cGVuZ3Vpbi5kZSJodHRwOi8vd3d3LnBlbmd1aW4uZGUvfmJiL2NvbnRhY3QvcGdw
+L3NpZ25pbmdzL25vdGVzLkVBNzFCMjk2NDU5NzREOEIzNDNFODIxRTk2MjQ4M0Ux
+NTY2MkM3MzQuYXNjIjMaaHR0cDovL3d3dy5wZW5ndWluLmRlL35iYi9jb250YWN0
+L3BncC9wb2xpY3kvdjEuMS8ACgkQGaJoCYg4/ZQoyQgAp7zbUXdSJjC99c1U2Tf8
+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
+nl2OKb0xyan4c34SAiXW7tkAnjjlXUeZ1phjKkwCOxSGpzVL2dg2iEYEExECAAYF
+Aj8nsWsACgkQ5ihPJ4ZiSrvw6wCfSqPnCQUf0RCBxTHwNeXoHZLNsgoAn0mmdV02
+e4GTUkP6hcahi8uktaz4iEYEEBECAAYFAj8n2R0ACgkQbyOLwk/aWgz6EACeP7lN
+/AdK/F47D/RLEj0iFa3hoUcAnitXQcHBCa2V7nsdLGgBu+0RFrTFiEYEEhECAAYF
+Aj8n3nwACgkQn88szT8+ZCYVUQCeI/GFVLQVfpjbILxq3QzePIvUd54An3yCiNfm
+ou1ZfGQXR9ut54CFWGZniEYEExECAAYFAj8oGAIACgkQBDI26xBzGXcQUwCeIPT4
+RnjFVbpIu9/yB90/4XxGSJ8An1Q12NxzY3nguYjjeFZwPSfhV9zliI0EExECAE0F
+Aj8o7UxGGmh0dHA6Ly93d3cudHJhc2gubmV0L350aG9tYXNiL2NyeXB0by9rZXlz
+aWduaW5nL2tleXNpZ25pbmcudmVyMS4wLnR4dAAKCRCkec3EWrRgatzEAJ9NnEz0
+qdxIzRMKnwzIl5bT7iO/RgCgjxUaa4hVcZzWdpiAONJGlAbQALKJAWMEEwECAE0F
+Aj8o7VZGGmh0dHA6Ly93d3cudHJhc2gubmV0L350aG9tYXNiL2NyeXB0by9rZXlz
+aWduaW5nL2tleXNpZ25pbmcudmVyMS4wLnR4dAAKCRD5fPnjOkt/XQzwB/wOFo/i
+eiHUOP0ZyKPlt7VBeaXIAGH0xpxZi+XJ0D5PwZmHylTIdlzJ2tlulJfU3pX1dOWm
+uIa1YZsuP+ai+u9dk1QkGgSe5XAYXxqzvmbec8Rxdg0gDEdp3okAhPp9NyKtkxI+
+HNi4EgqDPIqZ1GVhk6k2Z6dfDe+QesI4FA0XIq2d1NFbCPiVenBeE0O6uQxsIvnS
+HRm2PFOn1rWSgkznx25Ue9QLJP2utuxSd5cSJTL3x4E5eYDY2nXsorBOi7+SAiIo
+Gdoj2V4y/5kOoyqnIotEeq4IGLuIedOCrv2Vvpn5Km+VXmyJRugOygMfafuLpPan
+DBbDLjWk5ySNUaYEiI0EExECAE0FAj8o7WBGGmh0dHA6Ly93d3cudHJhc2gubmV0
+L350aG9tYXNiL2NyeXB0by9rZXlzaWduaW5nL2tleXNpZ25pbmcudmVyMS4wLnR4
+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
+=CfD6
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/test/testsources.list/sources.list.all-gpg-broken b/test/testsources.list/sources.list.all-gpg-broken
new file mode 100644
index 000000000..110f31884
--- /dev/null
+++ b/test/testsources.list/sources.list.all-gpg-broken
@@ -0,0 +1,2 @@
+deb http://people.ubuntu.com/~mvo/apt/auth-test-suit/gpg-package-broken/ /
+
diff --git a/test/testsources.list/sources.list.all-gpg-ok b/test/testsources.list/sources.list.all-gpg-ok
new file mode 100644
index 000000000..2e9a4458a
--- /dev/null
+++ b/test/testsources.list/sources.list.all-gpg-ok
@@ -0,0 +1,2 @@
+deb http://people.ubuntu.com/~mvo/apt/auth-test-suit/gpg-package-ok/ /
+
diff --git a/test/testsources.list/sources.list.all-release-broken b/test/testsources.list/sources.list.all-release-broken
new file mode 100644
index 000000000..5e138323a
--- /dev/null
+++ b/test/testsources.list/sources.list.all-release-broken
@@ -0,0 +1 @@
+deb http://people.ubuntu.com/~mvo/apt/auth-test-suit/all-release-broken/ /
diff --git a/test/testsources.list/sources.list.all-release-ok b/test/testsources.list/sources.list.all-release-ok
new file mode 100644
index 000000000..8bcceeee8
--- /dev/null
+++ b/test/testsources.list/sources.list.all-release-ok
@@ -0,0 +1 @@
+deb http://people.ubuntu.com/~mvo/apt/auth-test-suit/all-release-ok/ /
diff --git a/test/testsources.list/sources.list.md5-package-broken b/test/testsources.list/sources.list.md5-package-broken
new file mode 100644
index 000000000..3ba43181e
--- /dev/null
+++ b/test/testsources.list/sources.list.md5-package-broken
@@ -0,0 +1,2 @@
+deb http://people.ubuntu.com/~mvo/apt/auth-test-suit/md5-package-broken/ /
+
diff --git a/test/testsources.list/sources.list.md5-package-ok b/test/testsources.list/sources.list.md5-package-ok
new file mode 100644
index 000000000..9bf207780
--- /dev/null
+++ b/test/testsources.list/sources.list.md5-package-ok
@@ -0,0 +1,2 @@
+deb http://people.ubuntu.com/~mvo/apt/auth-test-suit/md5-package-ok/ /
+
diff --git a/test/testsources.list/sources.list.md5-release-broken b/test/testsources.list/sources.list.md5-release-broken
new file mode 100644
index 000000000..1c8f1dd79
--- /dev/null
+++ b/test/testsources.list/sources.list.md5-release-broken
@@ -0,0 +1 @@
+deb http://people.ubuntu.com/~mvo/apt/auth-test-suit/md5-release-broken/ /
diff --git a/test/testsources.list/sources.list.md5-release-ok b/test/testsources.list/sources.list.md5-release-ok
new file mode 100644
index 000000000..f27e04f16
--- /dev/null
+++ b/test/testsources.list/sources.list.md5-release-ok
@@ -0,0 +1 @@
+deb http://people.ubuntu.com/~mvo/apt/auth-test-suit/md5-release-ok/ /
diff --git a/test/testsources.list/sources.list.sha1-release-broken b/test/testsources.list/sources.list.sha1-release-broken
new file mode 100644
index 000000000..29a277899
--- /dev/null
+++ b/test/testsources.list/sources.list.sha1-release-broken
@@ -0,0 +1 @@
+deb http://people.ubuntu.com/~mvo/apt/auth-test-suit/sha1-release-broken/ /
diff --git a/test/testsources.list/sources.list.sha1-release-ok b/test/testsources.list/sources.list.sha1-release-ok
new file mode 100644
index 000000000..6f95d0247
--- /dev/null
+++ b/test/testsources.list/sources.list.sha1-release-ok
@@ -0,0 +1 @@
+deb http://people.ubuntu.com/~mvo/apt/auth-test-suit/sha1-release-ok/ /
diff --git a/test/testsources.list/sources.list.sha256-package-broken b/test/testsources.list/sources.list.sha256-package-broken
new file mode 100644
index 000000000..d6d284b9c
--- /dev/null
+++ b/test/testsources.list/sources.list.sha256-package-broken
@@ -0,0 +1,2 @@
+deb http://people.ubuntu.com/~mvo/apt/auth-test-suit/sha256-package-broken/ /
+
diff --git a/test/testsources.list/sources.list.sha256-package-ok b/test/testsources.list/sources.list.sha256-package-ok
new file mode 100644
index 000000000..c2d7570d1
--- /dev/null
+++ b/test/testsources.list/sources.list.sha256-package-ok
@@ -0,0 +1,2 @@
+deb http://people.ubuntu.com/~mvo/apt/auth-test-suit/sha256-package-ok/ /
+
diff --git a/test/testsources.list/sources.list.sha256-release-broken b/test/testsources.list/sources.list.sha256-release-broken
new file mode 100644
index 000000000..713a4d9c8
--- /dev/null
+++ b/test/testsources.list/sources.list.sha256-release-broken
@@ -0,0 +1 @@
+deb http://people.ubuntu.com/~mvo/apt/auth-test-suit/sha256-release-broken/ /
diff --git a/test/testsources.list/sources.list.sha256-release-ok b/test/testsources.list/sources.list.sha256-release-ok
new file mode 100644
index 000000000..93b44e366
--- /dev/null
+++ b/test/testsources.list/sources.list.sha256-release-ok
@@ -0,0 +1 @@
+deb http://people.ubuntu.com/~mvo/apt/auth-test-suit/sha256-release-ok/ /