-- cgit v1.2.3 From 2c38625920fa67d52ade11fd7d28cdb5373dc31c Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 31 Mar 2005 09:07:12 +0000 Subject: * merged the apt--main with the 2004 bwlimit tree Patches applied: * michael.vogt@canonical.com--2004/apt--bwlimit--0--base-0 tag of apt@packages.debian.org/apt--main--0--patch-47 * michael.vogt@canonical.com--2004/apt--bwlimit--0--patch-1 * fist attempt for bwlimit * michael.vogt@canonical.com--2004/apt--bwlimit--0--patch-2 * add a nanosleep, making it less cpu intensive * michael.vogt@canonical.com--2004/apt--bwlimit--0--patch-3 * use SingleInstance when DlLimit is activated * michael.vogt@canonical.com--2004/apt--bwlimit--0--patch-4 * cleanups, no code changes --- Makefile | 4 ++-- apt-pkg/acquire.cc | 4 ++++ debian/rules | 2 +- methods/http.cc | 41 +++++++++++++++++++++++++++++++++++++++-- methods/http.h | 5 +++++ 5 files changed, 51 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 72cac61b5..b35ad4a0d 100644 --- a/Makefile +++ b/Makefile @@ -17,8 +17,8 @@ all headers library clean veryclean binary program doc dirs: $(MAKE) -C cmdline $@ $(MAKE) -C ftparchive $@ $(MAKE) -C dselect $@ - $(MAKE) -C doc $@ - $(MAKE) -C po $@ +# $(MAKE) -C doc $@ +# $(MAKE) -C po $@ # Some very common aliases .PHONY: maintainer-clean dist-clean distclean pristine sanity diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc index 70dce4f54..212c8d52b 100644 --- a/apt-pkg/acquire.cc +++ b/apt-pkg/acquire.cc @@ -266,6 +266,10 @@ pkgAcquire::MethodConfig *pkgAcquire::GetConfig(string Access) if (Work.Start() == false) return 0; + /* if a method uses DownloadLimit, we switch to SingleInstance mode */ + if(_config->FindI("Acquire::"+Access+"::DlLimit",0) > 0) + Conf->SingleInstance = true; + return Conf; } /*}}}*/ diff --git a/debian/rules b/debian/rules index e3254c2d2..fdae46352 100755 --- a/debian/rules +++ b/debian/rules @@ -36,7 +36,7 @@ endif # Default rule build: -DEB_BUILD_PROG:=debuild --preserve-envvar PATH --preserve-envvar CCACHE_DIR -us -uc $(DEB_BUILD_PROG_OPTS) +DEB_BUILD_PROG:=debuild --preserve-envvar PATH --preserve-envvar CCACHE_DIR -us -uc $(DEBUILD_DPKG_BUILDPACKAGE_OPTS) APT_DEBVER=$(shell dpkg-parsechangelog |sed -n -e '/^Version:/s/^Version: //p') APT_CONFVER=$(shell sed -n -e 's/^AC_DEFINE_UNQUOTED(VERSION,"\(.*\)")/\1/p' configure.in) APT_CVSTAG=$(shell echo "$(APT_DEBVER)" | sed -e 's/^/v/' -e 's/\./_/g') diff --git a/methods/http.cc b/methods/http.cc index 81a64d7a3..27f0dafef 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -58,6 +58,12 @@ unsigned long PipelineDepth = 10; unsigned long TimeOut = 120; bool Debug = false; + +unsigned long CircleBuf::BwReadLimit=0; +unsigned long CircleBuf::BwTickReadData=0; +struct timeval CircleBuf::BwReadTick={0,0}; +const unsigned int CircleBuf::BW_HZ=10; + // CircleBuf::CircleBuf - Circular input buffer /*{{{*/ // --------------------------------------------------------------------- /* */ @@ -65,6 +71,8 @@ CircleBuf::CircleBuf(unsigned long Size) : Size(Size), Hash(0) { Buf = new unsigned char[Size]; Reset(); + + CircleBuf::BwReadLimit = _config->FindI("Acquire::http::DlLimit",0)*1024; } /*}}}*/ // CircleBuf::Reset - Reset to the default state /*{{{*/ @@ -90,16 +98,45 @@ void CircleBuf::Reset() is non-blocking.. */ bool CircleBuf::Read(int Fd) { + unsigned long BwReadMax; + while (1) { // Woops, buffer is full if (InP - OutP == Size) return true; - + + // what's left to read in this tick + BwReadMax = CircleBuf::BwReadLimit/BW_HZ; + + if(CircleBuf::BwReadLimit) { + struct timeval now; + gettimeofday(&now,0); + + unsigned long d = (now.tv_sec-CircleBuf::BwReadTick.tv_sec)*1000000 + + now.tv_usec-CircleBuf::BwReadTick.tv_usec; + if(d > 1000000/BW_HZ) { + CircleBuf::BwReadTick = now; + CircleBuf::BwTickReadData = 0; + } + + if(CircleBuf::BwTickReadData >= BwReadMax) { + usleep(1000000/BW_HZ); + return true; + } + } + // Write the buffer segment int Res; - Res = read(Fd,Buf + (InP%Size),LeftRead()); + if(CircleBuf::BwReadLimit) { + Res = read(Fd,Buf + (InP%Size), + BwReadMax > LeftRead() ? LeftRead() : BwReadMax); + } else + Res = read(Fd,Buf + (InP%Size),LeftRead()); + if(Res > 0 && BwReadLimit > 0) + CircleBuf::BwTickReadData += Res; + if (Res == 0) return false; if (Res < 0) diff --git a/methods/http.h b/methods/http.h index c5a4d0e86..541e2952c 100644 --- a/methods/http.h +++ b/methods/http.h @@ -31,6 +31,11 @@ class CircleBuf unsigned long MaxGet; struct timeval Start; + static unsigned long BwReadLimit; + static unsigned long BwTickReadData; + static struct timeval BwReadTick; + static const unsigned int BW_HZ; + unsigned long LeftRead() { unsigned long Sz = Size - (InP - OutP); -- cgit v1.2.3 -- cgit v1.2.3 -- cgit v1.2.3 From ac5b205a831168ee76e8760e19eb7d43aa361851 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 15 Apr 2005 11:27:58 +0000 Subject: * first rewrite of the apt pdiff support patch finished --- Makefile | 4 +- apt-pkg/acquire-item.cc | 248 +++++++++++++++++++++++++++++++++++++++++++++++- apt-pkg/acquire-item.h | 37 +++++++- po/apt-all.pot | 58 +++++------ 4 files changed, 311 insertions(+), 36 deletions(-) diff --git a/Makefile b/Makefile index b35ad4a0d..72cac61b5 100644 --- a/Makefile +++ b/Makefile @@ -17,8 +17,8 @@ all headers library clean veryclean binary program doc dirs: $(MAKE) -C cmdline $@ $(MAKE) -C ftparchive $@ $(MAKE) -C dselect $@ -# $(MAKE) -C doc $@ -# $(MAKE) -C po $@ + $(MAKE) -C doc $@ + $(MAKE) -C po $@ # Some very common aliases .PHONY: maintainer-clean dist-clean distclean pristine sanity diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 714edd8d8..8c519e3f7 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -24,6 +24,8 @@ #include #include #include +#include +#include #include @@ -31,6 +33,7 @@ #include #include #include +#include #include /*}}}*/ @@ -131,14 +134,251 @@ void pkgAcquire::Item::Rename(string From,string To) } /*}}}*/ +// AcqIndexDiffs::AcqIndexDiffs - Constructor +// --------------------------------------------------------------------- +/* The package diff is added to the queue. one object is constructed + * for each diff and the index + */ +pkgAcqIndexDiffs::pkgAcqIndexDiffs(pkgAcquire *Owner, + string URI,string URIDesc,string ShortDesc, + string ExpectedMD5, vector diffs) + : Item(Owner), RealURI(URI), ExpectedMD5(ExpectedMD5), needed_files(diffs) +{ + + DestFile = _config->FindDir("Dir::State::lists") + "partial/"; + DestFile += URItoFileName(URI); + + Debug = _config->FindB("Debug::pkgAcquire::Diffs",false); + + Desc.Description = URIDesc; + Desc.Owner = this; + Desc.ShortDesc = ShortDesc; + + CurrentPackagesFile = _config->FindDir("Dir::State::lists"); + CurrentPackagesFile += URItoFileName(RealURI); + + if(Debug) { + std::clog << "pkgAcqIndexDiffs::pkgAcqIndexDiffs(): " + << CurrentPackagesFile << std::endl; + } + + if(!FileExists(CurrentPackagesFile) || + !_config->FindB("Acquire::Diffs",true)) { + // we don't have a pkg file or we don't want to queue + if(Debug) + std::clog << "No index file or canceld by user" << std::endl; + Failed("", NULL); + return; + } + + if(needed_files.size() == 0) + QueueDiffIndex(URI); + else + QueueNextDiff(); +} + +void pkgAcqIndexDiffs::QueueDiffIndex(string URI) +{ + Desc.URI = URI + ".diff/Index"; + Desc.Description = Description + "IndexDiff"; + DestFile = _config->FindDir("Dir::State::lists") + "partial/"; + DestFile += URItoFileName(URI) + string(".IndexDiff"); + + if(Debug) + std::clog << "QueueDiffIndex: " << Desc.URI << std::endl; + + QueueURI(Desc); +} + +void pkgAcqIndexDiffs::Failed(string Message,pkgAcquire::MethodConfig *Cnf) +{ + if(Debug) + std::clog << "Failed(): " << Desc.URI << std::endl + << "Falling back to big package file" << std::endl; + new pkgAcqIndex(Owner, RealURI, Desc.Description,Desc.ShortDesc, + ExpectedMD5); + Finish(); +} + + +// helper that cleans the item out of the fetcher queue +void pkgAcqIndexDiffs::Finish(bool allDone) +{ + // we restore the original name, this is required, otherwise + // the file will be cleaned + if(allDone) { + // this is for the "real" finish + DestFile = _config->FindDir("Dir::State::lists"); + DestFile += URItoFileName(RealURI); + Complete = true; + Dequeue(); + if(Debug) + std::clog << "\n\nallDone: " << DestFile << "\n" << std::endl; + return; + + } + + if(Debug) + std::clog << "Finishing: " << Desc.URI << std::endl; + Complete = false; + Status = StatDone; + Dequeue(); + return; +} + + +// this needs to be rewriten to not depend on the external ed +bool pkgAcqIndexDiffs::ApplyDiff(string PatchFile) +{ + char *error; + int res=0; + + string FinalFile = _config->FindDir("Dir::State::lists"); + FinalFile += URItoFileName(RealURI); + + int Process = ExecFork(); + if (Process == 0) + { + chdir(_config->FindDir("Dir::State::lists").c_str()); + string cmd = "(zcat " + PatchFile + "; echo \"wq\" ) | ed " + FinalFile + " >/dev/null 2>/dev/null"; + if(Debug) + std::clog << "Runing: " << cmd << std::endl; + res = system(cmd.c_str()); + _exit(WEXITSTATUS(res)); + } + if(!ExecWait(Process, error, true)) { + //_error->Error("Patch failed: %s ", error); + return false; + } + + return true; +} + +bool pkgAcqIndexDiffs::QueueNextDiff() +{ + // queue diff + Desc.URI = string(RealURI) + string(".diff/") + needed_files[0] + string(".gz"); + Desc.Description = Description + string("-diff"); + + DestFile = _config->FindDir("Dir::State::lists") + "partial/"; + DestFile += URItoFileName(RealURI + string(".diff/") + needed_files[0]); + + if(Debug) + std::clog << "pkgAcqIndexDiffs::QueueNextDiff(): " << Desc.URI << std::endl; + + QueueURI(Desc); + + return true; +} + +bool pkgAcqIndexDiffs::ParseIndexDiff(string IndexDiffFile) +{ + if(Debug) + std::clog << "pkgAcqIndexDiffs::ParseIndexDiff() " << IndexDiffFile + << std::endl; + + FileFd Fd(IndexDiffFile,FileFd::ReadOnly); + pkgTagFile TF(&Fd); + if (_error->PendingError() == true) + return false; + pkgTagSection Tags; + if(TF.Step(Tags) == true) + { + string local_sha1; + string tmp = Tags.FindS("SHA1-Current"); + std::stringstream ss(tmp); + ss >> ServerSha1; + + FileFd fd(CurrentPackagesFile, FileFd::ReadOnly); + SHA1Summation SHA1; + SHA1.AddFD(fd.Fd(), fd.Size()); + local_sha1 = string(SHA1.Result()); + + if(local_sha1 == ServerSha1) { + if(Debug) + std::clog << "Package file is up-to-date" << std::endl; + Finish(true); + return true; + } + if(Debug) + std::clog << "SHA1-Current: " << ServerSha1 << std::endl; + + // check the historie and see what patches we need + string history = Tags.FindS("SHA1-History"); + std::stringstream hist(history); + string sha1, size, file; + bool found = false; + while(hist >> sha1 >> size >> file) { + if(sha1 == local_sha1) + found=true; + if(found) { + if(Debug) + std::clog << "Need to get diff: " << file << std::endl; + needed_files.push_back(file); + } + } + // no information how to get the patches, bail out + if(!found) { + if(Debug) + std::clog << "Can't find a patch in the index file" << std::endl; + // Failed will queue a big package file + Failed("", NULL); + } else { + // queue the diffs + new pkgAcqIndexDiffs(Owner, RealURI, Description, Desc.ShortDesc, + ExpectedMD5, needed_files); + Finish(); + return true; + } + } + + return false; +} + + +void pkgAcqIndexDiffs::Done(string Message,unsigned long Size,string Md5Hash, + pkgAcquire::MethodConfig *Cnf) +{ + if(Debug) + std::clog << "pkgAcqIndexDiffs::Done(): " << Desc.URI << std::endl; + + Item::Done(Message,Size,Md5Hash,Cnf); + + int len = Desc.URI.size(); + // sucess in downloading the index + if(Desc.URI.substr(len-strlen("Index"),len-1) == "Index") { + if(!ParseIndexDiff(DestFile)) + return Failed("", NULL); + else + return Finish(); + } + + // sucess in downloading a diff + if(Desc.URI.find(".diff") != string::npos) { + ApplyDiff(DestFile); + needed_files.erase(needed_files.begin()); + + if(needed_files.size() > 0) { + new pkgAcqIndexDiffs(Owner, RealURI, Description, Desc.ShortDesc, + ExpectedMD5, needed_files); + } else { + Finish(true); + return; + } + } + + Finish(); +} + + // AcqIndex::AcqIndex - Constructor /*{{{*/ // --------------------------------------------------------------------- /* The package file is added to the queue and a second class is 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) + string ExpectedMD5, string comprExt) + : Item(Owner), RealURI(URI), ExpectedMD5(ExpectedMD5) { Decompression = false; Erase = false; @@ -593,8 +833,8 @@ void pkgAcqMetaIndex::QueueIndexes(bool verify) } // Queue Packages file - new pkgAcqIndex(Owner, (*Target)->URI, (*Target)->Description, - (*Target)->ShortDesc, ExpectedIndexMD5); + new pkgAcqIndexDiffs(Owner, (*Target)->URI, (*Target)->Description, + (*Target)->ShortDesc, ExpectedIndexMD5); } } diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h index ea71153d5..f56fd0465 100644 --- a/apt-pkg/acquire-item.h +++ b/apt-pkg/acquire-item.h @@ -82,6 +82,41 @@ class pkgAcquire::Item virtual ~Item(); }; +// item for index diffs +class pkgAcqIndexDiffs : public pkgAcquire::Item +{ + protected: + bool Debug; + pkgAcquire::ItemDesc Desc; + string RealURI; + string ExpectedMD5; + // this is the SHA-1 sum we expect after the patching + string ServerSha1; + string CurrentPackagesFile; + string Description; + vector needed_files; + + public: + + // Specialized action members + virtual void Failed(string Message,pkgAcquire::MethodConfig *Cnf); + virtual void Done(string Message,unsigned long Size,string Md5Hash, + pkgAcquire::MethodConfig *Cnf); + virtual string DescURI() {return RealURI + "Index";}; + + + // various helpers + bool ParseIndexDiff(string IndexDiffFile); + void QueueDiffIndex(string URI); + bool QueueNextDiff(); + bool ApplyDiff(string PatchFile); + void Finish(bool allDone=false); + + pkgAcqIndexDiffs(pkgAcquire *Owner,string URI,string URIDesc, + string ShortDesct, string ExpectedMD5, + vector diffs=vector()); +}; + // Item class for index files class pkgAcqIndex : public pkgAcquire::Item { @@ -92,7 +127,7 @@ class pkgAcqIndex : public pkgAcquire::Item pkgAcquire::ItemDesc Desc; string RealURI; string ExpectedMD5; - + public: // Specialized action members diff --git a/po/apt-all.pot b/po/apt-all.pot index bc687c55f..1715e5a4e 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: 2005-03-06 12:50+0100\n" +"POT-Creation-Date: 2005-04-15 11:37+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -303,7 +303,7 @@ msgid "" " --no-delink Enable delinking debug mode\n" " --contents Control contents file generation\n" " -c=? Read this configuration file\n" -" -o=? Set an arbitary configuration option" +" -o=? Set an arbitrary configuration option" msgstr "" #: ftparchive/apt-ftparchive.cc:757 @@ -1271,7 +1271,7 @@ msgid "File %s/%s overwrites the one in the package %s" msgstr "" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38 +#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:420 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "" @@ -1561,7 +1561,7 @@ msgstr "" msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:864 methods/http.cc:916 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:953 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" @@ -1655,76 +1655,76 @@ msgstr "" msgid "Read error from %s process" msgstr "" -#: methods/http.cc:344 +#: methods/http.cc:381 msgid "Waiting for headers" msgstr "" -#: methods/http.cc:490 +#: methods/http.cc:527 #, c-format msgid "Got a single header line over %u chars" msgstr "" -#: methods/http.cc:498 +#: methods/http.cc:535 msgid "Bad header line" msgstr "" -#: methods/http.cc:517 methods/http.cc:524 +#: methods/http.cc:554 methods/http.cc:561 msgid "The HTTP server sent an invalid reply header" msgstr "" -#: methods/http.cc:553 +#: methods/http.cc:590 msgid "The HTTP server sent an invalid Content-Length header" msgstr "" -#: methods/http.cc:568 +#: methods/http.cc:605 msgid "The HTTP server sent an invalid Content-Range header" msgstr "" -#: methods/http.cc:570 +#: methods/http.cc:607 msgid "This HTTP server has broken range support" msgstr "" -#: methods/http.cc:594 +#: methods/http.cc:631 msgid "Unknown date format" msgstr "" -#: methods/http.cc:737 +#: methods/http.cc:774 msgid "Select failed" msgstr "" -#: methods/http.cc:742 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "" -#: methods/http.cc:765 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "" -#: methods/http.cc:793 +#: methods/http.cc:830 msgid "Error writing to file" msgstr "" -#: methods/http.cc:818 +#: methods/http.cc:855 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:832 +#: methods/http.cc:869 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:834 +#: methods/http.cc:871 msgid "Error reading from server" msgstr "" -#: methods/http.cc:1065 +#: methods/http.cc:1102 msgid "Bad header data" msgstr "" -#: methods/http.cc:1082 +#: methods/http.cc:1119 msgid "Connection failed" msgstr "" -#: methods/http.cc:1173 +#: methods/http.cc:1210 msgid "Internal error" msgstr "" @@ -1862,7 +1862,7 @@ msgstr "" msgid "Unable to stat the mount point %s" msgstr "" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:422 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:426 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "" @@ -2246,36 +2246,36 @@ msgstr "" msgid "IO Error saving source cache" msgstr "" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:129 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "" -#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:894 +#: apt-pkg/acquire-item.cc:475 apt-pkg/acquire-item.cc:1134 msgid "MD5Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:708 +#: apt-pkg/acquire-item.cc:948 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -#: apt-pkg/acquire-item.cc:761 +#: apt-pkg/acquire-item.cc:1001 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" -#: apt-pkg/acquire-item.cc:797 +#: apt-pkg/acquire-item.cc:1037 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:1124 msgid "Size mismatch" msgstr "" -- cgit v1.2.3 From 6cb30d01f8e247e85966ba8ad657453d73598527 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Sat, 7 May 2005 15:39:12 +0000 Subject: * use "red" now, print meaningfull pdiff names, use IMS for the IndexDiff --- apt-pkg/acquire-item.cc | 60 ++++++++++++++++++++++++++++++++++++++++--------- apt-pkg/acquire-item.h | 12 +++++++--- po/apt-all.pot | 12 +++++----- 3 files changed, 64 insertions(+), 20 deletions(-) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 8c519e3f7..5d741af6f 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -141,7 +141,7 @@ void pkgAcquire::Item::Rename(string From,string To) */ pkgAcqIndexDiffs::pkgAcqIndexDiffs(pkgAcquire *Owner, string URI,string URIDesc,string ShortDesc, - string ExpectedMD5, vector diffs) + string ExpectedMD5, vector diffs) : Item(Owner), RealURI(URI), ExpectedMD5(ExpectedMD5), needed_files(diffs) { @@ -190,6 +190,27 @@ void pkgAcqIndexDiffs::QueueDiffIndex(string URI) QueueURI(Desc); } +// AcqIndex::Custom600Headers - Insert custom request headers /*{{{*/ +// --------------------------------------------------------------------- +/* The only header we use is the last-modified header. */ +string pkgAcqIndexDiffs::Custom600Headers() +{ + if(DestFile.rfind(".IndexDiff") == string::npos) + return string(""); + + string Final = _config->FindDir("Dir::State::lists"); + Final += URItoFileName(RealURI) + string(".IndexDiff"); + + if(Debug) + std::clog << "Custom600Header-IMS: " << Final << std::endl; + + struct stat Buf; + if (stat(Final.c_str(),&Buf) != 0) + return "\nIndex-File: true"; + + return "\nIndex-File: true\nLast-Modified: " + TimeRFC1123(Buf.st_mtime); +} + void pkgAcqIndexDiffs::Failed(string Message,pkgAcquire::MethodConfig *Cnf) { if(Debug) @@ -240,7 +261,7 @@ bool pkgAcqIndexDiffs::ApplyDiff(string PatchFile) if (Process == 0) { chdir(_config->FindDir("Dir::State::lists").c_str()); - string cmd = "(zcat " + PatchFile + "; echo \"wq\" ) | ed " + FinalFile + " >/dev/null 2>/dev/null"; + string cmd = "(zcat " + PatchFile + "; echo \"wq\" ) | red " + FinalFile + " >/dev/null 2>/dev/null"; if(Debug) std::clog << "Runing: " << cmd << std::endl; res = system(cmd.c_str()); @@ -256,12 +277,16 @@ bool pkgAcqIndexDiffs::ApplyDiff(string PatchFile) bool pkgAcqIndexDiffs::QueueNextDiff() { + // FIXME: don't use the needed_files[0] but check sha1 and search + // for the right patch in needed_files + // -> and rename needed_files to "available_patches" + // queue diff - Desc.URI = string(RealURI) + string(".diff/") + needed_files[0] + string(".gz"); - Desc.Description = Description + string("-diff"); + Desc.URI = string(RealURI) + string(".diff/") + needed_files[0].file + string(".gz"); + Desc.Description = needed_files[0].file + string(".pdiff"); DestFile = _config->FindDir("Dir::State::lists") + "partial/"; - DestFile += URItoFileName(RealURI + string(".diff/") + needed_files[0]); + DestFile += URItoFileName(RealURI + string(".diff/") + needed_files[0].file); if(Debug) std::clog << "pkgAcqIndexDiffs::QueueNextDiff(): " << Desc.URI << std::endl; @@ -306,15 +331,17 @@ bool pkgAcqIndexDiffs::ParseIndexDiff(string IndexDiffFile) // check the historie and see what patches we need string history = Tags.FindS("SHA1-History"); std::stringstream hist(history); - string sha1, size, file; + DiffInfo d; + string size; bool found = false; - while(hist >> sha1 >> size >> file) { - if(sha1 == local_sha1) + while(hist >> d.sha1 >> size >> d.file) { + d.size = atoi(size.c_str()); + if(d.sha1 == local_sha1) found=true; if(found) { if(Debug) - std::clog << "Need to get diff: " << file << std::endl; - needed_files.push_back(file); + std::clog << "Need to get diff: " << d.file << std::endl; + needed_files.push_back(d); } } // no information how to get the patches, bail out @@ -347,9 +374,20 @@ void pkgAcqIndexDiffs::Done(string Message,unsigned long Size,string Md5Hash, int len = Desc.URI.size(); // sucess in downloading the index if(Desc.URI.substr(len-strlen("Index"),len-1) == "Index") { + + // rename + string FinalFile = _config->FindDir("Dir::State::lists"); + FinalFile += URItoFileName(RealURI) + string(".IndexDiff"); + if(Debug) + std::clog << "Renaming: " << DestFile << " -> " << FinalFile + << std::endl; + Rename(DestFile,FinalFile); + chmod(FinalFile.c_str(),0644); + DestFile = FinalFile; + if(!ParseIndexDiff(DestFile)) return Failed("", NULL); - else + else return Finish(); } diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h index f56fd0465..6c78f33ef 100644 --- a/apt-pkg/acquire-item.h +++ b/apt-pkg/acquire-item.h @@ -94,8 +94,14 @@ class pkgAcqIndexDiffs : public pkgAcquire::Item string ServerSha1; string CurrentPackagesFile; string Description; - vector needed_files; + struct DiffInfo { + string file; + string sha1; + unsigned long size; + }; + vector needed_files; + public: // Specialized action members @@ -103,7 +109,7 @@ class pkgAcqIndexDiffs : public pkgAcquire::Item virtual void Done(string Message,unsigned long Size,string Md5Hash, pkgAcquire::MethodConfig *Cnf); virtual string DescURI() {return RealURI + "Index";}; - + virtual string Custom600Headers(); // various helpers bool ParseIndexDiff(string IndexDiffFile); @@ -114,7 +120,7 @@ class pkgAcqIndexDiffs : public pkgAcquire::Item pkgAcqIndexDiffs(pkgAcquire *Owner,string URI,string URIDesc, string ShortDesct, string ExpectedMD5, - vector diffs=vector()); + vector diffs=vector()); }; // Item class for index files diff --git a/po/apt-all.pot b/po/apt-all.pot index 1715e5a4e..7c3774ed6 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: 2005-04-15 11:37+0200\n" +"POT-Creation-Date: 2005-05-07 16:22+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2251,31 +2251,31 @@ msgstr "" msgid "rename failed, %s (%s -> %s)." msgstr "" -#: apt-pkg/acquire-item.cc:475 apt-pkg/acquire-item.cc:1134 +#: apt-pkg/acquire-item.cc:502 apt-pkg/acquire-item.cc:1161 msgid "MD5Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:948 +#: apt-pkg/acquire-item.cc:975 #, 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:1001 +#: apt-pkg/acquire-item.cc:1028 #, 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:1037 +#: apt-pkg/acquire-item.cc:1064 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:1124 +#: apt-pkg/acquire-item.cc:1151 msgid "Size mismatch" msgstr "" -- cgit v1.2.3 From 26d276459901fea7209203ec84403bb7934fb869 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 9 May 2005 07:59:17 +0000 Subject: * fix a bug QueueNextDiff --- apt-pkg/acquire-item.cc | 12 ++++++------ po/apt-all.pot | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 81636902e..fff55f7b5 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -287,13 +287,13 @@ bool pkgAcqIndexDiffs::QueueNextDiff() SHA1.AddFD(fd.Fd(), fd.Size()); string local_sha1 = string(SHA1.Result()); - // see if we have a patch for it, the patch list must be ordered + // remove all patches until the next matching patch is found + // this requires the Index file to be ordered for(vector::iterator I=available_patches.begin(); - I != available_patches.end(); I++) { - // if the patch does not fit, it's not interessting - if((*I).sha1 != local_sha1) - available_patches.erase(I); - } + (*I).sha1 == local_sha1 || I != available_patches.end(); + I++) + available_patches.erase(I); + // error checking and falling back if no patch was found if(available_patches.size() == 0) { diff --git a/po/apt-all.pot b/po/apt-all.pot index 7c3774ed6..496c96f95 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -2251,31 +2251,31 @@ msgstr "" msgid "rename failed, %s (%s -> %s)." msgstr "" -#: apt-pkg/acquire-item.cc:502 apt-pkg/acquire-item.cc:1161 +#: apt-pkg/acquire-item.cc:532 apt-pkg/acquire-item.cc:1197 msgid "MD5Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:975 +#: apt-pkg/acquire-item.cc:1011 #, 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:1028 +#: apt-pkg/acquire-item.cc:1064 #, 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:1064 +#: apt-pkg/acquire-item.cc:1100 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:1151 +#: apt-pkg/acquire-item.cc:1187 msgid "Size mismatch" msgstr "" -- cgit v1.2.3 From 77a7df0e00b10252abb2fe52a083d53d5878ab11 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 9 May 2005 09:09:12 +0000 Subject: * another bug in QueueNextDiff fixed --- apt-pkg/acquire-item.cc | 6 ++++-- po/apt-all.pot | 10 +++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index fff55f7b5..79e0b1898 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -290,10 +290,9 @@ bool pkgAcqIndexDiffs::QueueNextDiff() // remove all patches until the next matching patch is found // this requires the Index file to be ordered for(vector::iterator I=available_patches.begin(); - (*I).sha1 == local_sha1 || I != available_patches.end(); + I != available_patches.end() && (*I).sha1 != local_sha1; I++) available_patches.erase(I); - // error checking and falling back if no patch was found if(available_patches.size() == 0) { @@ -356,14 +355,17 @@ bool pkgAcqIndexDiffs::ParseIndexDiff(string IndexDiffFile) bool found = false; while(hist >> d.sha1 >> size >> d.file) { d.size = atoi(size.c_str()); + // read until the first match is found if(d.sha1 == local_sha1) found=true; + // from that point on, we probably need all diffs if(found) { if(Debug) std::clog << "Need to get diff: " << d.file << std::endl; available_patches.push_back(d); } } + // no information how to get the patches, bail out if(!found) { if(Debug) diff --git a/po/apt-all.pot b/po/apt-all.pot index 496c96f95..ad94b8a39 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -2251,31 +2251,31 @@ msgstr "" msgid "rename failed, %s (%s -> %s)." msgstr "" -#: apt-pkg/acquire-item.cc:532 apt-pkg/acquire-item.cc:1197 +#: apt-pkg/acquire-item.cc:537 apt-pkg/acquire-item.cc:1202 msgid "MD5Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:1011 +#: apt-pkg/acquire-item.cc:1016 #, 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:1064 +#: apt-pkg/acquire-item.cc:1069 #, 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:1100 +#: apt-pkg/acquire-item.cc:1105 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:1187 +#: apt-pkg/acquire-item.cc:1192 msgid "Size mismatch" msgstr "" -- cgit v1.2.3 From 3573e286ba001ef30f4871f3ed2e17ea905d6404 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 8 Jun 2005 15:58:38 +0000 Subject: * merged with apt--main and apt--fixes Patches applied: * apt@packages.debian.org/apt--main--0--patch-80 Merge michael.vogt@ubuntu.com--2005/apt--fixes--0 * apt@packages.debian.org/apt--main--0--patch-81 Open 0.6.37 * apt@packages.debian.org/apt--main--0--patch-82 merge bubulle@debian.org--2005/apt--main--0 * apt@packages.debian.org/apt--main--0--patch-83 Update changelog * apt@packages.debian.org/apt--main--0--patch-84 Fix build of French man pages (now using XML, not SGML) * apt@packages.debian.org/apt--main--0--patch-85 Merge patch from Philippe Batailler for French man page build * apt@packages.debian.org/apt--main--0--patch-86 add Welsh translations from Dafydd Harries * apt@packages.debian.org/apt--main--0--patch-87 Update changelog * apt@packages.debian.org/apt--misc-abi-changes--0--patch-4 Merge from mainline * apt@packages.debian.org/apt--misc-abi-changes--0--patch-5 Merge from mainline * apt@packages.debian.org/apt--misc-abi-changes--0--patch-6 Collapse both pkgAcquire::Run() methods into one, with a default value * bubulle@debian.org--2005/apt--main--0--patch-66 Italian translation complete * bubulle@debian.org--2005/apt--main--0--patch-67 Sync with Matt * bubulle@debian.org--2005/apt--main--0--patch-68 Sync with Matt * bubulle@debian.org--2005/apt--main--0--patch-69 Sync with Matt * bubulle@debian.org--2005/apt--main--0--patch-70 Re-generate the POT and PO files from sources * bubulle@debian.org--2005/apt--main--0--patch-71 Update French translation * bubulle@debian.org--2005/apt--main--0--patch-72 Merge with Matt * bubulle@debian.org--2005/apt--main--0--patch-73 Basque translation update * bubulle@debian.org--2005/apt--main--0--patch-74 Hebres translation update * bubulle@debian.org--2005/apt--main--0--patch-75 Merge with Matt * bubulle@debian.org--2005/apt--main--0--patch-76 Correct the Hebrew translation for #306658 * bubulle@debian.org--2005/apt--main--0--patch-77 Update French man pages translations * bubulle@debian.org--2005/apt--main--0--patch-78 Merge with Matt * bubulle@debian.org--2005/apt--main--0--patch-79 Correct syntax errors in Hebrew translation * bubulle@debian.org--2005/apt--main--0--patch-80 Revert changes to debian/changelog and debian/apt.cron.daily * bubulle@debian.org--2005/apt--main--0--patch-81 Portuguese translation update * daf@muse.19inch.net--2005/apt--main--0--base-0 tag of apt@packages.debian.org/apt--main--0--patch-85 * daf@muse.19inch.net--2005/apt--main--0--patch-1 add Welsh translation * michael.vogt@ubuntu.com--2005/apt--fixes--0--base-0 tag of apt@packages.debian.org/apt--main--0--patch-79 * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-1 * merged obvious fixes into the tree to make it easy for matt to merge * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-2 * more merges from otavio that looks good/uncritical * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-3 * merged Matts misc-abi-changes tree * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-4 * finalized the changelog for a ubuntu build * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-5 * merged with apt--main--0 * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-6 * build fix for apt--main--0 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-26 * fix the cache-control header generation * otavio@debian.org--2005/apt--fixes--0--base-0 tag of apt@packages.debian.org/apt--main--0--patch-71 * otavio@debian.org--2005/apt--fixes--0--patch-1 Fix comments about the need of xmlto * otavio@debian.org--2005/apt--fixes--0--patch-2 Fix a compile warning * otavio@debian.org--2005/apt--fixes--0--patch-3 Sync with apt--main--0--patch-76 * otavio@debian.org--2005/apt--fixes--0--patch-4 Sync with apt--main--0--patch-78 * otavio@debian.org--2005/apt--fixes--0--patch-5 Add fixes that was wrongly included on DDTP changes. * otavio@debian.org--2005/apt--fixes--0--patch-8 Add information about the other fixes include on this branch now. * otavio@debian.org--2005/apt--fixes--0--patch-9 Merge last changes from apt--main--0. * otavio@debian.org--2005/apt--fixes--0--patch-10 Fix warnings about min/max change in gcc-4.0 * otavio@debian.org--2005/apt--fixes--0--patch-11 Fix remaning warnings while compiling gcc-4.0 * otavio@debian.org--2005/apt--fixes--0--patch-12 Add changelog entry about the fixes for warnings while compiling using GCC 4.0 compiler. * philippe.batailler@free.fr--2005/apt--mainBubulle--0.1--patch-1 Passage sous arch * philippe.batailler@free.fr--2005/apt--mainMatt--0--patch-1 fix xml error --- apt-inst/contrib/extracttar.cc | 2 +- apt-inst/contrib/extracttar.h | 4 + apt-inst/deb/dpkgdb.cc | 4 +- apt-inst/dirstream.cc | 6 +- apt-pkg/acquire.h | 3 +- apt-pkg/clean.h | 1 + apt-pkg/contrib/hashes.cc | 4 +- apt-pkg/contrib/hashes.h | 4 + apt-pkg/contrib/md5.cc | 4 +- apt-pkg/contrib/md5.h | 2 + apt-pkg/contrib/sha1.cc | 2 +- apt-pkg/contrib/sha1.h | 2 + apt-pkg/indexcopy.h | 1 + apt-pkg/indexfile.h | 1 + apt-pkg/pkgcachegen.cc | 18 +- buildlib/xml_manpage.mak | 2 +- cmdline/apt-get.cc | 13 +- configure.in | 2 +- debian/changelog | 34 +- doc/fr/apt-cache.fr.8.sgml | 428 ------ doc/fr/apt-cache.fr.8.xml | 474 +++++++ doc/fr/apt-cdrom.fr.8.sgml | 150 -- doc/fr/apt-cdrom.fr.8.xml | 159 +++ doc/fr/apt-config.fr.8.sgml | 113 -- doc/fr/apt-config.fr.8.xml | 116 ++ doc/fr/apt-extracttemplates.fr.1.sgml | 83 -- doc/fr/apt-extracttemplates.fr.1.xml | 88 ++ doc/fr/apt-ftparchive.fr.1.sgml | 552 -------- doc/fr/apt-ftparchive.fr.1.xml | 631 +++++++++ doc/fr/apt-get.fr.8.sgml | 517 ------- doc/fr/apt-get.fr.8.xml | 576 ++++++++ doc/fr/apt-key.fr.8.xml | 88 ++ doc/fr/apt-sortpkgs.fr.1.sgml | 75 - doc/fr/apt-sortpkgs.fr.1.xml | 84 ++ doc/fr/apt.conf.fr.5.sgml | 451 ------ doc/fr/apt.conf.fr.5.xml | 517 +++++++ doc/fr/apt.ent.fr | 238 ++-- doc/fr/apt_preferences.fr.5.sgml | 559 -------- doc/fr/apt_preferences.fr.5.xml | 581 ++++++++ doc/fr/makefile | 46 +- doc/fr/sources.list.fr.5.sgml | 207 --- doc/fr/sources.list.fr.5.xml | 249 ++++ doc/fr/vendors.list.fr.5.sgml | 104 -- ftparchive/cachedb.h | 2 +- methods/ftp.cc | 2 +- methods/http.cc | 10 +- po/bs.po | 36 +- po/ca.po | 25 +- po/cs.po | 25 +- po/cy.po | 2503 +++++++++++++++++++++++++++++++++ po/da.po | 25 +- po/de.po | 25 +- po/el.po | 25 +- po/en_GB.po | 184 ++- po/es.po | 25 +- po/eu.po | 1259 ++++++++++------- po/fi.po | 25 +- po/fr.po | 91 +- po/he.po | 43 +- po/hu.po | 25 +- po/it.po | 71 +- po/ja.po | 25 +- po/ko.po | 25 +- po/nb.po | 25 +- po/nl.po | 25 +- po/nn.po | 25 +- po/pl.po | 25 +- po/pt.po | 367 ++--- po/pt_BR.po | 25 +- po/ro.po | 32 +- po/ru.po | 25 +- po/sk.po | 25 +- po/sl.po | 25 +- po/sv.po | 25 +- po/tl.po | 25 +- po/zh_CN.po | 25 +- po/zh_TW.po | 25 +- 77 files changed, 7783 insertions(+), 4562 deletions(-) delete mode 100644 doc/fr/apt-cache.fr.8.sgml create mode 100644 doc/fr/apt-cache.fr.8.xml delete mode 100644 doc/fr/apt-cdrom.fr.8.sgml create mode 100644 doc/fr/apt-cdrom.fr.8.xml delete mode 100644 doc/fr/apt-config.fr.8.sgml create mode 100644 doc/fr/apt-config.fr.8.xml delete mode 100644 doc/fr/apt-extracttemplates.fr.1.sgml create mode 100644 doc/fr/apt-extracttemplates.fr.1.xml delete mode 100644 doc/fr/apt-ftparchive.fr.1.sgml create mode 100644 doc/fr/apt-ftparchive.fr.1.xml delete mode 100644 doc/fr/apt-get.fr.8.sgml create mode 100644 doc/fr/apt-get.fr.8.xml create mode 100644 doc/fr/apt-key.fr.8.xml delete mode 100644 doc/fr/apt-sortpkgs.fr.1.sgml create mode 100644 doc/fr/apt-sortpkgs.fr.1.xml delete mode 100644 doc/fr/apt.conf.fr.5.sgml create mode 100644 doc/fr/apt.conf.fr.5.xml delete mode 100644 doc/fr/apt_preferences.fr.5.sgml create mode 100644 doc/fr/apt_preferences.fr.5.xml delete mode 100644 doc/fr/sources.list.fr.5.sgml create mode 100644 doc/fr/sources.list.fr.5.xml delete mode 100644 doc/fr/vendors.list.fr.5.sgml create mode 100644 po/cy.po diff --git a/apt-inst/contrib/extracttar.cc b/apt-inst/contrib/extracttar.cc index 2585986d7..d6da802fe 100644 --- a/apt-inst/contrib/extracttar.cc +++ b/apt-inst/contrib/extracttar.cc @@ -309,7 +309,7 @@ bool ExtractTar::Go(pkgDirStream &Stream) while (Size != 0) { unsigned char Junk[32*1024]; - unsigned long Read = MIN(Size,sizeof(Junk)); + unsigned long Read = min(Size,(unsigned long)sizeof(Junk)); if (InFd.Read(Junk,((Read+511)/512)*512) == false) return false; diff --git a/apt-inst/contrib/extracttar.h b/apt-inst/contrib/extracttar.h index ec930ca22..6daf00a27 100644 --- a/apt-inst/contrib/extracttar.h +++ b/apt-inst/contrib/extracttar.h @@ -21,6 +21,10 @@ #include #include +#include + +using std::min; + class ExtractTar { protected: diff --git a/apt-inst/deb/dpkgdb.cc b/apt-inst/deb/dpkgdb.cc index de781f44c..c6a0e80e6 100644 --- a/apt-inst/deb/dpkgdb.cc +++ b/apt-inst/deb/dpkgdb.cc @@ -67,7 +67,7 @@ static bool EraseDir(const char *Dir) if (Pid == 0) { execlp(_config->Find("Dir::Bin::rm","/bin/rm").c_str(), - "rm","-rf","--",Dir,0); + "rm","-rf","--",Dir,(char *)NULL); _exit(100); } return ExecWait(Pid,_config->Find("dir::bin::rm","/bin/rm").c_str()); @@ -380,7 +380,7 @@ bool debDpkgDB::ReadDiversions() bool debDpkgDB::ReadyFileList(OpProgress &Progress) { if (Cache == 0) - return _error->Error(_("The pkg cache must be initialize first")); + return _error->Error(_("The pkg cache must be initialized first")); if (FList != 0) { Progress.OverallProgress(1,1,1,_("Reading file list")); diff --git a/apt-inst/dirstream.cc b/apt-inst/dirstream.cc index a8a4d9c0d..7ae93c9b0 100644 --- a/apt-inst/dirstream.cc +++ b/apt-inst/dirstream.cc @@ -42,15 +42,15 @@ bool pkgDirStream::DoItem(Item &Itm,int &Fd) int iFd = open(Itm.Name,O_NDELAY|O_WRONLY|O_CREAT|O_TRUNC|O_APPEND, Itm.Mode); if (iFd < 0) - return _error->Errno("open",_("Failed write file %s"), + return _error->Errno("open",_("Failed to write file %s"), Itm.Name); // fchmod deals with umask and fchown sets the ownership if (fchmod(iFd,Itm.Mode) != 0) - return _error->Errno("fchmod",_("Failed write file %s"), + return _error->Errno("fchmod",_("Failed to write file %s"), Itm.Name); if (fchown(iFd,Itm.UID,Itm.GID) != 0 && errno != EPERM) - return _error->Errno("fchown",_("Failed write file %s"), + return _error->Errno("fchown",_("Failed to write file %s"), Itm.Name); Fd = iFd; return true; diff --git a/apt-pkg/acquire.h b/apt-pkg/acquire.h index 3e338b220..27bb3d363 100644 --- a/apt-pkg/acquire.h +++ b/apt-pkg/acquire.h @@ -100,8 +100,7 @@ class pkgAcquire enum RunResult {Continue,Failed,Cancelled}; - RunResult Run() { return Run(500000); }; // Binary compatibility - RunResult Run(int PulseIntervall); + RunResult Run(int PulseIntervall=500000); void Shutdown(); // Simple iteration mechanism diff --git a/apt-pkg/clean.h b/apt-pkg/clean.h index ee65fcb61..43164e250 100644 --- a/apt-pkg/clean.h +++ b/apt-pkg/clean.h @@ -25,6 +25,7 @@ class pkgArchiveCleaner public: bool Go(string Dir,pkgCache &Cache); + virtual ~pkgArchiveCleaner() {}; }; #endif diff --git a/apt-pkg/contrib/hashes.cc b/apt-pkg/contrib/hashes.cc index af741b672..b17b94319 100644 --- a/apt-pkg/contrib/hashes.cc +++ b/apt-pkg/contrib/hashes.cc @@ -30,8 +30,8 @@ bool Hashes::AddFD(int Fd,unsigned long Size) int Res = 0; while (Size != 0) { - Res = read(Fd,Buf,MIN(Size,sizeof(Buf))); - if (Res < 0 || (unsigned)Res != MIN(Size,sizeof(Buf))) + Res = read(Fd,Buf,min(Size,(unsigned long)sizeof(Buf))); + if (Res < 0 || (unsigned)Res != min(Size,(unsigned long)sizeof(Buf))) return false; Size -= Res; MD5.Add(Buf,Res); diff --git a/apt-pkg/contrib/hashes.h b/apt-pkg/contrib/hashes.h index 481ea88f8..40bbe00a0 100644 --- a/apt-pkg/contrib/hashes.h +++ b/apt-pkg/contrib/hashes.h @@ -20,6 +20,10 @@ #include #include +#include + +using std::min; + class Hashes { public: diff --git a/apt-pkg/contrib/md5.cc b/apt-pkg/contrib/md5.cc index 2bd745153..fded5c864 100644 --- a/apt-pkg/contrib/md5.cc +++ b/apt-pkg/contrib/md5.cc @@ -299,8 +299,8 @@ bool MD5Summation::AddFD(int Fd,unsigned long Size) int Res = 0; while (Size != 0) { - Res = read(Fd,Buf,MIN(Size,sizeof(Buf))); - if (Res < 0 || (unsigned)Res != MIN(Size,sizeof(Buf))) + Res = read(Fd,Buf,min(Size,(unsigned long)sizeof(Buf))); + if (Res < 0 || (unsigned)Res != min(Size,(unsigned long)sizeof(Buf))) return false; Size -= Res; Add(Buf,Res); diff --git a/apt-pkg/contrib/md5.h b/apt-pkg/contrib/md5.h index 47c6a7cec..9e20f7cef 100644 --- a/apt-pkg/contrib/md5.h +++ b/apt-pkg/contrib/md5.h @@ -28,8 +28,10 @@ #endif #include +#include using std::string; +using std::min; class MD5Summation; diff --git a/apt-pkg/contrib/sha1.cc b/apt-pkg/contrib/sha1.cc index 9b402c523..72eafd4ca 100644 --- a/apt-pkg/contrib/sha1.cc +++ b/apt-pkg/contrib/sha1.cc @@ -347,7 +347,7 @@ bool SHA1Summation::AddFD(int Fd,unsigned long Size) while (Size != 0 || ToEOF) { unsigned n = sizeof(Buf); - if (!ToEOF) n = MIN(Size,n); + if (!ToEOF) n = min(Size,(unsigned long)n); Res = read(Fd,Buf,n); if (Res < 0 || (!ToEOF && (unsigned) Res != n)) // error, or short read return false; diff --git a/apt-pkg/contrib/sha1.h b/apt-pkg/contrib/sha1.h index 7d25ceb0d..db8ca7893 100644 --- a/apt-pkg/contrib/sha1.h +++ b/apt-pkg/contrib/sha1.h @@ -19,8 +19,10 @@ #endif #include +#include using std::string; +using std::min; class SHA1Summation; diff --git a/apt-pkg/indexcopy.h b/apt-pkg/indexcopy.h index fa8e9c156..4dcb2b46d 100644 --- a/apt-pkg/indexcopy.h +++ b/apt-pkg/indexcopy.h @@ -43,6 +43,7 @@ class IndexCopy bool CopyPackages(string CDROM,string Name,vector &List, pkgCdromStatus *log); + virtual ~IndexCopy() {}; }; class PackageCopy : public IndexCopy diff --git a/apt-pkg/indexfile.h b/apt-pkg/indexfile.h index be02669fa..61049f4bd 100644 --- a/apt-pkg/indexfile.h +++ b/apt-pkg/indexfile.h @@ -55,6 +55,7 @@ class pkgIndexFile virtual pkgRecords::Parser *CreatePkgParser(pkgCache::PkgFileIterator /*File*/) const {return 0;}; Type(); + virtual ~Type() {}; }; virtual const Type *GetType() const = 0; diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index 075af3eec..2340f97fd 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -114,7 +114,7 @@ bool pkgCacheGenerator::MergeList(ListParser &List, pkgCache::PkgIterator Pkg; if (NewPackage(Pkg,PackageName) == false) - return _error->Error(_("Error occured while processing %s (NewPackage)"),PackageName.c_str()); + return _error->Error(_("Error occurred while processing %s (NewPackage)"),PackageName.c_str()); Counter++; if (Counter % 100 == 0 && Progress != 0) Progress->Progress(List.Offset()); @@ -126,7 +126,7 @@ bool pkgCacheGenerator::MergeList(ListParser &List, if (Version.empty() == true) { if (List.UsePackage(Pkg,pkgCache::VerIterator(Cache)) == false) - return _error->Error(_("Error occured while processing %s (UsePackage1)"), + return _error->Error(_("Error occurred while processing %s (UsePackage1)"), PackageName.c_str()); continue; } @@ -147,11 +147,11 @@ bool pkgCacheGenerator::MergeList(ListParser &List, if (Res == 0 && Ver->Hash == Hash) { if (List.UsePackage(Pkg,Ver) == false) - return _error->Error(_("Error occured while processing %s (UsePackage2)"), + return _error->Error(_("Error occurred while processing %s (UsePackage2)"), PackageName.c_str()); if (NewFileVer(Ver,List) == false) - return _error->Error(_("Error occured while processing %s (NewFileVer1)"), + return _error->Error(_("Error occurred while processing %s (NewFileVer1)"), PackageName.c_str()); // Read only a single record and return @@ -181,15 +181,15 @@ bool pkgCacheGenerator::MergeList(ListParser &List, Ver->ParentPkg = Pkg.Index(); Ver->Hash = Hash; if (List.NewVersion(Ver) == false) - return _error->Error(_("Error occured while processing %s (NewVersion1)"), + return _error->Error(_("Error occurred while processing %s (NewVersion1)"), PackageName.c_str()); if (List.UsePackage(Pkg,Ver) == false) - return _error->Error(_("Error occured while processing %s (UsePackage3)"), + return _error->Error(_("Error occurred while processing %s (UsePackage3)"), PackageName.c_str()); if (NewFileVer(Ver,List) == false) - return _error->Error(_("Error occured while processing %s (NewVersion2)"), + return _error->Error(_("Error occurred while processing %s (NewVersion2)"), PackageName.c_str()); // Read only a single record and return @@ -238,7 +238,7 @@ bool pkgCacheGenerator::MergeFileProvides(ListParser &List) pkgCache::PkgIterator Pkg = Cache.FindPkg(PackageName); if (Pkg.end() == true) - return _error->Error(_("Error occured while processing %s (FindPkg)"), + return _error->Error(_("Error occurred while processing %s (FindPkg)"), PackageName.c_str()); Counter++; if (Counter % 100 == 0 && Progress != 0) @@ -251,7 +251,7 @@ bool pkgCacheGenerator::MergeFileProvides(ListParser &List) if (Ver->Hash == Hash && Version.c_str() == Ver.VerStr()) { if (List.CollectFileProvides(Cache,Ver) == false) - return _error->Error(_("Error occured while processing %s (CollectFileProvides)"),PackageName.c_str()); + return _error->Error(_("Error occurred while processing %s (CollectFileProvides)"),PackageName.c_str()); break; } } diff --git a/buildlib/xml_manpage.mak b/buildlib/xml_manpage.mak index 57e95f303..c8b155d09 100644 --- a/buildlib/xml_manpage.mak +++ b/buildlib/xml_manpage.mak @@ -2,7 +2,7 @@ # This handles man pages in DocBook XML format. We convert to the respective # output in the source directory then copy over to the final dest. This -# means yodl is only needed if compiling from CVS +# means xmlto is only needed if compiling from Arch # Input # $(SOURCE) - The documents to use, in the form foo.sect, ie apt-cache.8 diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 6268f4953..316bb7af9 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -541,7 +541,7 @@ bool ShowEssential(ostream &out,CacheFile &Cache) } delete [] Added; - return ShowList(out,_("WARNING: The following essential packages will be removed\n" + return ShowList(out,_("WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!"),List,VersionsList); } @@ -862,7 +862,7 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true, const char *Prompt = _("Yes, do as I say!"); ioprintf(c2out, - _("You are about to do something potentially harmful\n" + _("You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" " ?] "),Prompt); c2out << flush; @@ -1380,6 +1380,15 @@ bool DoUpgrade(CommandLine &CmdL) /* Install named packages */ bool DoInstall(CommandLine &CmdL) { + // Lock the list directory + FileFd Lock; + if (_config->FindB("Debug::NoLocking",false) == false) + { + Lock.Fd(GetLock(_config->FindDir("Dir::State::Lists") + "lock")); + if (_error->PendingError() == true) + return _error->Error(_("Unable to lock the list directory")); + } + CacheFile Cache; if (Cache.OpenForInstall() == false || Cache.CheckDeps(CmdL.FileSize() != 1) == false) diff --git a/configure.in b/configure.in index 12d3ecae7..767399b52 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.6.36") +AC_DEFINE_UNQUOTED(VERSION,"0.6.37") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/changelog b/debian/changelog index 87e713d3d..1ce780163 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,35 @@ +apt (0.6.37) breezy; urgency=low + + * Merge bubulle@debian.org--2005/apt--main--0 up to patch-81 + - patch-66: Italian update + - patch-71: French update + - patch-73: Basque update + - patch-74: Hebrew update + - patch-76: Correct Hebrew translation (Closes: #306658) + - patch-77: French man page update + - patch-79: Correct syntax errors in Hebrew translation + - patch-81: Portuguese update + * Fix build of French man pages (now using XML, not SGML) + * Add Welsh translation from Dafydd Harries + (daf@muse.19inch.net--2005/apt--main--0--patch-1) + + -- Matt Zimmerman Tue, 24 May 2005 14:38:25 -0700 + +apt (0.6.36ubuntu1) breezy; urgency=low + + * make it possible to write a cache-control: no-cache header even if + no proxy is set to support transparent proxies (closes ubuntu: #10773) + + * Merge otavio@debian.org--2005/apt--fixes--0.6: + - Fix comment about the need of xmlto while building from Arch; + - Fix StatStore struct on cachedb.h to use time_t and then fix a compile + warning; + - Lock database at start of DoInstall routine to avoid concurrent + runs of install/remove and update commands (Closes: #194467) + - Fix warnings while compiling with GCC 4.0 compiler + + -- Michael Vogt Mon, 23 May 2005 11:57:53 +0200 + apt (0.6.36) experimental; urgency=low * Merge apt--mvo--0: @@ -9,7 +41,7 @@ apt (0.6.36) experimental; urgency=low - apt-pkg/cdrom.cc: honor "Acquire::gpgv::Options" when verifying the signature (Ubuntu #8496) - -- Michael Vogt Thu, 31 Mar 2005 20:37:11 +0200 + -- Michael Vogt Thu, 31 Mar 2005 20:37:11 +0200 apt (0.6.35) hoary; urgency=low diff --git a/doc/fr/apt-cache.fr.8.sgml b/doc/fr/apt-cache.fr.8.sgml deleted file mode 100644 index c7ca33882..000000000 --- a/doc/fr/apt-cache.fr.8.sgml +++ /dev/null @@ -1,428 +0,0 @@ - - - -%aptent; - -]> - - - &apt-docinfo; - - - apt-cache - 8 - - - - - apt-cache - Gestion des paquets et manipulation du cache par APT - - - - - - apt-cache - - - - - add fichier - gencaches - showpkg paquet - showsrc paquet - stats - dump - dumpavail - unmet - search regex - show paquet - depends paquet - rdepends paquet - pkgnames prefix - dotty paquet - policy paquets - madison paquets - - - - - Description</> - <para> -<command/apt-cache/ ralise diffrentes oprations sur le cache de paquet d' -APT. <command/apt-cache/ ne manipule pas l'tat du systme mais fournit des -moyens de recherche dans les mtadonnes d'un paquet desquelles il extrait -d'intressantes informations. - - <para> - moins que l'option <option>-h</> ou <option>--help</> ne soit donne, l'une -des commandes suivantes doit tre prsente. - - <VariableList> - <VarListEntry><Term>add <replaceable/fichier(s)/</Term> - <ListItem><Para> -La commande <literal/add/ ajoute des fichiers indexant des paquets au cache des -paquets. Cela sert uniquement pour le dbogage. - </VarListEntry> - - <VarListEntry><Term>gencaches</Term> - <ListItem><Para> -La commande <literal/gencaches/ fait la mme chose que -<command/apt-get check/. Elle construit les caches des sources et des paquets - partir des sources rpertories dans &sources-list; et dans -<filename>/var/lib/dpkg/status</>. - </VarListEntry> - - <VarListEntry><Term>showpkg <replaceable/paquet(s)/</Term> - <ListItem><Para> -La commande <literal/showpkg/ affiche des informations sur les paquets donns -en argument. Les arguments restants sont les noms de paquets. Les versions -disponibles et les dpendances inverses de chaque paquet rpertori sont -listes, ainsi que les dpendances normales pour chaque version. Les -dpendances normales d'un paquet sont constitues par les paquets dont il -dpend ; les -dpendances inverses sont les paquets qui dpendent du paquet en question. -Les dpendances normales doivent donc tre satisfaites et les dpendances -inverses n'ont pas besoin de l'tre. Ainsi, la commande -<command>apt-cache showpkg libreadline2</> donnerait ce rsultat : - -<informalexample><programlisting> -Package: libreadline2 -Versions: 2.1-12(/var/state/apt/lists/foo_Packages), -Reverse Depends: - libreadlineg2,libreadline2 - libreadline2-altdev,libreadline2 -Dependencies: -2.1-12 - libc5 (2 5.4.0-0) ncurses3.0 (0 (null)) -Provides: -2.1-12 - -Reverse Provides: -</programlisting></informalexample> - - <para> -On peut voir que libreadline2, version 2.1-12, dpend de libc5, ncurses3.0, et -ldso ; ces paquets doivent tre installs au pralable pour que -libreadline2 fonctionne. leur tour, libreadlineg2 et libreadline2-altdev -dpendent de libreadline2. Si libreadline2 est install, libc5 et ncurses3.0 (et -ldso) doivent tre installs ; libreadlineg2 et libreadline2-altdev -n'ont pas l'tre. Pour connatre le sens de la fin de chane, il est -prfrable de consulter le code source d'APT. - </VarListEntry> - - <VarListEntry><Term>stats</Term> - <ListItem><Para> -La commande <literal/stats/ affiche des statistiques propos du cache. Aucun -autre argument n'est attendu. Voici les informations rapportes : - <itemizedlist> - <listitem><para> -<literal/Total package names/ est le nombre de paquets trouvs dans le cache. - </listitem> - - <listitem><para> -<literal/Normal packages/ est le nombre de paquets simples, -ordinaires ; ces paquets tolrent une correspondance bijective entre -leur nom et le nom utilis par les autres paquets pour les qualifier comme -dpendance. La majorit des paquets appartient cette catgorie. - </listitem> - - <listitem><para> -<literal/Pure virtual packages/ est le nombre des paquets qui n'existent que -sous la forme d'un nom reprsentant un paquet virtuel ; ces paquets - fournissent  seulement un nom de paquet virtuel et aucun paquet -n'utilise vritablement ce nom. Par exemple, au sein du systme Debian -GNU/Linux, le nom  mail-transport-agent  est un paquet virtuel -pur ; plusieurs paquets peuvent  remplir  ce nom - mail-transport-agent , mais il -n'existe aucun paquet nomm  mail-transport-agent . - </listitem> - - <listitem><para> -<literal/Single virtual packages/ est le nombre de paquets virtuels qui ne -peuvent tre remplis que par un seul paquet. Par exemple, au sein du systme -Debian GNU/Linux,  X11-text-viewer  est un paquet virtuel ; -seul le paquet  xless  remplit  X11-text-viewer . - </listitem> - - <listitem><para> -<literal/Mixed virtual packages/ est le nombre des paquets qui remplissent un -paquet virtuel particulier ou dont le nom est un nom de paquet virtuel. -Par exemple, au sein du systme Debian GNU/Linux,  debconf  est -un paquet rel et il est aussi fourni par  debconf-tiny . - </listitem> - - <listitem><para> -<literal/Missing/ est le nombre de paquets rfrencs dans une -dpendance mais qui ne sont fournis par aucun paquet. Les paquets manquants -peuvent tre mis en vidence quand on n'accde pas une distribution complte -ou si un paquet (rel ou virtuel) a t sorti d'une distribution. -Habituellement on les trouve dans les champs  Conflicts . - </listitem> - - <listitem><para> -<literal/Total distinct/ versions est le nombre de versions de paquets trouves -dans le cache ; cette valeur est par consquent au moins gale au -nombre total de paquets. Quand on accde plus d'une distribution -( stable  et  unstable , par exemple), cette valeur -peut tre considrablement plus grande que le nombre total de paquets. - </listitem> - - <listitem><para> -<literal/Total dependencies/ est le nombre de relations de dpendances -dclares par tous les paquets prsents dans le cache. - </listitem> - </itemizedlist> - </VarListEntry> - - <VarListEntry><Term>showsrc <replaceable/paquet(s)/</Term> - <ListItem><Para> - <literal/showsrc/ affiche toutes les entres de paquet source qui -correspondent aux noms donns. Toutes les versions sont affiches et toutes -les entres qui dclarent que ces noms correspondent des paquets binaires. - </VarListEntry> - - - <VarListEntry><Term>dump</Term> - <ListItem><Para> -La commande <literal/dump/ affiche un court rsum sur chaque paquet du cache. -Elle est d'abord destine au dbogage. - </VarListEntry> - - <VarListEntry><Term>dumpavail</Term> - <ListItem><Para> -La commande <literal/dumpavail/ affiche sur la sortie standard une liste des -paquets disponibles. Elle convient une utilisation avec &dpkg; et la -mthode &dselect; s'en sert. - </VarListEntry> - - <VarListEntry><Term>unmet</Term> - <ListItem><Para> -La commande <literal/unmet/ affiche un rsum concernant toutes les -dpendances absentes dans le cache de paquets. - </VarListEntry> - - <VarListEntry><Term>show <replaceable/paquet(s)/</Term> - <ListItem><Para> -La commande <literal/show/ est semblable <literal/dpkg --print-avail/ ; -elle affiche des informations sur les paquets donns en argument. - </VarListEntry> - - <VarListEntry><Term>search <replaceable/regex [ regex ... ]/</Term> - <ListItem><Para> -La commande <literal/search/ recherche l'expression rgulire donne en -argument sur tous les paquets disponibles. Elle cherche une occurrence de la -chane dans les noms de paquets et dans les descriptions puis elle affiche -le nom du paquet et sa description courte. Quand on donne l'option -<option/--full/, la sortie est identique <literal/show/ pour chaque -paquet ; l'option <option/--names-only/ ne recherche pas la chane -dans les descriptions longues mais seulement dans les noms de paquets. -<para> -On peut utiliser des arguments distincts pour indiquer des expressions -rgulires diffrentes sur lesquelles sera ralis un  et  logique. - </VarListEntry> - - <VarListEntry><Term>depends <replaceable/paquet(s)/</Term> - <ListItem><Para> -La commande <literal/depends/ affiche la liste de toutes les dpendances -d'un paquet et la liste de tous les paquets possibles qui satisfont ces -dpendances. - </VarListEntry> - - <VarListEntry><Term>rdepends <replaceable/paquet(s)/</Term> - <ListItem><Para> -La commande <literal/rdepends/ affiche la liste de toutes les dpendances inverses -d'un paquet. - </VarListEntry> - - <VarListEntry><Term>pkgnames <replaceable/[ prefix ]/ </Term> - <ListItem><Para> -Cette commande affiche le nom de chaque paquet du systme. Un prfixe pour -filtrer la liste des noms peut tre donn en argument. La sortie est -approprie une utilisation au sein d'une fonction complte de shell ; -elle est produite trs rapidement. On utilise au mieux cette commande avec -l'option <option/--generate/. - </VarListEntry> - - <VarListEntry><Term>dotty <replaceable/paquet(s)/</Term> - <ListItem><Para> -La commande <literal/dotty/ prend une liste de paquets sur la ligne de commande -et affiche une sortie approprie une utilisation par la commande dotty du -paquet <ulink url="http://www.research.att.com/sw/tools/graphviz/">GraphViz</>. -Il en rsulte un ensemble de noeuds et d'arcs reprsentant les relations -entre les paquets. Par dfaut les paquets donns en argument suivent toutes -leurs dpendances, ce qui peut produire un graphe trs volumineux. -Pour limiter la sortie aux seuls paquets lists sur la ligne de commande, -positionnez l'option <literal>APT::Cache::GivenOnly</>. - </para> -<para> -Les noeuds rsultants ont plusieurs formes ; les paquets normaux sont -des botes, les  provides  purs sont des triangles, -les  provides  mixtes sont des diamants et les paquets manquants -sont des hexagones. Les botes oranges expriment un arrt de la rcursivit -[paquet feuille], les lignes bleues reprsentent des prdpendances et les -lignes vertes reprsentent des conflits. - </para> - <para> -Attention, dotty ne peut pas reprsenter des ensembles trs grands de paquets. - </VarListEntry> - - <VarListEntry><Term>policy <replaceable/[ paquet(s) ]/</Term> - <ListItem><Para> - <literal/policy/ sert dboguer des problmes relatifs au fichier des -prfrences. Sans argument, la commande affiche la priorit de chaque source. -Sinon, elle affiche des informations prcises sur la priorit du paquet donn -en argument. - </VarListEntry> - - <VarListEntry><Term>madison <replaceable/[ paquet(s) ]/</Term> - <ListItem><Para> - - La commande <literal/madison/ d'<literal/apt-cache/ cherche mimer le -format de sortie propre l'outil debian de gestion d'archives, -<literal/madison/, ainsi qu'une part de ses fonctionnalits. Elle affiche les -versions disponibles d'un paquet dans un tableau. Contrairement au programme -original <literal/madison/, elle n'affiche que des informations qui cocernent -l'architecture pour laquelle Apt a lu la liste des paquets disponibles -(<literal/APT::Architecture/). - </VarListEntry> - - </VariableList> - </RefSect1> - - <RefSect1><Title>Options</> - &apt-cmdblurb; - - <VariableList> - <VarListEntry><term><option/-p/</><term><option/--pkg-cache/</> - <ListItem><Para> -Indique le fichier servant de cache des paquets. Le cache des paquets est -le cache primaire utilis par toutes les oprations. -lment de configuration : <literal/Dir::Cache::pkgcache/. - </VarListEntry> - - <VarListEntry><term><option/-s/</><term><option/--src-cache/</> - <ListItem><Para> -Indique le fichier servant de cache des sources. Ce cache n'est utilis que -par <literal/gencaches/ ; une version des informations sur les paquets, -faite partir d'une analyse de sources distantes, est conserve. Quand le -cache des paquets est cr, le cache des sources est utilis afin d'viter -d'analyser nouveau tous les paquets. -lment de configuration : <literal/Dir::Cache::srcpkgcache/. - </VarListEntry> - - <VarListEntry><term><option/-q/</><term><option/--quiet/</> - <ListItem><Para> -Mode silencieux ; produit une sortie pertinente pour l'enregistrement -dans un fichier-journal, sans afficher d'indicateur de progression. Un plus -grand nombre de q produira un plus grand silence, avec un maximum de 2. Vous -pouvez aussi utiliser <option/-q=#/ pour positionner le niveau de silence, -annulant le fichier de configuration. -lment de configuration : <literal/quiet/. - </VarListEntry> - - <VarListEntry><term><option/-i/</><term><option/--important/</> - <ListItem><Para> -N'affiche que les dpendances importantes ; utiliser avec la commande -unmet pour n'afficher que les relations Depends et Pre-Depends. -lment de configuration : <literal/APT::Cache::Important/. - </VarListEntry> - - <VarListEntry><term><option/-f/</><term><option/--full/</> - <ListItem><Para> -Affiche la totalit des champs d'information sur le paquet lors d'une -recherche. -lment de configuration : <literal/APT::Cache::ShowFull/. - </VarListEntry> - - <VarListEntry><term><option/-a/</><term><option/--all-versions/</> - <ListItem><Para> -Affiche la totalit des champs d'information pour toutes les versions -disponibles : c'est la valeur par dfaut. Pour la dsactiver, utilisez -l'option <option/--no-all-versions/. Quand l'option <option/--no-all-versions/ -est choisie, seuls les lments de la version choisie (celle qui serait -installe) seront affichs. -Ctte option concerne seulement la commande <literal/show/. -lment de configuration : <literal/APT::Cache::AllVersions/. - </VarListEntry> - - <VarListEntry><term><option/-g/</><term><option/--generate/</> - <ListItem><Para> -Ralise une mise jour automatique du cache des paquets plutt que de se -servir du cache actuel. -Pour dsactiver cette option (option par dfaut), utiliser l'option -<option/--no-generate/. -lment de configuration : <literal/APT::Cache::Generate/. - </VarListEntry> - - <VarListEntry><term><option/--names-only/</><term><option/-n/</> - <ListItem><Para> -N'effectue une recherche que sur les noms de paquets et pas sur les -descriptions longues. -lment de configuration : <literal/APT::Cache::NamesOnly/. - </VarListEntry> - - <VarListEntry><term><option/--all-names/</> - <ListItem><Para> -Avec cette option <literal/pkgnames/ affiche tous les noms, les noms des -paquets virtuels et les dpendances manquantes. -lment de configuration : <literal/APT::Cache::AllNames/. - </VarListEntry> - - <VarListEntry><term><option/--recurse/</> - <ListItem><Para> -Avec cette option <literal/depends/ et <literal/rdepends/ sont rcursives de -manire n'afficher qu'une seule fois les paquets mentionns. -lment de configuration : <literal/APT::Cache::RecurseDepends/. - </VarListEntry> - - <VarListEntry><term><option/--installed/</> - <ListItem><Para> -Cette option limite la sortie de <literal/depends/ et de <literal/rdepends/ -aux paquets qui sont actuellement installs. -lment de configuration : <literal/APT::Cache::Installed/. - </VarListEntry> - - &apt-commonoptions; - - </VariableList> - </RefSect1> - - <RefSect1><Title>Fichiers</> - <variablelist> - <VarListEntry><term><filename>/etc/apt/sources.list</></term> - <ListItem><Para> -Emplacements o aller chercher les paquets. -lment de configuration : <literal/Dir::Etc::SourceList/. - </VarListEntry> - - <VarListEntry><term><filename>&statedir;/lists/</></term> - <ListItem><Para> -Zone de stockage pour les informations qui concernent chaque ressource de -paquet spcifie dans &sources-list; -lment de configuration : <literal/Dir::State::Lists/. - </VarListEntry> - - <VarListEntry><term><filename>&statedir;/lists/partial/</></term> - <ListItem><Para> -Zone de stockage pour les informations en transit. -lment de configuration : <literal/Dir::State::Lists/ (partial est implicite). - </VarListEntry> - </variablelist> - </RefSect1> - - <RefSect1><Title>Voir aussi</> - <para> - &apt-conf;, &sources-list;, &apt-get; - </RefSect1> - - <RefSect1><Title>Diagnostics</> - <para> -<command/apt-cache/ retourne zro aprs un droulement normal, et le nombre -dcimal 100 en cas d'erreur. - </RefSect1> - - &manbugs; - &manauthor; - &deux-traducteurs; -</refentry> diff --git a/doc/fr/apt-cache.fr.8.xml b/doc/fr/apt-cache.fr.8.xml new file mode 100644 index 000000000..043d9ec99 --- /dev/null +++ b/doc/fr/apt-cache.fr.8.xml @@ -0,0 +1,474 @@ +<?xml version="1.0" encoding="iso-8859-15" standalone="no"?> +<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" + "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ + +<!ENTITY % aptent SYSTEM "apt.ent.fr"> +%aptent; + +]> + +<refentry lang="fr"> + + <refentryinfo> + &apt-author.jgunthorpe; + &apt-author.team; + &apt-email; + &apt-product; + <!-- The last update date --> + <date>29 Fvrier 2004</date> + </refentryinfo> + + <refmeta> +<refentrytitle>apt-cache</refentrytitle> + <manvolnum>8</manvolnum> + </refmeta> + + <!-- Man page title --> + <refnamediv> + <refname>apt-cache</refname> + <refpurpose>Gestion des paquets et manipulation du cache par APT</refpurpose> + </refnamediv> + + <!-- Arguments --> + <refsynopsisdiv> + <cmdsynopsis> + <command>apt-cache</command> + <arg><option>-hvsn</option></arg> + <arg><option>-o=<replaceable>option de configuration</replaceable></option></arg> + <arg><option>-c=<replaceable>fichier</replaceable></option></arg> + <group choice="req"> + <arg>add <arg choice="plain" rep="repeat"><replaceable>fichier</replaceable></arg></arg> + <arg>gencaches</arg> + <arg>showpkg <arg choice="plain" rep="repeat"><replaceable>paquet</replaceable></arg></arg> + <arg>showsrc <arg choice="plain" rep="repeat"><replaceable>paquet</replaceable></arg></arg> + <arg>stats</arg> + <arg>dump</arg> + <arg>dumpavail</arg> + <arg>unmet</arg> + <arg>search <arg choice="plain"><replaceable>regex</replaceable></arg></arg> + <arg>show <arg choice="plain" rep="repeat"><replaceable>paquet</replaceable></arg></arg> + <arg>depends <arg choice="plain" rep="repeat"><replaceable>paquet</replaceable></arg></arg> + <arg>rdepends <arg choice="plain" rep="repeat"><replaceable>paquet</replaceable></arg></arg> + <arg>pkgnames <arg choice="plain"><replaceable>prefix</replaceable></arg></arg> + <arg>dotty <arg choice="plain" rep="repeat"><replaceable>paquet</replaceable></arg></arg> + <arg>policy <arg choice="plain" rep="repeat"><replaceable>paquets</replaceable></arg></arg> + <arg>madison <arg choice="plain" rep="repeat"><replaceable>paquets</replaceable></arg></arg> + </group> + </cmdsynopsis> + </refsynopsisdiv> + + <refsect1><title>Description + +apt-cache ralise diffrentes oprations sur le cache de paquet d' +APT. apt-cache ne manipule pas l'tat du systme mais fournit des +moyens de recherche dans les mtadonnes d'un paquet desquelles il extrait +d'intressantes informations. + + + moins que l'option ou ne soit donne, l'une +des commandes suivantes doit tre prsente. + + + add fichier(s) + +La commande add ajoute des fichiers indexant des paquets au cache des +paquets. Cela sert uniquement pour le dbogage. + + + + gencaches + +La commande gencaches fait la mme chose que +apt-get check. Elle construit les caches des sources et des paquets + partir des sources rpertories dans &sources-list; et dans +/var/lib/dpkg/status. + + + + showpkg paquet(s) + +La commande showpkg affiche des informations sur les paquets donns +en argument. Les arguments restants sont les noms de paquets. Les versions +disponibles et les dpendances inverses de chaque paquet rpertori sont +listes, ainsi que les dpendances normales pour chaque version. Les +dpendances normales d'un paquet sont constitues par les paquets dont il +dpend ; les +dpendances inverses sont les paquets qui dpendent du paquet en question. +Les dpendances normales doivent donc tre satisfaites et les dpendances +inverses n'ont pas besoin de l'tre. Ainsi, la commande +apt-cache showpkg libreadline2 donnera ce rsultat : + + +Package: libreadline2 +Versions: 2.1-12(/var/state/apt/lists/foo_Packages), +Reverse Depends: + libreadlineg2,libreadline2 + libreadline2-altdev,libreadline2 +Dependencies: +2.1-12 - libc5 (2 5.4.0-0) ncurses3.0 (0 (null)) +Provides: +2.1-12 - +Reverse Provides: + + + +On peut voir que libreadline2, version 2.1-12, dpend de libc5, ncurses3.0 ; +ces paquets doivent tre installs au pralable pour que +libreadline2 fonctionne. leur tour, libreadlineg2 et libreadline2-altdev +dpendent de libreadline2. Si libreadline2 est install, libc5 et ncurses3.0 +doivent tre installs ; libreadlineg2 et libreadline2-altdev +n'ont pas l'tre. Pour connatre le sens de la fin de chane, il est +prfrable de consulter le code source d'APT. + + + + stats + +La commande stats affiche des statistiques propos du cache. Aucun +autre argument n'est attendu. Voici les informations rapportes : + + +Total package names est le nombre de paquets trouvs dans le cache. + + + +Normal packages est le nombre de paquets simples, +ordinaires ; ces paquets tolrent une correspondance bijective entre +leur nom et le nom utilis par les autres paquets pour les qualifier comme +dpendance. La majorit des paquets appartient cette catgorie. + + + +Pure virtual packages est le nombre des paquets qui n'existent que +sous la forme d'un nom reprsentant un paquet virtuel ; ces paquets + fournissent  seulement un nom de paquet virtuel et aucun paquet +n'utilise vritablement ce nom. Par exemple, au sein du systme Debian +GNU/Linux, le nom  mail-transport-agent  est un paquet virtuel +pur ; plusieurs paquets peuvent  remplir  ce nom + mail-transport-agent , mais il +n'existe aucun paquet nomm  mail-transport-agent . + + + +Single virtual packages est le nombre de paquets virtuels qui ne +peuvent tre remplis que par un seul paquet. Par exemple, au sein du systme +Debian GNU/Linux,  X11-text-viewer  est un paquet virtuel ; +seul le paquet  xless  remplit  X11-text-viewer . + + + +Mixed virtual packages est le nombre des paquets qui remplissent un +paquet virtuel particulier ou dont le nom est un nom de paquet virtuel. +Par exemple, au sein du systme Debian GNU/Linux,  debconf  est +un paquet rel et il est aussi fourni par  debconf-tiny . + + + +Missing est le nombre de paquets rfrencs dans une +dpendance mais qui ne sont fournis par aucun paquet. Les paquets manquants +peuvent tre mis en vidence quand on n'accde pas une distribution complte +ou si un paquet (rel ou virtuel) a t sorti d'une distribution. +Habituellement on les trouve dans les champs  Conflicts . + + + +Total distinct versions est le nombre de versions de paquets trouves +dans le cache ; cette valeur est par consquent au moins gale au +nombre total de paquets. Quand on accde plus d'une distribution +( stable  et  unstable , par exemple), cette valeur +peut tre considrablement plus grande que le nombre total de paquets. + + + +Total dependencies est le nombre de relations de dpendances +dclares par tous les paquets prsents dans le cache. + + + + + + + showsrc paquet(s) + + showsrc affiche toutes les entres de paquet source qui +correspondent aux noms donns. Toutes les versions sont affiches et toutes +les entres qui dclarent que ces noms correspondent des paquets binaires. + + + + + + dump + +La commande dump affiche un court rsum sur chaque paquet du cache. +Elle est d'abord destine au dbogage. + + + + dumpavail + +La commande dumpavail affiche sur la sortie standard une liste des +paquets disponibles. Elle convient une utilisation avec &dpkg; et la +mthode &dselect; s'en sert. + + + + unmet + +La commande unmet affiche un rsum concernant toutes les +dpendances absentes dans le cache de paquets. + + + + show paquet(s) + +La commande show est semblable +dpkg --print-avail ; +elle affiche des informations sur les paquets donns en argument. + + + + search regex [ regex ... ] + +La commande search recherche l'expression rgulire donne en +argument sur tous les paquets disponibles. Elle cherche une occurrence de la +chane dans les noms de paquets et dans les descriptions puis elle affiche +le nom du paquet et sa description courte. Quand on donne l'option +, la sortie est identique show pour chaque +paquet ; l'option ne recherche pas la chane +dans les descriptions longues mais seulement dans les noms de paquets. + +On peut utiliser des arguments distincts pour indiquer des expressions +rgulires diffrentes sur lesquelles sera ralis un  et  logique. + + + + + depends paquet(s) + +La commande depends affiche la liste de toutes les dpendances +d'un paquet et la liste de tous les paquets possibles qui satisfont ces +dpendances. + + + + rdepends paquet(s) + +La commande rdepends affiche la liste de toutes les dpendances inverses +d'un paquet. + + + + pkgnames [ prefix ] + +Cette commande affiche le nom de chaque paquet du systme. Un prfixe pour +filtrer la liste des noms peut tre donn en argument. La sortie est +approprie une utilisation au sein d'une fonction complte de shell ; +elle est produite trs rapidement. On utilise au mieux cette commande avec +l'option . + + + + dotty paquet(s) + +La commande dotty prend une liste de paquets sur la ligne de commande +et affiche une sortie approprie une utilisation par la commande dotty du +paquet GraphViz. +Il en rsulte un ensemble de noeuds et d'arcs reprsentant les relations +entre les paquets. Par dfaut les paquets donns en argument suivent toutes +leurs dpendances, ce qui peut produire un graphe trs volumineux. +Pour limiter la sortie aux seuls paquets lists sur la ligne de commande, +positionnez l'option APT::Cache::GivenOnly. + + +Les noeuds rsultants ont plusieurs formes ; les paquets normaux sont +des botes, les  provides  purs sont des triangles, +les  provides  mixtes sont des diamants et les paquets manquants +sont des hexagones. Les botes oranges expriment un arrt de la rcursivit +[paquet feuille], les lignes bleues reprsentent des prdpendances et les +lignes vertes reprsentent des conflits. + + +Attention, dotty ne peut pas reprsenter des ensembles trs grands de paquets. + + + + + policy [ paquet(s) ] + + policy sert dboguer des problmes relatifs au fichier des +prfrences. Sans argument, la commande affiche la priorit de chaque source. +Sinon, elle affiche des informations prcises sur la priorit du paquet donn +en argument. + + + + madison [ paquet(s) ] + + + La commande madison d'apt-cache + cherche mimer le +format de sortie propre l'outil debian de gestion d'archives, +madison, ainsi qu'une part de ses fonctionnalits. Elle affiche les +versions disponibles d'un paquet dans un tableau. Contrairement au programme +original madison, elle n'affiche que des informations concernant +l'architecture pour laquelle Apt a lu la liste des paquets disponibles +(APT::Architecture). + + + + + + + Options + &apt-cmdblurb; + + + + +Indique le fichier servant de cache des paquets. Le cache des paquets est +le cache primaire utilis par toutes les oprations. +lment de configuration : Dir::Cache::pkgcache. + + + + + +Indique le fichier servant de cache des sources. Ce cache n'est utilis que +par gencaches ; une version des informations sur les paquets, +faite partir d'une analyse de sources distantes, est conserve. Quand le +cache des paquets est cr, le cache des sources est utilis afin d'viter +d'analyser nouveau tous les paquets. +lment de configuration : Dir::Cache::srcpkgcache. + + + + + +Mode silencieux ; produit une sortie pertinente pour l'enregistrement +dans un fichier-journal, sans afficher d'indicateur de progression. Un plus +grand nombre de q produira un plus grand silence, avec un maximum de 2. Vous +pouvez aussi utiliser pour positionner le niveau de silence, +annulant le fichier de configuration. +lment de configuration : quiet. + + + + + +N'affiche que les dpendances importantes ; utiliser avec la commande +unmet pour n'afficher que les relations Depends et Pre-Depends. +lment de configuration : APT::Cache::Important. + + + + + +Affiche la totalit des champs d'information sur le paquet lors d'une +recherche. +lment de configuration : APT::Cache::ShowFull. + + + + + +Affiche la totalit des champs d'information pour toutes les versions +disponibles : c'est la valeur par dfaut. Pour la dsactiver, utilisez +l'option . Quand l'option +est choisie, seuls les lments de la version choisie (celle qui serait +installe) seront affichs. +Cette option concerne seulement la commande show. +lment de configuration : APT::Cache::AllVersions. + + + + + +Ralise une mise jour automatique du cache des paquets plutt que de se +servir du cache actuel. +Pour dsactiver cette option (option par dfaut), utilisez l'option +. +lment de configuration : APT::Cache::Generate. + + + + + +N'effectue une recherche que sur les noms de paquets et pas sur les +descriptions longues. +lment de configuration : APT::Cache::NamesOnly. + + + + + +Avec cette option pkgnames affiche tous les noms, les noms des +paquets virtuels et les dpendances manquantes. +lment de configuration : APT::Cache::AllNames. + + + + + +Avec cette option depends et rdepends +sont rcursives de +manire n'afficher qu'une seule fois les paquets mentionns. +lment de configuration : APT::Cache::RecurseDepends. + + + + + +Cette option limite la sortie de depends et de +rdepends +aux paquets qui sont actuellement installs. +lment de configuration : APT::Cache::Installed. + + + + &apt-commonoptions; + + + + + Fichiers + + /etc/apt/sources.list + +Emplacements o aller chercher les paquets. +lment de configuration : Dir::Etc::SourceList. + + + + &statedir;/lists/ + +Zone de stockage pour les informations qui concernent chaque ressource de +paquet spcifie dans &sources-list; +lment de configuration : Dir::State::Lists. + + + + &statedir;/lists/partial/ + +Zone de stockage pour les informations en transit. +lment de configuration : Dir::State::Lists (partial est implicite). + + + + + + + Voir aussi + + &apt-conf;, &sources-list;, &apt-get;. + + + Diagnostics + +apt-cache retourne zro aprs un droulement normal, et le nombre +dcimal 100 en cas d'erreur. + + + &manbugs; + &deux-traducteurs; + diff --git a/doc/fr/apt-cdrom.fr.8.sgml b/doc/fr/apt-cdrom.fr.8.sgml deleted file mode 100644 index 378bc58d1..000000000 --- a/doc/fr/apt-cdrom.fr.8.sgml +++ /dev/null @@ -1,150 +0,0 @@ - - - -%aptent; - -]> - - - &apt-docinfo; - - - apt-cdrom - 8 - - - - - apt-cdrom - Gestion des cdroms par APT - - - - - - apt-cdrom - - - - - - add - ident - - - - - Description</> - <para> -<command/apt-cdrom/ est utilis pour ajouter un nouveau cdrom la liste des -sources disponibles. <command/apt-cdrom/ prend soin de dterminer la structure -du disque, de corriger de possibles erreurs de gravure et de vrifier les -fichiers d'index. - <para> -Il est ncessaire d'utiliser <command/apt-cdrom/ pour ajouter des cdroms au -systme APT, cela ne peut tre ralis   la main . Par ailleurs, -chaque disque d'un ensemble de cdroms doit tre sparment insr et -parcouru pour prendre en compte de possibles erreurs de gravure. - - <para> - moins que l'option <option>-h</> ou <option>--help</> ne soit donne, l'une -des commandes suivantes doit tre prsente. - - <VariableList> - <VarListEntry><Term>add</Term> - <ListItem><Para> -La commande <literal/add/ est utilise pour ajouter un nouveau disque la -liste des sources. Elle dmonte le cdrom, rclame l'insertion d'un disque, -parcourt ensuite le disque et copie les fichiers d'index. Si le disque ne -possde pas de rpertoire <filename>.disk/</> correct, un titre descriptif -est demand. - <para> -APT utilise un identifiant de cdrom pour reconnatre le disque qui -se trouve actuellement dans le lecteur et maintient une base de donnes de -ces identifiants dans <filename>&statedir;/cdroms.list</>. - </VarListEntry> - - <VarListEntry><Term>ident</Term> - <ListItem><Para> -Un outil de dbogage pour rapporter l'identifiant du disque actuel ainsi -que le nom du fichier stock. - </VarListEntry> - </VariableList> - </RefSect1> - - <RefSect1><Title>Options</> - &apt-cmdblurb; - - <VariableList> - <VarListEntry><term><option/-d/</><term><option/--cdrom/</> - <ListItem><Para> -Point de montage ; spcifie l'emplacement de montage du cdrom. Ce -point de montage doit tre spcifi dans <filename>/etc/fstab</> et -correctement configur. -lment de configuration : <literal/Acquire::cdrom::mount/. - </VarListEntry> - - <VarListEntry><term><option/-r/</><term><option/--rename/</> - <ListItem><Para> -Change le nom d'un disque ; change le nom d'un disque ou annule le nom -donn aux disques. Cette option oblige <command/apt-cdrom/ demander un -nouveau nom l'utilisateur. -lment de configuration : <literal/APT::CDROM::Rename/. - </VarListEntry> - - <VarListEntry><term><option/-m/</><term><option/--no-mount/</> - <ListItem><Para> -Pas de montage ; empche <command/apt-cdrom/ de monter ou dmonter le -point de montage. lment de configuration : <literal/APT::CDROM::NoMount/. - </VarListEntry> - - <VarListEntry><term><option/-f/</><term><option/--fast/</> - <ListItem><Para> -Copie rapide ; suppose que les paquets sont valides et ne vrifie pas -chaque paquet. Cette option ne devrait tre utilise que si <command/apt-cdrom/ -a pralablement utilis ce disque et n'a trouv aucune erreur. -lment de configuration : <literal/APT::CDROM::Fast/. - </VarListEntry> - - <VarListEntry><term><option/-a/</><term><option/--thorough/</> - <ListItem><Para> -Parcours minutieux des paquets ; cette option peut tre ncessaire avec -de vieux cdroms de systmes Debian 1.1 ou 1.2 dont les fichiers Packages -sont situs dans des endroits tranges. Il faudra plus de temps pour -parcourir le CD mais tous les paquets seront reprs. - </VarListEntry> - - <VarListEntry><term><option/-n/</> - <term><option/--just-print/</> - <term><option/--recon/</> - <term><option/--no-act/</> - <ListItem><Para> -Aucune modification ; ne pas modifier le fichier &sources-list; ni les -fichiers d'index. Cependant, tout est vrifi. -lment de configuration : <literal/APT::CDROM::NoAct/. - </VarListEntry> - - &apt-commonoptions; - - </VariableList> - </RefSect1> - - <RefSect1><Title>Voir aussi</> - <para> - &apt-conf;, &apt-get;, &sources-list; - </RefSect1> - - <RefSect1><Title>Diagnostics</> - <para> -<command/apt-cdrom/ retourne zro aprs un droulement normal, et le nombre -dcimal 100 en cas d'erreur. - </RefSect1> - - &manbugs; - &manauthor; -&deux-traducteurs; - -</refentry> - diff --git a/doc/fr/apt-cdrom.fr.8.xml b/doc/fr/apt-cdrom.fr.8.xml new file mode 100644 index 000000000..fd2b89a5d --- /dev/null +++ b/doc/fr/apt-cdrom.fr.8.xml @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="iso-8859-15" standalone="no"?> +<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" + "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ + +<!ENTITY % aptent SYSTEM "apt.ent.fr"> +%aptent; + +]> +<refentry lang="fr"> + <refentryinfo> + &apt-author.jgunthorpe; + &apt-author.team; + &apt-email; + &apt-product; + <date>14 Fvrier 2004</date> + </refentryinfo> + +<refmeta> +<refentrytitle>apt-cdrom</refentrytitle> +<manvolnum>8</manvolnum> +</refmeta> + +<!-- Man page title --> +<refnamediv lang="fr"> +<refname>apt-cdrom</refname> +<refpurpose>Gestion des cdroms par APT</refpurpose> +</refnamediv> + +<!-- Arguments --> +<refsynopsisdiv> +<cmdsynopsis> +<command>apt-cdrom</command> +<arg><option>-hvrmfan</option></arg> +<arg><option>-d=<replaceable>point de montage du cdrom</replaceable></option></arg> +<arg><option>-o=<replaceable>option de configuration</replaceable></option></arg> +<arg><option>-c=<replaceable>fichier</replaceable></option></arg> +<group> +<arg>add</arg> +<arg>ident</arg> +</group> +</cmdsynopsis> +</refsynopsisdiv> + +<refsect1><title>Description + +apt-cdrom est utilis pour ajouter un nouveau cdrom la liste des +sources disponibles. apt-cdrom prend soin de dterminer la structure +du disque, de corriger de possibles erreurs de gravure et de vrifier les +fichiers d'index. + +Il est ncessaire d'utiliser apt-cdrom pour ajouter des cdroms au +systme APT, cela ne peut tre ralis   la main . Par ailleurs, +chaque disque d'un ensemble de cdroms doit tre sparment insr et +parcouru pour prendre en compte de possibles erreurs de gravure. + + + moins que l'option ou ne soit donne, l'une +des commandes suivantes doit tre prsente. + + +add + +La commande add est utilise pour ajouter un nouveau disque la +liste des sources. Elle dmonte le cdrom, rclame l'insertion d'un disque, +parcourt ensuite le disque et copie les fichiers d'index. Si le disque ne +possde pas de rpertoire disk/ correct, un titre descriptif +est demand. + +APT utilise un identifiant de cdrom pour reconnatre le disque qui +se trouve actuellement dans le lecteur et maintient une base de donnes de +ces identifiants dans &statedir;/cdroms.list. + + + + +ident +Un outil de dbogage pour rapporter l'identifiant du disque actuel ainsi +que le nom du fichier stock. + + + + + + + +Options +&apt-cmdblurb; + + + + +Point de montage ; spcifie l'emplacement de montage du cdrom. Ce +point de montage doit tre spcifi dans /etc/fstab et +correctement configur. +lment de configuration : Acquire::cdrom::mount. + + + + +Change le nom d'un disque ; change le nom d'un disque ou annule le nom +donn aux disques. Cette option oblige apt-cdrom demander un +nouveau nom l'utilisateur. +lment de configuration : APT::CDROM::Rename. + + + + +Pas de montage ; empche apt-cdrom de monter ou dmonter le +point de montage. lment de configuration : APT::CDROM::NoMount. + + + + +Copie rapide ; suppose que les paquets sont valides et ne vrifie pas +chaque paquet. Cette option ne devrait tre utilise que si apt-cdrom +a pralablement utilis ce disque et n'a trouv aucune erreur. +lment de configuration : APT::CDROM::Fast. + + + + +Parcours minutieux des paquets ; cette option peut tre ncessaire avec +de vieux cdroms de systmes Debian 1.1 ou 1.2 dont les fichiers Packages +sont situs dans des endroits tranges. Il faudra plus de temps pour +parcourir le CD mais tous les paquets seront reprs. + + + + + + + +Aucune modification ; ne pas modifier le fichier &sources-list; + ni les fichiers d'index. Cependant, tout est vrifi. +lment de configuration : APT::CDROM::NoAct. + + + +&apt-commonoptions; + + + +Voir aussi + + +&apt-conf;, &apt-get;, &sources-list;. + + + +Diagnostics +apt-cdrom retourne zro aprs un droulement normal, et le nombre +dcimal 100 en cas d'erreur. + + + +&manbugs; +&deux-traducteurs; + + diff --git a/doc/fr/apt-config.fr.8.sgml b/doc/fr/apt-config.fr.8.sgml deleted file mode 100644 index 8f2ae4511..000000000 --- a/doc/fr/apt-config.fr.8.sgml +++ /dev/null @@ -1,113 +0,0 @@ - - - -%aptent; - -]> - - - &apt-docinfo; - - - apt-config - 8 - - - - - apt-config - Programme pour interroger la configuration de APT - - - - - - apt-config - - - - - shell - dump - - - - - Description</> - <para> -<command/apt-config/ est un programme interne utilis par diffrentes -composantes d'APT ; il offre la possibilit d'une configuration -cohrente et permet aux applications conues sous forme de script une -utilisation simple du fichier de configuration principal -<filename>/etc/apt/apt.conf</>. - <para> - moins que l'option <option>-h</> ou <option>--help</> ne soit donne, l'une -des commandes suivantes doit tre prsente. - </para> - - <VariableList> - <VarListEntry><Term>shell</Term> - <ListItem><Para> -Le terme shell est utilis pour accder aux informations de configuration -depuis un script shell. Deux arguments doivent lui tre donns ; le -premier est une variable de shell et le second une valeur de configuration -demander. -La sortie standard consiste en une liste de commandes d'assignation de shell -pour chaque valeur prsente. Dans un script shell, cette commande devrait -tre utilise comme suit : - - </para> - -<informalexample><programlisting> -OPTS="-f" -RES=`apt-config shell OPTS MyApp::Options` -eval $RES -</programlisting></informalexample> - - <para> -La variable d'environnement de shell $OPTS sera dfinie par la valeur de -MyApp::Options ou, par dfaut, la valeur -f. - - <para> -L'lment de configuration peut tre suivi par /[fdbi].  f  -renvoie un nom de fichier,  d  un nom de rpertoire, - b  renvoie  true  ou  false  et - i  renvoie un entier. Chacune de ses valeurs est normalise et vrifie. - </VarListEntry> - - <VarListEntry><Term>dump</Term> - <ListItem><Para> -Affiche seulement le contenu de l'espace de configuration. - </VarListEntry> - - </VariableList> - </RefSect1> - - <RefSect1><Title>Options</> - &apt-cmdblurb; - - <VariableList> - - &apt-commonoptions; - - </VariableList> - </RefSect1> - - <RefSect1><Title>Voir aussi</> - <para> - &apt-conf; - </RefSect1> - - <RefSect1><Title>Diagnostics</> - <para> -<command/apt-config/ retourne zro aprs un droulement normal, et le nombre -100 en cas d'erreur. - </RefSect1> - - &manbugs; - &manauthor; - &deux-traducteurs; - -</refentry> diff --git a/doc/fr/apt-config.fr.8.xml b/doc/fr/apt-config.fr.8.xml new file mode 100644 index 000000000..ac9143066 --- /dev/null +++ b/doc/fr/apt-config.fr.8.xml @@ -0,0 +1,116 @@ +<?xml version="1.0" encoding="iso-8859-15" standalone="no"?> +<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" + "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ + +<!ENTITY % aptent SYSTEM "apt.ent.fr"> +%aptent; + +]> + +<refentry lang="fr"> + + <refentryinfo> + &apt-author.jgunthorpe; + &apt-author.team; + &apt-email; + &apt-product; + <!-- The last update date --> + <date>29 Fvrier 2004</date> + </refentryinfo> + + <refmeta> +<refentrytitle>apt-config</refentrytitle> +<manvolnum>8</manvolnum> +</refmeta> + +<refnamediv> +<refname>apt-config</refname> +<refpurpose>Programme pour interroger la configuration de APT</refpurpose> +</refnamediv> + +<refsynopsisdiv> +<cmdsynopsis> +<command>apt-config</command> +<arg><option>-hv</option></arg> +<arg><option>-o=<replaceable>option de configuration</replaceable></option></arg> +<arg><option>-c=<replaceable>fichier</replaceable></option></arg> +<group choice="req"> +<arg>shell</arg> +<arg>dump</arg> +</group> +</cmdsynopsis> +</refsynopsisdiv> + +<refsect1><title>Description +apt-config est un programme interne utilis par diffrentes +composantes d'APT ; il offre la possibilit d'une configuration +cohrente et permet aux applications conues sous forme de script une +utilisation simple du fichier de configuration principal +/etc/apt/apt.conf. + + moins que l'option ou ne soit donne, l'une +des commandes suivantes doit tre prsente. + + + +shell + +Le terme shell est utilis pour accder aux informations de configuration +depuis un script shell. Deux arguments doivent lui tre donns ; le +premier est une variable de shell et le second une valeur de configuration +demander. +La sortie standard consiste en une liste de commandes d'assignation de shell +pour chaque valeur prsente. Dans un script shell, cette commande devrait +tre utilise comme suit : + + +OPTS="-f" +RES=`apt-config shell OPTS MyApp::Options` +eval $RES + + +La variable d'environnement de shell $OPTS sera dfinie par la valeur de +MyApp::Options ou, par dfaut, la valeur -f. + + +L'lment de configuration peut tre suivi par /[fdbi].  f  +renvoie un nom de fichier,  d  un nom de rpertoire, + b  renvoie  true  ou  false  et + i  renvoie un entier. Chacune de ses valeurs est normalise et vrifie. + + + +dump + +Affiche seulement le contenu de l'espace de configuration. + + + + + +Options +&apt-cmdblurb; + + +&apt-commonoptions; + + + + +Voir aussi + +&apt-conf; + + + +Diagnostics +apt-config retourne zro aprs un droulement normal, et le nombre +100 en cas d'erreur. + + + +&manbugs; +&deux-traducteurs; + + + diff --git a/doc/fr/apt-extracttemplates.fr.1.sgml b/doc/fr/apt-extracttemplates.fr.1.sgml deleted file mode 100644 index 178a23b30..000000000 --- a/doc/fr/apt-extracttemplates.fr.1.sgml +++ /dev/null @@ -1,83 +0,0 @@ - - - -%aptent; - -]> - - - &apt-docinfo; - - - apt-extracttemplates - 1 - - - - - apt-extracttemplates -Un outil pour extraire d'un paquet Debian les textes de configuration pour DebConf. - - - - - - apt-extracttemplates - - - fichier - - - - Description</> - <para> -<command/apt-extracttemplates/ prend un ou plusieurs paquets Debian en -argument et renvoie (dans un rpertoire temporaire) tous les scripts et -guides de configuration associs. Pour chaque paquet trait contenant des -scripts et guides de configuration, une ligne est affiche au format -suivant : - <para> - paquet version guide-de-configuration script-de-configuration - <para> -Les scripts et guides de configuration sont crits dans le rpertoire -temporaire indiqu par l'option <option>-t</option> ou -<option>--tempdir</option> (<literal/APT::ExtractTemplates::TempDir</>) ; les noms de fichier sont de la -forme <filename>package.template.XXXX</> ou <filename>package.config.XXXX</>. - </RefSect1> - - <RefSect1><Title>Options</> - &apt-cmdblurb; - - <VariableList> - <VarListEntry><term><option/-t/</><term><option/--tempdir/</> - <ListItem><Para> -Rpertoire temporaire dans lequel crire les scripts et guides de -configuration pour Debconf. -lment de configuration : <literal/APT::ExtractTemplates::TempDir/. - </VarListEntry> - - &apt-commonoptions; - - </VariableList> - - - </RefSect1> - - <RefSect1><Title>Voir aussi</> - <para> - &apt-conf; - </RefSect1> - - <RefSect1><Title>Diagnostics</> - <para> -<command/apt-extracttemplates/ retourne zro si tout se passe bien, le nombre -100 en cas d'erreur. - </RefSect1> - - &manbugs; - &manauthor; -&traducteur; - -</refentry> diff --git a/doc/fr/apt-extracttemplates.fr.1.xml b/doc/fr/apt-extracttemplates.fr.1.xml new file mode 100644 index 000000000..7b548869c --- /dev/null +++ b/doc/fr/apt-extracttemplates.fr.1.xml @@ -0,0 +1,88 @@ +<?xml version="1.0" encoding="iso-8859-15" standalone="no"?> +<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" + "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ + +<!ENTITY % aptent SYSTEM "apt.ent.fr"> +%aptent; + +]> + +<refentry lang="fr"> + + <refentryinfo> + &apt-author.jgunthorpe; + &apt-author.team; + &apt-email; + &apt-product; + <!-- The last update date --> + <date>29 Fvrier 2004</date> + </refentryinfo> + +<refmeta> +<refentrytitle>apt-extracttemplates</refentrytitle> +<manvolnum>1</manvolnum> +</refmeta> + +<refnamediv lang="fr"> +<refname>apt-extracttemplates</refname> +<refpurpose>Un outil pour extraire d'un paquet Debian les textes de configuration pour DebConf. + </refpurpose> +</refnamediv> + +<refsynopsisdiv> +<cmdsynopsis><command>apt-extracttemplates</command> +<arg><option>-hv</option></arg> +<arg><option>-t=<replaceable>rpertoire temporaire</replaceable></option></arg> +<arg choice="plain" rep="repeat"><replaceable>fichier</replaceable></arg> +</cmdsynopsis> +</refsynopsisdiv> + +<refsect1><title>Description + +Apt-extracttemplates prend un ou plusieurs paquets Debian en +argument et renvoie (dans un rpertoire temporaire) tous les scripts et +guides de configuration associs. Pour chaque paquet trait contenant des +scripts et guides de configuration, une ligne est affiche au format +suivant : + +paquet version guide-de-configuration script-de-configuration + +Les scripts et guides de configuration sont crits dans le rpertoire +temporaire indiqu par l'option ou + (APT::ExtractTemplates::TempDir) ; +les noms de fichier sont de la +forme package.template.XXXX ou package.config.XXXX. + + + +Options +&apt-cmdblurb; + + + + +Rpertoire temporaire dans lequel crire les scripts et guides de +configuration pour Debconf. +lment de configuration : APT::ExtractTemplates::TempDir. + + + +&apt-commonoptions; + + + +Voir aussi +&apt-config; + + + +Diagnostics + +apt-extracttemplates retourne zro si tout se passe bien, le nombre +100 en cas d'erreur. + + + +&manbugs; +&traducteur; + \ No newline at end of file diff --git a/doc/fr/apt-ftparchive.fr.1.sgml b/doc/fr/apt-ftparchive.fr.1.sgml deleted file mode 100644 index 53f6a0adc..000000000 --- a/doc/fr/apt-ftparchive.fr.1.sgml +++ /dev/null @@ -1,552 +0,0 @@ - - - -%aptent; - -]> - - - &apt-docinfo; - - - apt-ftparchive - 1 - - - - - apt-ftparchive - Un outil pour crer des index - - - - - - apt-ftparchive - - - - - - - - - packagescheminoverrideprfixe-de-chemin - sourcescheminoverrideprfixe-de-chemin - contents chemin - generate fichier-de-configuration section - clean fichier-de-configuration - - - - - Description</> - <para> -<command/apt-ftparchive/ est l'outil en ligne de commande qui cre les index -dont APT se sert pour accder aux sources des distributions. Un index doit -tre cr pour un site et bas sur le contenu de ce site. - - <para> -<command/apt-ftparchive/ est un ensemble comprenant le programme -&dpkg-scanpackages; et toutes ses fonctionnalits via la commande -<literal/directory/ ; il comprend aussi un gnrateur de fichier - Contents , la commande <literal/contents/, et une technique -labore pour  scripter  le processus de cration d'une archive -complte. - - <para> -<command/apt-ftparchive/ peut utiliser lui-mme des bases de donnes binaires -pour  cacher  le contenu d'un fichier .deb ; il n'a pas -besoin de programmes extrieurs, sauf &gzip;. Lors d'une excution, il -vrifie les changements dans les fichiers et cre les fichiers compresss -voulus. - - <para> - moins que l'option <option/-h/ ou <option/--help/ ne soit donne, l'une des -commandes suivantes doit tre prsente : - - <VariableList> - <VarListEntry><term>packages</term> - <ListItem><Para> -La commande <literal/packages/ cre un fichier  Packages  partir d'une -arborescence. Elle recherche rcursivement travers le rpertoire donn -les fichiers .deb et, pour chaque fichier trouv, envoie une entre pour ce -paquet sur la sortie standard. Cette commande est approximativement -quivalente &dpkg-scanpackages;. - <para> -On peut se servir de l'option <option/--db/ pour demander un cache binaire. - </VarListEntry> - - <VarListEntry><term>sources</term> - <ListItem><Para> -La commande <literal/sources/ cre un index des sources partir d'une -arborescence. Elle recherche rcursivement travers le rpertoire donn -les fichiers .dsc et, pour chaque fichier trouv, envoie une entre pour ce -paquet sur la sortie standard. Cette commande est approximativement -quivalente &dpkg-scansources;. - <para> -Quand on prcise un fichier  override , c'est un fichier source -avec une extension .src qui est recherch. On peut se servir de l'option -<option/--source-override/ pour changer de fichier source d' override . - </VarListEntry> - - <VarListEntry><term>contents</term> - <ListItem><Para> -La commande <literal/contents/ cre un fichier  Contents  partir d'une -arborescence. Elle recherche rcursivement travers le rpertoire donn -les fichiers .deb et, pour chaque fichier trouv, lit la liste des -fichiers. Elle trie la liste des fichiers correspondant des paquets et -l'envoie sur la sortie standard. Les rpertoires ne font pas partie du -rsultat. Quand un fichier appartient plusieurs paquets, une virgule -spare les paquets. - <para> -On peut se servir de l'option <option/--db/ pour demander un cache binaire. - </VarListEntry> - - <VarListEntry><term>generate</term> - <ListItem><Para> -La commande <literal/generate/ est conue pour tre excutable par le -programme cron et elle cre un index en suivant le fichier de configuration -donn. Le langage de configuration fournit un moyen souple de prciser -index et rpertoires aussi bien que les paramtres requis. - </VarListEntry> - - <VarListEntry><term>clean</term> - <ListItem><Para> -La commande <literal/clean/ range les bases de donnes utilises par le -fichier de configuration en supprimant les enregistrements qui ne sont -plus ncessaires. - </VarListEntry> - </VariableList> - - </RefSect1> - - <RefSect1><Title>Configuration de la commande generate</> - <para> -La commande <literal/generate/ utilise un fichier de configuration pour -dcrire l'archive qui va tre cre. Le format de ce fichier est le format -ISC classique utilis par des outils ISC comme bind 8 et dhcpd. &apt-conf; -dcrit ce format. Il faut noter que l'analyse de ce fichier se fait -par section tandis que celle d'&apt-conf; se fait par arborescence. Cela -n'affecte que l'usage de l'tiquette de vise (scope tag). - - <para> -Ce fichier de configuration possde quatre sections, dcrites ci-dessous. - - <refsect2><title>La section Dir</> - <Para> -La section <literal/Dir/ dfinit les rpertoires standards o situer les -fichiers ncessaires au processus de cration. Ces rpertoires sont -prcds de chemins relatifs dfinis dans les sections suivantes de manire - produire un chemin absolu et complet. - <VariableList> - <VarListEntry><term>ArchiveDir</term> - <ListItem><Para> -Indique la racine de l'archive FTP ; Pour une configuration Debian -classique, -c'est le rpertoire qui contient le fichier <filename/ls-LR/, et les noeuds -des distributions. - </VarListEntry> - - <VarListEntry><term>OverrideDir</term> - <ListItem><Para> -Indique l'emplacement des fichiers d' override . - </VarListEntry> - - <VarListEntry><term>CacheDir</term> - <ListItem><Para> -Indique l'emplacement des fichiers de cache. - </VarListEntry> - - <VarListEntry><term>FileListDir</term> - <ListItem><Para> -Indique l'emplacement des fichiers contenant la liste des fichiers (si on se -sert de la valeur <literal/FileList/ dfinie plus bas). - </VarListEntry> - </VariableList> - </refsect2> - - <refsect2><title>La section Default</> - <para> -La section <literal/Default/ prcise les valeurs par dfaut et les paramtres -qui contrlent la marche du gnrateur. Ces valeurs peuvent tre annules dans -d'autres sections (paramtrage par section). - <VariableList> - <VarListEntry><term>Packages::Compress</term> - <ListItem><Para> -Indique comment sont compresss les fichiers d'index. C'est une chane qui -contient des valeurs spares par des espaces ; elle contient au moins -l'une des valeurs suivantes :  .  (pas de compression), - gzip ,  bzip2 . -Par dfaut, c'est la chane  . gzip . - </VarListEntry> - - <VarListEntry><term>Packages::Extensions</term> - <ListItem><Para> -Indique la liste par dfaut des extensions de fichier qui constituent des -paquets. Par dfaut, c'est  .deb . - </VarListEntry> - - <VarListEntry><term>Sources::Compress</term> - <ListItem><Para> -Identique <literal/Packages::Compress/ mais prcise comment sont compresss -les fichiers sources. - </VarListEntry> - - <VarListEntry><term>Sources::Extensions</term> - <ListItem><Para> -Indique la liste par dfaut des extensions de fichier qui constituent des -fichiers sources. Par dfaut, c'est  .dsc . - </VarListEntry> - - <VarListEntry><term>Contents::Compress</term> - <ListItem><Para> -Identique <literal/Packages::Compress/ mais prcise comment sont compresss -les fichiers  Contents . - </VarListEntry> - - <VarListEntry><term>DeLinkLimit</term> - <ListItem><Para> -Indique le nombre de kilooctets dlier (et remplacer par des liens en dur) -pour chaque excution. On s'en sert, pour chaque section, avec le paramtre -<literal/External-Links/. - </VarListEntry> - - <VarListEntry><term>FileMode</term> - <ListItem><Para> -Indique le systme de permissions des fichiers d'index crs. Par dfaut, -c'est le mode 0644. Tous les fichiers d'index ont ce mode et le masque -utilisateur (umasq) est ignor. - </VarListEntry> - </VariableList> - </refsect2> - - <refsect2><title>La section TreeDefault</> - <para> -On indique les valeurs par dfaut particulires la section - Tree . Toutes ces variables sont des variables de -substitution ; les chanes $(DIST), -$(SECTION) et $(ARCH) sont remplaces par leur valeur respective. - - <VariableList> - <VarListEntry><term>MaxContentsChange</term> - <ListItem><Para> -Indique le nombre de kilooctets de fichiers  Contents  qui sont -crs chaque jour. Les fichiers  Contents  sont tirs au sort -selon le systme <emphasis>round-robin</emphasis> de manire que, sur -plusieurs jours, tous soient reconstruits. - </VarListEntry> - - <VarListEntry><term>ContentsAge</term> - <ListItem><Para> -Contrle le nombre de jours pendant lequel un fichier  Contents  -peut tre utilis sans actualisation. Quand cette limite est franchie, -le  mtime  du fichier  Contents  est mis jour. Cela -peut arriver quand un fichier est modifi sans que cela modifie le fichier - Contents  (modification par  override  par exemple). -Un dlai est permis dans l'espoir que de nouveaux  .deb  seront -installs, exigeant un nouveau  Contents . Par -dfaut ce nombre vaut 10, l'unit tant le jour. - </VarListEntry> - - <VarListEntry><term>Directory</term> - <ListItem><Para> -Indique la racine de l'arborescence des  .deb . Par dfaut, c'est -<filename>$(DIST)/$(SECTION)/binary-$(ARCH)/</>. - </VarListEntry> - - <VarListEntry><term>Packages</term> - <ListItem><Para> -Indique le fichier  Packages  cr. Par dfaut, c'est -<filename>$(DIST)/$(SECTION)/binary-$(ARCH)/Packages</>. - </VarListEntry> - - <VarListEntry><term>Sources</term> - <ListItem><Para> -Indique le fichier  Packages  cre. Par dfaut, c'est -<filename>$(DIST)/$(SECTION)/source/Sources</>. - </VarListEntry> - - <VarListEntry><term>InternalPrefix</term> - <ListItem><Para> -Indique un prfixe de chemin ; ce prfixe fait qu'un lien symbolique sera -considr comme un lien interne plutt que comme un lien externe. Par dfaut, -c'est <filename>$(DIST)/$(SECTION)/</>. - </VarListEntry> - - <VarListEntry><term>Contents</term> - <ListItem><Para> -Indique le fichier  Contents  cr. Par dfaut, c'est -<filename>$(DIST)/Contents-$(ARCH)</>. Quand le paramtrage fait que -diffrents fichiers  Packages  se rfrent un seul fichier - Contents , <command/apt-ftparchive/ les intgre automatiquement. - </VarListEntry> - - <VarListEntry><term>Contents::Header</term> - <ListItem><Para> -Indique l'en-tte prfixer au fichier  Contents  cr. - </VarListEntry> - - <VarListEntry><term>BinCacheDB</term> - <ListItem><Para> -Indique la base de donnes binaire servant de cache pour cette section. -Diffrentes sections peuvent partager cette base de donnes. - </VarListEntry> - - <VarListEntry><term>FileList</term> - <ListItem><Para> -Indique qu'au lieu de lire l'arborescence, <command/apt-ftparchive/ doit lire -la liste de fichiers dans le fichier donn en argument. Les noms relatifs -sont prfixs par le rpertoire de l'archive. - </VarListEntry> - - <VarListEntry><term>SourceFileList</term> - <ListItem><Para> -Indique qu'au lieu de lire l'arborescence, <command/apt-ftparchive/ doit lire -la liste de fichiers dans le fichier donn en argument. Les noms relatifs -sont prfixs par le rpertoire de l'archive. On s'en sert pour traiter les -index de sources. - </VarListEntry> - </VariableList> - </refsect2> - - <refsect2><title>La section Tree</> - <para> -La section <literal/Tree/ dfinit une arborescence debian classique avec -un rpertoire de base, diffrentes sections dans ce rpertoire et -diffrentes architectures dans chaque section. Le chemin exact est dfini -par la variable de substitution <literal/Directory/. - <para> -La section <literal/Tree/ accepte une tiquette de vise (scope tag) qui -dtermine la variable <literal/$(DIST)/ et la racine de l'arborescence -(le chemin est prfix par <literal/ArchiveDir/). C'est par exemple : -<filename>dists/woody</>. - <para> -Tous les paramtres dfinis dans la section <literal/TreeDefault/ peuvent -s'utiliser dans la section <literal/Tree/ ainsi que les trois nouvelles -variables suivantes. - <para> -Quand il excute la section <literal/Tree/, <command/apt-ftparchive/ -agit ainsi : -<informalexample><programlisting> -for i in Sections do - for j in Architectures do - Generate for DIST=scope SECTION=i ARCH=j -</programlisting></informalexample> - - <VariableList> - <VarListEntry><term>Sections</term> - <ListItem><Para> -C'est une liste de sections spares par des espaces qui appartiennent une -distribution ; classiquement, on trouve <literal/main contrib non-free/. - </VarListEntry> - - <VarListEntry><term>Architectures</term> - <ListItem><Para> -C'est une liste de toutes les architectures qui appartiennent chaque -section. L'architecture spciale  source  indique que -l'arborescence est une arborescence de sources. - </VarListEntry> - - <VarListEntry><term>BinOverride</term> - <ListItem><Para> -Indique le fichier binaire d' override . le fichier d' override  contient -des informations sur la section, la priorit et le responsable de paquet. - </VarListEntry> - - <VarListEntry><term>SrcOverride</term> - <ListItem><Para> -Indique le fichier source d' override . Le fichier -d' override  contient des informations sur la section. - </VarListEntry> - - <VarListEntry><term>ExtraOverride</term> - <ListItem><Para> -Indique le fichier supplmentaire d' override  pour les binaires. - </VarListEntry> - - <VarListEntry><term>SrcExtraOverride</term> - <ListItem><Para> - Indique le fichier supplmentaire d' override  pour les sources. - </VarListEntry> - - </VariableList> - </refsect2> - - <refsect2><title>La section BinDirectory</> - <para> -La section <literal/bindirectory/ dfinit une arborescence binaire sans -structure particulire. L'tiquette de vise (scope tag) indique l'emplacement -du rpertoire binaire et le paramtrage est identique celui pour la -section <literal/Tree/ sans substitution de variables ou au paramtrage de -<literal>Section</><literal>Architecture</>. - <VariableList> - <VarListEntry><term>Packages</term> - <ListItem><Para> -Indique le fichier  Packages  cr. - </VarListEntry> - - <VarListEntry><term>SrcPackages</term> - <ListItem><Para> -Indique le fichier  Sources  cr. L'un des deux fichiers, -<literal/Packages/ ou <literal/SrcPackages/ est ncessaire. - </VarListEntry> - - <VarListEntry><term>Contents</term> - <ListItem><Para> -Indique le fichier  Contents  cr. - </VarListEntry> - - <VarListEntry><term>Binoverride</term> - <ListItem><Para> -Indique le fichier d' override  pour les binaires. - </VarListEntry> - - <VarListEntry><term>SrcOverride</term> - <ListItem><Para> -Indique le fichier d' override  pour les sources. - </VarListEntry> - <VarListEntry><term>ExtraOverride</term> - <ListItem><Para> -Indique le fichier supplmentaire d' override  pour les binaires. - </VarListEntry> - - <VarListEntry><term>SrcExtraOverride</term> - <ListItem><Para> -Indique le fichier supplmentaire d' override  pour les sources. - </VarListEntry> - - <VarListEntry><term>BinCacheDB</term> - <ListItem><Para> -Indique une base de donnes cache. - </VarListEntry> - - <VarListEntry><term>PathPrefix</term> - <ListItem><Para> -Ajoute un chemin tous les chemins crs. - </VarListEntry> - - <VarListEntry><term>FileList, SourceFileList</term> - <ListItem><Para> -Indique le fichier contenant la liste des fichiers. - </VarListEntry> - </VariableList> - </refsect2> - </RefSect1> - - <RefSect1><Title>Le fichier d' Override  pour les binaires.</> - <para> -Le fichier d' Override  est pleinement compatible avec -&dpkg-scanpackages;. Il contient quatre champs spars par des espaces. Le -premier est le nom du paquet ; le deuxime est la priorit donner ce -paquet ; le troisime est sa section et le dernier champ est un champ -pour changer le nom du responsable de paquet. - <para> -Le champ du responsable est de cette forme : - <literallayout>old [// oldn]* => new</literallayout> - ou simplement, - <literallayout>new</literallayout> -La premire forme permet de spcifier de vieilles adresses dans une liste (le -sparateur est la double barre oblique). Si l'une de ces deux formes est -rencontre, la valeur de new remplace la valeur du champ. La deuxime forme -remplace inconditionnellement le champ. - </RefSect1> - - <RefSect1><title>Le fichier d' Override  pour les sources</> - <para> -Le fichier d' Override  est pleinement compatible avec -&dpkg-scansources;. Il contient deux champs. Le premier est le nom du paquet -source ; le second, sa section. - </RefSect1> - - <RefSect1><title>Le fichier supplmentaire d' Override </> - <para> -Le fichier supplmentaire d' Override  permet d'ajouter ou de -remplacer des tiquettes sur la sortie. Il possde trois colonnes : -la premire reprsente le paquet, la seconde est une tiquette et la -troisime en fin de ligne est la nouvelle valeur. - </RefSect1> - - <RefSect1><Title>Les options</> - &apt-cmdblurb; - - <VariableList> - <VarListEntry><term><option/--md5/</> - <ListItem><Para> -Crer la somme de contrle MD5. Cette option est active par dfaut. Quand -elle est dsactive, les fichiers d'index n'ont pas les champs MD5Sum l o -c'est possible. -lment de configuration : <literal/APT::FTPArchive::MD5/. - </VarListEntry> - - <VarListEntry><term><option/-d/</><term><option/--db/</> - <ListItem><Para> -Utiliser une base de donnes binaire pour cache. Cela n'a aucun effet sur la -commande generate. -lment de configuration : <literal/APT::FTPArchive::DB/. - </VarListEntry> - - <VarListEntry><term><option/-q/</><term><option/--quiet/</> - <ListItem><Para> -Mode silencieux ; cette commande produit une sortie destine -l'enregistrement dans un fichier-journal en omettant les indicateurs de -progression. Un plus grand nombre de  q  (2 au plus) produit un -plus grand silence. -On peut aussi utiliser <option/-q=#/ pour positionner le niveau de silence, -et annuler le fichier de configuration. -lment de configuration : <literal/quiet/. - </VarListEntry> - - <VarListEntry><term><option/--delink/</> - <ListItem><Para> -Faire une dliaison. Si <literal/External-Links/ est activ, cette option -permet rellement la dliaison des fichiers. Par dfaut, elle est active mais -elle peut tre dsactive avec l'option <option/--no-delink/. -lment de configuration : <literal/APT::FTPArchive::DeLinkAct/. - </VarListEntry> - - <VarListEntry><term><option/--contents/</> - <ListItem><Para> -Permettre la cration d'un fichier  Contents . Quand cette option -est active et que les index sont crs sous forme de base de donnes binaire, -la liste des fichiers est aussi extraite et conserve dans la base de donnes -pour un usage futur. Avec la commande generate, cette option permet la -cration de fichiers  Contents . Par dfaut, elle est active. -lment de configuration : <literal/APT::FTPArchive::Contents/. - </VarListEntry> - - <VarListEntry><term><option/-s/</><term><option/--source-override/</> - <ListItem><Para> -Indique le fichier d' override  utiliser avec la commande -<literal/sources/. -lment de configuration : <literal/APT::FTPArchive::SourceOverride/. - </VarListEntry> - - <VarListEntry><term><option/--readonly/</> - <ListItem><Para> -N'autoriser que la lecture pour les bases de donnes de cache. -lment de configuration : <literal/APT::FTPArchive::ReadOnlyDB/. - </VarListEntry> - - &apt-commonoptions; - - </VariableList> - </RefSect1> - - <RefSect1><Title>Voir aussi</> - <para> - &apt-conf; - </RefSect1> - - <RefSect1><Title>Diagnostics</> - <para> -<command/apt-ftparchive/ retourne zro si tout se passe bien, le nombre -dcimal 100 en cas d'erreur. - </RefSect1> - - &manbugs; - &manauthor; - &traducteur; -</refentry> diff --git a/doc/fr/apt-ftparchive.fr.1.xml b/doc/fr/apt-ftparchive.fr.1.xml new file mode 100644 index 000000000..61cdfa2ec --- /dev/null +++ b/doc/fr/apt-ftparchive.fr.1.xml @@ -0,0 +1,631 @@ +<?xml version="1.0" encoding="iso-8859-15" standalone="no"?> +<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" + "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ + +<!ENTITY % aptent SYSTEM "apt.ent.fr"> +%aptent; + +]> + +<refentry lang="fr"> + + <refentryinfo> + &apt-author.jgunthorpe; + &apt-author.team; + &apt-email; + &apt-product; + <!-- The last update date --> + <date>29 Fvrier 2004</date> + </refentryinfo> + +<refmeta> +<refentrytitle>apt-ftparchive</refentrytitle> +<manvolnum>1</manvolnum> +</refmeta> + +<refnamediv><refname>apt-ftparchive</refname> +<refpurpose>Un outil pour crer des index + </refpurpose> +</refnamediv> + +<refsynopsisdiv> +<cmdsynopsis> +<command>apt-ftparchive</command> +<arg><option>-hvdsq</option></arg><arg> +<option>--md5</option></arg><arg> +<option>--delink</option></arg> +<arg><option>--readonly</option></arg> +<arg><option>--contents</option></arg> +<arg><option>-o=<replaceable>option de configuration</replaceable></option></arg> +<arg><option>-c=<replaceable>fichier</replaceable></option></arg> +<group choice="req"> +<arg>packages<arg choice="plain" rep="repeat"><replaceable>chemin</replaceable></arg><arg><replaceable>override</replaceable><arg><replaceable>prfixe-de-chemin</replaceable></arg></arg></arg> +<arg>sources<arg choice="plain" rep="repeat"><replaceable>chemin</replaceable></arg><arg><replaceable>override</replaceable><arg><replaceable>prfixe-de-chemin</replaceable></arg></arg></arg> +<arg>contents <arg choice="plain"><replaceable>chemin</replaceable></arg></arg> +<arg>release <arg choice="plain"><replaceable>chemin</replaceable></arg></arg> +<arg>generate <arg choice="plain"><replaceable>fichier-de-configuration</replaceable></arg><arg choice="plain" rep="repeat"><replaceable>section</replaceable></arg></arg> +<arg>clean <arg choice="plain"><replaceable>fichier-de-configuration</replaceable></arg></arg> +</group> +</cmdsynopsis> +</refsynopsisdiv> + +<refsect1><title>Description + +apt-ftparchive est l'outil en ligne de commande qui cre les index +dont APT se sert pour accder aux sources des distributions. Un index doit +tre cr pour un site et bas sur le contenu de ce site. + +apt-ftparchive est un ensemble comprenant le programme +&dpkg-scanpackages; et toutes ses fonctionnalits via la commande +packages ; il comprend aussi un gnrateur de fichier + Contents , la commande contents, et une technique +labore pour  scripter  le processus de cration d'une archive +complte. + + +Apt-ftparchive peut utiliser lui-mme des bases de donnes binaires +pour  cacher  le contenu d'un fichier .deb ; il n'a pas +besoin de programmes extrieurs, sauf &gzip;. Lors d'une excution, il +vrifie les changements dans les fichiers et cre les fichiers compresss +voulus. + + + moins que l'option ou ne soit donne, l'une des +commandes suivantes doit tre prsente : + + +packages + +La commande packages cre un fichier  Packages  partir d'une +arborescence. Elle recherche rcursivement travers le rpertoire donn +les fichiers .deb et, pour chaque fichier trouv, envoie une entre pour ce +paquet sur la sortie standard. Cette commande est approximativement +quivalente &dpkg-scanpackages;. + + +On peut se servir de l'option pour demander un cache binaire. + + + +sources + +La commande sources cre un index des sources partir d'une +arborescence. Elle recherche rcursivement travers le rpertoire donn +les fichiers .dsc et, pour chaque fichier trouv, envoie une entre pour ce +paquet sur la sortie standard. Cette commande est approximativement +quivalente &dpkg-scansources;. + + +Quand on prcise un fichier  override , c'est un fichier source +avec une extension .src qui est recherch. On peut se servir de l'option + pour changer de fichier source d' override . + + + +contents + +La commande contents cre un fichier  Contents  partir d'une +arborescence. Elle recherche rcursivement travers le rpertoire donn +les fichiers .deb et, pour chaque fichier trouv, lit la liste des +fichiers. Elle trie la liste des fichiers correspondant des paquets et +l'envoie sur la sortie standard. Les rpertoires ne font pas partie du +rsultat. Quand un fichier appartient plusieurs paquets, une virgule +spare les paquets. + +On peut se servir de l'option pour demander un cache binaire. + + + + release + +La commande release cre un fichier Releases partir +d'un rpertoire. Elle cherche rcursivement dans ce rpertoire les +fichiers Packages, Packages.gz, Packages.bz2, Sources, Sources.gz, +Sources.bz2, Release et md5sum.txt. Elle envoie alors un fichier Release +sur la sortie standard avec un rsum MD5 et un rsum SHA1 pour chaque +fichier. + + +La valeur des autres champs du fichier Release est tire de la valeur +correspondante dans APT::FTPArchive::Release, +p. ex. APT::FTPArchive::Release::Origin. Les champs reconnus +sont : Origin, Label, Suite, +Version, Codename, Date, +Architectures, Components, +Description. + + + + +generate + +La commande generate est conue pour tre excutable par le +programme cron et elle cre un index en suivant le fichier de configuration +donn. Le langage de configuration fournit un moyen souple de prciser +index et rpertoires aussi bien que les paramtres requis. + + + +clean + +La commande clean range les bases de donnes utilises par le +fichier de configuration en supprimant les enregistrements qui ne sont +plus ncessaires. + + + + + + +Configuration de la commande generate + +La commande generate utilise un fichier de configuration pour +dcrire l'archive qui va tre cre. Le format de ce fichier est le format +ISC classique utilis par des outils ISC comme bind 8 et dhcpd. Le fichier &apt-conf; +dcrit ce format. Il faut noter que l'analyse de ce fichier se fait +par section tandis que celle d'&apt-conf; se fait par arborescence. Cela +n'affecte que l'usage de l'tiquette de vise (scope tag). + + +Ce fichier de configuration possde quatre sections, dcrites ci-dessous. + + +La section Dir + +La section Dir dfinit les rpertoires standards o situer les +fichiers ncessaires au processus de cration. Ces rpertoires sont +prcds de chemins relatifs dfinis dans les sections suivantes de manire + produire un chemin absolu et complet. + + +ArchiveDir + +Indique la racine de l'archive FTP ; Pour une configuration Debian +classique, +c'est le rpertoire qui contient le fichier ls-LR et les noeuds +des distributions. + + +OverrideDir + +Indique l'emplacement des fichiers d' override . + + +CacheDir + +Indique l'emplacement des fichiers de cache. + + +FileListDir + +Indique l'emplacement des fichiers contenant la liste des fichiers (si on se +sert de la valeur FileList dfinie plus bas). + + + + + +La section Default + +La section Default prcise les valeurs par dfaut et les paramtres +qui contrlent la marche du gnrateur. Ces valeurs peuvent tre annules dans +d'autres sections (paramtrage par section). + + +Packages::Compress + +Indique comment sont compresss les fichiers d'index. C'est une chane qui +contient des valeurs spares par des espaces ; elle contient au moins +l'une des valeurs suivantes :  .  (pas de compression), + gzip ,  bzip2 . +Par dfaut, c'est la chane  . gzip . + + +Packages::Extensions + +Indique la liste par dfaut des extensions de fichier qui constituent des +paquets. Par dfaut, c'est  .deb . + + +Sources::Compress + +Identique Packages::Compress mais prcise comment sont compresss +les fichiers sources. + + +Sources::Extensions + +Indique la liste par dfaut des extensions de fichier qui constituent des +fichiers sources. Par dfaut, c'est  .dsc . + + +Contents::Compress + +Identique Packages::Compress mais prcise comment sont compresss +les fichiers  Contents . + + +DeLinkLimit + +Indique le nombre de kilooctets dlier (et remplacer par des liens en dur) +pour chaque excution. On s'en sert, pour chaque section, avec le paramtre +External-Links. + + +FileMode + +Indique le systme de permissions des fichiers d'index crs. Par dfaut, +c'est le mode 0644. Tous les fichiers d'index ont ce mode et le masque +utilisateur (umasq) est ignor. + + + + + +La section TreeDefault + +On indique les valeurs par dfaut particulires la section +Tree. Toutes ces variables sont des variables de +substitution ; les chanes $(DIST), +$(SECTION) et $(ARCH) sont remplaces par leur valeur respective. + + +MaxContentsChange + +Indique le nombre de kilooctets de fichiers  Contents  qui sont +crs chaque jour. Les fichiers  Contents  sont tirs au sort +selon le systme round-robin de manire que, sur +plusieurs jours, tous soient reconstruits. + + +ContentsAge + +Contrle le nombre de jours pendant lequel un fichier  Contents  +peut tre utilis sans actualisation. Quand cette limite est franchie, +le  mtime  du fichier  Contents  est mis jour. Cela +peut arriver quand un fichier est modifi sans que cela modifie le fichier + Contents  (modification par  override  par exemple). +Un dlai est permis dans l'espoir que de nouveaux  .deb  seront +installs, exigeant un nouveau  Contents . Par +dfaut ce nombre vaut 10, l'unit tant le jour. + + +Directory + +Indique la racine de l'arborescence des  .deb . Par dfaut, c'est +$(DIST)/$(SECTION)/binary-$(ARCH)/. + + + + SrcDirectory + + Indique la racine de l'arborescence des paquets source. Par dfaut, c'est + $(DIST)/$(SECTION)/source/. + + + +Packages + +Indique le fichier  Packages  cr. Par dfaut, c'est +$(DIST)/$(SECTION)/binary-$(ARCH)/Packages. + + + +Sources + +Indique le fichier  Packages  cre. Par dfaut, c'est +$(DIST)/$(SECTION)/source/Sources. + + + +InternalPrefix +Indique un prfixe de chemin ; ce prfixe fait qu'un lien symbolique sera +considr comme un lien interne plutt que comme un lien externe. Par dfaut, +c'est $(DIST)/$(SECTION)/. + + + +Contents + +Indique le fichier  Contents  cr. Par dfaut, c'est +$(DIST)/Contents-$(ARCH). Quand le paramtrage fait que +diffrents fichiers  Packages  se rfrent un seul fichier + Contents , apt-ftparchive les intgre automatiquement. + + + +Contents::Header + +Indique l'en-tte prfixer au fichier  Contents  cr. + + + +BinCacheDB + +Indique la base de donnes binaire servant de cache pour cette section. +Diffrentes sections peuvent partager cette base de donnes. + + +FileList + +Indique qu'au lieu de lire l'arborescence, apt-ftparchive doit lire +la liste de fichiers dans le fichier donn en argument. Les noms relatifs +sont prfixs par le rpertoire de l'archive. + + +SourceFileList + +Indique qu'au lieu de lire l'arborescence, apt-ftparchive doit lire +la liste de fichiers dans le fichier donn en argument. Les noms relatifs +sont prfixs par le rpertoire de l'archive. On s'en sert pour traiter les +index de sources. + + + + + + +La section Tree + +La section Tree dfinit une arborescence debian classique avec +un rpertoire de base, diffrentes sections dans ce rpertoire et +diffrentes architectures dans chaque section. Le chemin exact est dfini +par la variable de substitution Directory. + + +La section Tree accepte une tiquette de vise (scope tag) qui +dtermine la variable $(DIST) et la racine de l'arborescence +(le chemin est prfix par ArchiveDir). C'est par exemple : +dists/woody. + +Tous les paramtres dfinis dans la section TreeDefault peuvent +s'utiliser dans la section Tree ainsi que les trois nouvelles +variables suivantes. + + +Quand il excute la section Tree, apt-ftparchive +agit ainsi : + +for i in Sections do + for j in Architectures do + Generate for DIST=scope SECTION=i ARCH=j + + + + +Sections + +C'est une liste de sections spares par des espaces qui appartiennent une +distribution ; classiquement, on trouve main contrib non-free. + + + +Architectures + +C'est une liste de toutes les architectures qui appartiennent chaque +section. L'architecture spciale  source  indique que +l'arborescence est une arborescence de sources. + + + +BinOverride + +Indique le fichier binaire d' override . Ce fichier contient +des informations sur la section, la priorit et le responsable du paquet. + + + +SrcOverride + +Indique le fichier source d' override . Ce fichier +contient des informations sur la section. + + + +ExtraOverride + +Indique un autre fichier d' override  pour les binaires. + + + +SrcExtraOverride + +Indique un autre fichier d' override  pour les sources. + + + + + +La section BinDirectory + +La section bindirectory dfinit une arborescence binaire sans +structure particulire. L'tiquette de vise (scope tag) indique l'emplacement +du rpertoire binaire et le paramtrage est identique celui pour la +section Tree sans substitution de variables ou au paramtrage de +SectionArchitecture. + + +Packages + +Indique le fichier  Packages  cr. + + + +SrcPackages + +Indique le fichier  Sources  cr. L'un des deux fichiers, +Packages ou SrcPackages est ncessaire. + + + +Contents + +Indique le fichier  Contents  cr. + + +Binoverride + +Indique le fichier d' override  pour les binaires. + + + +SrcOverride + +Indique le fichier d' override  pour les sources. + + + +ExtraOverride + +Indique un autre fichier d' override  pour les binaires. + + + +SrcExtraOverride + +Indique un autre fichier d' override  pour les sources. + + + +BinCacheDB + +Indique une base de donnes cache. + + + +PathPrefix + +Ajoute un chemin tous les chemins crs. + + +FileList, SourceFileList + +Indique le fichier contenant la liste des fichiers. + + + + + + +Le fichier d' Override  pour les binaires. + +Le fichier d' Override  est pleinement compatible avec +&dpkg-scanpackages;. Il contient quatre champs spars par des espaces. Le +premier est le nom du paquet ; le deuxime est la priorit donner ce +paquet ; le troisime est sa section et le dernier champ est un champ +pour changer le nom du responsable de paquet. + +Le champ du responsable est de cette forme : + old [// oldn]* => new + ou simplement, + new +La premire forme permet de spcifier de vieilles adresses dans une liste (le +sparateur est la double barre oblique). Si l'une de ces deux formes est +rencontre, la valeur de new remplace la valeur du champ. La deuxime forme +remplace inconditionnellement le champ. + + + +Le fichier d' Override  pour les sources + +Le fichier d' Override  est pleinement compatible avec +&dpkg-scansources;. Il contient deux champs. Le premier est le nom du paquet +source ; le second, sa section. + + + +Le fichier supplmentaire d' Override  + +Le fichier supplmentaire d' Override  permet d'ajouter ou de +remplacer des tiquettes sur la sortie. Il possde trois colonnes : +la premire reprsente le paquet, la seconde est une tiquette et la +troisime en fin de ligne est la nouvelle valeur. + + + +Les options +&apt-cmdblurb; + + + + +Crer la somme de contrle MD5. Cette option est active par dfaut. Quand +elle est dsactive, les fichiers d'index n'ont pas les champs MD5Sum l o +c'est possible. +lment de configuration : APT::FTPArchive::MD5. + + + + + +Utiliser une base de donnes binaire pour cache. Cela n'a aucun effet sur la +commande generate. +lment de configuration : APT::FTPArchive::DB. + + + + + +Mode silencieux ; cette commande produit une sortie destine +l'enregistrement dans un fichier-journal en omettant les indicateurs de +progression. Un plus grand nombre de  q  (2 au plus) produit un +plus grand silence. +On peut aussi utiliser pour positionner le niveau de silence, +et annuler le fichier de configuration. +lment de configuration : quiet. + + + + + +Faire une dliaison. Si External-Links est activ, cette option +permet rellement la dliaison des fichiers. Par dfaut, elle est active mais +elle peut tre dsactive avec l'option . +lment de configuration : APT::FTPArchive::DeLinkAct. + + + + + +Permettre la cration d'un fichier  Contents . Quand cette option +est active et que les index sont crs sous forme de base de donnes binaire, +la liste des fichiers est aussi extraite et conserve dans la base de donnes +pour un usage futur. Avec la commande generate, cette option permet la +cration de fichiers  Contents . Par dfaut, elle est active. +lment de configuration : APT::FTPArchive::Contents. + + + + + +Indique le fichier d' override  utiliser avec la commande +sources. +lment de configuration : APT::FTPArchive::SourceOverride. + + + +N'autoriser que la lecture pour les bases de donnes de cache. +lment de configuration : APT::FTPArchive::ReadOnlyDB. + + + +&apt-commonoptions; + + + +Voir aussi +&apt-conf; + + + +Diagnostics + +apt-ftparchive retourne zro si tout se passe bien, le nombre +dcimal 100 en cas d'erreur. + + + +&manbugs; +&traducteur; + + \ No newline at end of file diff --git a/doc/fr/apt-get.fr.8.sgml b/doc/fr/apt-get.fr.8.sgml deleted file mode 100644 index c71a02c38..000000000 --- a/doc/fr/apt-get.fr.8.sgml +++ /dev/null @@ -1,517 +0,0 @@ - - - -%aptent; - -]> - - - &apt-docinfo; - - - apt-get - 8 - - - - - apt-get - Utilitaire d'APT pour la manipulation de paquets -- interface en ligne de commande. - - - - - - apt-get - - - - - update - upgrade - dselect-upgrade - install paquet - remove paquet - source paquet - build-dep paquet - check - clean - autoclean - - - - - Description</> - <para> - <command/apt-get/ est l'outil en ligne de commande pour manipuler les -paquets. Il peut tre considr par l'utilisateur comme un gnrateur de -sortie pour les autres outils de la bibliothque APT. - <para> - moins que l'option <option/-h/, ou <option/--help/ ne soit donne, l'une des -commandes suivantes doit tre prsente. - - <VariableList> - <VarListEntry><Term>update</Term> - <ListItem><Para> -La commande <literal/update/ permet de resynchroniser un fichier rpertoriant -les paquets disponibles et sa source. Ces fichiers sont rcuprs aux -endroits spcifis dans <filename>/etc/apt/sources.list</>. Ainsi, lorsqu'on -utilise une archive Debian, cette commande rcupre les fichiers -<filename>Packages.gz</> et les analyse de manire rendre disponibles -les informations concernant les nouveaux paquets et les paquets mis jour. -On doit toujours excuter une commande <literal/update/ avant les commandes -<literal/upgrade/ ou <literal/dist-upgrade/. Il faut savoir que l'indicateur -de progression d'ensemble n'est pas correct puisque la taille de ces fichiers -ne peut tre connue l'avance. - </VarListEntry> - - <VarListEntry><Term>upgrade</Term> - <ListItem><Para> -La commande <literal/upgrade/ permet d'installer les versions les plus -rcentes de tous les paquets prsents sur le sytme en utilisant les -sources numres dans <filename>/etc/apt/sources.list</>. Les paquets -installs dont il existe de nouvelles versions sont rcuprs et mis -niveau. En aucun cas des paquets dj installs ne sont supprims ; de -mme, des paquets qui ne sont pas dj installs ne sont ni rcuprs ni -installs. Les paquets dont de nouvelles versions ne peuvent pas tre -installes sans changer le statut d'installation d'un autre paquet sont -laisss dans leur version courante. On doit d'abord excuter la commande -<literal/update/ pour que <command/apt-get/ connaisse l'existence de -nouvelles versions des paquets. - </VarListEntry> - - <VarListEntry><Term>dselect-upgrade</Term> - <ListItem><Para> -<literal/dselect-upgrade/ est utilise conjointement avec &dselect;, l'interface -traditionnelle Debian pour la gestion des paquets. -La commande <literal/dselect-upgrade/ suit les modifications faites par -&dselect; dans le champ <literal/Status/ des paquets disponibles, et effectue -les actions ncessaires la ralisation de cet tat (par exemple, -suppression d'anciens paquets, installation de nouveaux paquets). - </VarListEntry> - - <VarListEntry><Term>dist-upgrade</Term> - <ListItem><Para> -La commande <literal/dist-upgrade/ effectue la fonction <literal/upgrade/ en -y ajoutant une gestion intelligente des changements de dpendances dans les -nouvelles versions des paquets ; <command/apt-get/ possde un systme - intelligent  de rsolution des conflits et il essaye, quand c'est -ncessaire, de mettre niveau les paquets les plus importants aux dpens -des paquets les moins importants. Le fichier <filename>/etc/apt/sources.list</> -contient une liste de sources o rcuprer les paquets dsirs. -Voyez aussi &apt-preferences; pour un mcanisme d'annulation des paramtres -d'un simple paquet. - </VarListEntry> - - <VarListEntry><Term>install</Term> - <ListItem><Para> -La commande <literal/install/ est suivie par un ou plusieurs paquets -installer. Chaque paquet est un nom de paquet ; ce n'est pas un nom de -fichier pleinement dtermin (par exemple, dans un systme Debian GNU/Linux, -on indiquera libc6 et non pas <literal>libc6_1.9.6-2.deb</literal>). Tous les -paquets requis par le(s) paquet(s) que l'on veut installer sont aussi -rcuprs et installs. On se sert du fichier -<filename>/etc/apt/sources.list</> pour localiser les paquets dsirs. Quand -un trait d'union est accol (sans espace intermdiaire) au nom d'un paquet -dj install, ce paquet est supprim. De mme on peut ajouter un signe - +  pour dsigner un paquet installer. -Cette dernire fonctionnalit peut tre utilise pour annuler les dcisions -prises par le systme de rsolution des conflits d'apt-get. - <para> -On peut choisir d'installer une version particulire d'un paquet en faisant -suivre son nom par un signe gal et par la version. Cette version sera -localise et l'installation sera demande. On peut aussi choisir une -distribution particulire en faisant suivre le nom du paquet par une barre -oblique et par le nom de la distribution ou de l'archive (stable, testing, -unstable). - <para> -Avec ces possibilits de choisir la version, de vieilles versions d'un paquet -peuvent tre installes. Il faut faire attention. - <para> -Enfin, le mcanisme de &apt-preferences; permet de crer d'autres rgles pour -l'installation des paquets. - <para> -Quand aucun paquet ne correspond l'expression donne en argument et que cette -expression contient l'un des caractres  . ,  ?  ou - * , on considre que c'est une expression rationnelle POSIX et -elle est applique tous les paquets de la base de donnes. Tout paquet -correspondant est install (ou supprim). Notez que la comparaison est -effectue par sous-chane et  lo  correspond aussi bien - how-lo  qu'  lowest . Si vous ne le voulez pas, ancrez -l'expression par un caractre  ^  ou un caractre  $ , -ou bien crez une expression plus prcise. - </VarListEntry> - - <VarListEntry><Term>remove</Term> - <ListItem><Para> -La commande <literal/remove/ est identique la commande <literal/install/ ; -Mais les paquets sont supprims et non pas installs. Quand un signe plus est -accol (sans espace intermdiaire) au nom du paquet, le paquet est install au lieu -d'tre supprim. - </VarListEntry> - - <VarListEntry><Term>source</Term> - <ListItem><Para> -Avec la commande <literal/source/, <command/apt-get/ rcupre des paquets -sources. APT examine les paquets disponibles pour choisir le paquet source - rcuprer. Il trouve ensuite et tlcharge dans le rpertoire courant -la version la plus rcente. Les paquets source sont suivis diffremment que -les paquets binaires, via les lignes de type <literal/deb-src/ dans le fichier -&sources-list;. On n'obtiendra probablement pas les mmes sources que celles -du paquet install ou celles du paquet qu'on pourrait installer. Si l'option -<option>--compile</> est spcifie, le paquet est compil en un binaire .deb -avec <command>dpkg-buildpackage</>. Si <option>--download-only</> est -spcifi, le source n'est pas dcompact. - <para> -De la mme faon qu'avec les paquets binaires, on peut rcuprer une version -particulire d'un paquet source en faisant suivre son nom par un signe gal -et par la version. Cela permet une comparaison exacte entre le nom du paquet -source et la version ; cela lance implicitement la commande -<literal/APT::Get::Only-Source/. - <para> -Notez que les paquets sources ne sont pas suivis comme le sont les paquets -binaires. Ils ne sont prsents que dans le rpertoire courant et sont -semblables des sources tlchargs sous forme de tarball. - </VarListEntry> - - <VarListEntry><Term>build-dep</Term> - <ListItem><Para> -Avec la commande <literal/build-dep/, apt-get installe ou supprime des paquets -dans le but de satisfaire les dpendances de construction d'un paquet source. -Pour l'instant, dans la cas d'un paquet virtuel, un paquet est choisi au -hasard. - </VarListEntry> - - <VarListEntry><Term>check</Term> - <ListItem><Para> -La commande <literal/check/ est un outil de diagnostic ; il met jour -le cache des paquets et cherche des dpendances dfectueuses. - </VarListEntry> - - <VarListEntry><Term>clean</Term> - <ListItem><Para> -La commande <literal/clean/ nettoie le rfrentiel local des paquets -rcuprs. Il supprime tout, except le fichier lock situ dans -<filename>&cachedir;/archives/</> et <filename>&cachedir;/archives/partial/</>. -Quand APT est utilis comme mode de &dselect;, <literal/clean/ est effectu -automatiquement. Quand on n'utilise pas &dselect;, il faut excuter -<literal/apt-get clean/ de temps en temps si l'on veut librer de l'espace -disque. - </VarListEntry> - - <VarListEntry><Term>autoclean</Term> - <ListItem><Para> -Tout comme <literal/clean/, <literal/autoclean/ nettoie le rfrentiel local -des paquets rcuprs. La diffrence est qu'il supprime uniquement les paquets -qui ne peuvent plus tre tlchargs et qui sont grandement inutiles. -On peut ainsi contrler la taille de ce cache sur une longue priode. -Tant qu'elle n'est pas active, l'option de configuration -<literal/APT::Clean-Installed/ empche la suppression de paquets installs. - </VarListEntry> - </VariableList> - </RefSect1> - - <RefSect1><Title>Options</> - &apt-cmdblurb; - - <VariableList> - <VarListEntry><term><option/-d/</><term><option/--download-only/</> - <ListItem><Para> -Rcupration seule ; les paquets sont ramens mais ne sont ni dpaquets -ni installs. lment de configuration : <literal/APT::Get::Download-Only/. - </VarListEntry> - - <VarListEntry><term><option/-f/</><term><option/--fix-broken/</> - <ListItem><Para> -Correction ; essaye de rparer un systme dont les dpendances sont -dfectueuses. Cette option, utilise avec install ou remove, peut omettre -tout paquet de faon permettre APT de dduire une solution viable. -Chaque paquet spcifi doit compltement corriger le problme. Cette option -est quelquefois ncessaire lorsque l'on excute APT pour la premire fois ; -APT lui-mme interdit les dpendances dfectueuses dans un systme. Il est -possible que la structure de dpendances d'un systme soit tellement -corrompue qu'elle requiert une intervention manuelle (ce qui veut dire la -plupart du temps utiliser &dselect; ou <command/dpkg --remove/ pour liminer -les paquets en cause). L'utilisation de cette option conjointement avec -<option>-m</> peut produire une erreur dans certaines situations. -lment de configuration : <literal/APT::Get::Fix-Broken/. - </VarListEntry> - - <VarListEntry><term><option/-m/</><term><option/--ignore-missing/</> - <term><option/--fix-missing/</> - <ListItem><Para> -Ignorer les paquets manquants ; si des paquets ne peuvent tre -rcuprs, ou, aprs rcupration, ne satisfont pas au contrle d'intgrit, -cette commande met ces paquets de ct et gre le rsultat. Utiliser cette -option conjointement avec <option>-f</> peut produire une erreur dans -certaines situations. Quand un paquet, slectionn pour une installation -(particulirement si c'est mentionn en ligne de commande), ne peut tre -rcupr, il est mis silencieusement de ct. lment de configuration : -<literal/APT::Get::Fix-Missing/. - </VarListEntry> - - <VarListEntry><term><option/--no-download/</> - <ListItem><Para> -Pas de rcupration. Le mieux est d'utiliser cette option avec -<option/--ignore-missing/ pour forcer APT n'utiliser que les .deb qu'il a -dj rcuprs. -lment de configuration : <literal/APT::Get::Download/. - </VarListEntry> - - <VarListEntry><term><option/-q/</><term><option/--quiet/</> - <ListItem><Para> -Mode silencieux ; cette commande produit une sortie destine -l'enregistrement dans un fichier-journal en omettant les indicateurs de -progression. Un plus grand nombre de  q  (2 au plus) produit un -plus grand silence. -On peut aussi utiliser <option/-q=#/ pour positionner le niveau de silence, -et annuler le fichier de configuration. Notez qu'un niveau de silence gal 2 -implique <option>-y</> et vous ne devez jamais utiliser <option>-qq</> sans -l'accompagner d'un modificateur tel que <option>-d</>, <option>--print-uris</> - ou <option>-s</> : APT pourrait excuter des actions inattendues ! -lment de configuration : <literal/quiet/. - </VarListEntry> - - <VarListEntry><term><option/-s/</> - <term><option/--simulate/</> - <term><option/--just-print/</> - <term><option/--dry-run/</> - <term><option/--recon/</> - <term><option/--no-act/</> - <ListItem><Para> -Simulation ; cette commande ralise une simulation des actions qui -seraient excutes mais ne modifie pas le systme. -lment de configuration : <literal/APT::Get::Simulate/. - <para> -la simulation affiche une srie de lignes reprsentant chacune une opration -de dpkg, Configure (Conf),Remove (Remv),Unpack (Inst). Les crochets encadrent -des paquets endommags et des crochets n'encadrant rien indiquent que les -dommages n'ont aucune consquence (rare). - </VarListEntry> - - <VarListEntry><term><option/-y/</><term><option/--yes/</> - <term><option/--assume-yes/</> - <ListItem><Para> -Rpond automatiquement oui aux questions ; prsume  oui  -comme rponse toutes les questions et s'excute de manire non interactive. -Dans le cas d'une situation indsirable, comme le changement d'un paquet -gel ou la suppression d'un paquet essentiel, <literal/apt-get/ -s'interrompt. -lment de configuration : <literal/APT::Get::Assume-Yes/. - </VarListEntry> - - <VarListEntry><term><option/-u/</><term><option/--show-upgraded/</> - <ListItem><Para> -Afficher les paquets mis niveau ; affiche une liste de tous les paquets -mettre niveau. lment de configuration : <literal/APT::Get::Show-Upgraded/. - </VarListEntry> - - <VarListEntry><term><option/-V/</><term><option/--verbose-versions/</> - <ListItem><Para> -Afficher les versions compltes des paquets installs ou mis niveau. -lment de configuration : <literal/APT::Get::Show-Versions/. - </VarListEntry> - - - <VarListEntry><term><option/-b/</><term><option/--compile/</> - <term><option/--build/</> - <ListItem><Para> -Cette commande compile un paquet source aprs l'avoir rcupr. -lment de configuration : <literal/APT::Get::Compile/. - </VarListEntry> - - <VarListEntry><term><option/--ignore-hold/</> - <ListItem><Para> -Cette commande ignore la marque  Hold  d'un paquet ; par ce biais, -<command/apt-get/ ignore un  hold  plac sur un paquet. cela peut tre utile -avec <literal/dist-upgrade/ pour annuler un grand nombre de  hold  -indsirables. lment de configuration : <literal/APT::Ignore-Hold/. - </VarListEntry> - - <VarListEntry><term><option/--no-upgrade/</> - <ListItem><Para> -Aucune mise niveau ; quand elle est utilise avec <literal/install/, -cette commande empche les paquets lists sur la ligne de commande d'tre mis - niveau. -lment de configuration : <literal/APT::Get::Upgrade/. - </VarListEntry> - - <VarListEntry><term><option/--force-yes/</> - <ListItem><Para> -Forcer l'acceptation ; cette option est dangereuse parce qu'elle laisse -APT continuer sans poser de questions quand il ralise quelque chose de -potentiellement dommageable. Cette option ne doit tre utilise que dans des -circonstances trs spciales. Utiliser <literal/force-yes/ peut dtruire le systme ! -lment de configuration : <literal/APT::Get::force-yes/. - </VarListEntry> - - <VarListEntry><term><option/--print-uris/</> - <ListItem><Para> -Au lieu d'aller chercher les paquets installer, leurs URI sont affiches. -Chaque URI a un chemin, un nom de fichier destination, une taille et une -cl md5 attendue. Notez que le nom de fichier afficher ne correspond pas -toujours au nom de fichier sur le site distant ! Cette option marche -aussi avec la commande <literal/source/. -lment de configuration : <literal/APT::Get::Print-URIs/. - </VarListEntry> - - <VarListEntry><term><option/--purge/</> - <ListItem><Para> -Utiliser purge la place de remove pour supprimer tout ce qui peut tre -supprim. -Un astrisque (*)sera affich prs des paquets qui vont tre purgs. -lment de configuration : <literal/APT::Get::Purge/. - </VarListEntry> - - <VarListEntry><term><option/--reinstall/</> - <ListItem><Para> -Rinstaller les paquets dj installs avec leur version la plus rcente. -lment de configuration : <literal/APT::Get::ReInstall/. - </VarListEntry> - - <VarListEntry><term><option/--list-cleanup/</> - <ListItem><Para> -Cette option est active par dfaut ; utilisez <literal/--no-list-cleanup/ -pour la dsactiver. Quand elle est active, <command/apt-get/ gre -automatiquement le contenu de <filename>&statedir;/lists</> afin d'assurer -que les fichiers obsoltes sont effacs. La seule raison de la dsactiver -est une modification frquente de votre liste de sources. -lment de configuration : <literal/APT::Get::List-Cleanup/. - </VarListEntry> - - <VarListEntry><term><option/-t/</> - <term><option/--target-release/</> - <term><option/--default-release/</> - <ListItem><Para> -Cette option contrle l'entre par dfaut pour les questions de -distribution ; une tiquette (pin) par dfaut dont la priorit vaut 990 -est cr en utilisant la chane spcifie. Le fichier des prfrences peut -annuler cette dcision. En clair, cette option permet de contrler simplement -dans quelle distribution seront rcuprs les paquets. Par exemple : -<option>-t '2.1*'</> ou <option>-t unstable</>. -lment de configuration : <literal/APT::Default-Release/. -Voyez aussi la page de manuel &apt-preferences;. - </VarListEntry> - - <VarListEntry><term><option/--trivial-only/</> - <ListItem><Para> -Ne ralise que les oprations  triviales . Logiquement ceci peut tre -considr comme relatif <option>--assume-yes</>. Alors que -<option>--assume-yes</> rpond oui n'importe quelle question, -<option>--trivial-only</> rpond non. -lment de configuration : <literal/APT::Get::Trivial-Only/. - </VarListEntry> - - <VarListEntry><term><option/--no-remove/</> - <ListItem><Para> -Quand des paquets doivent tre supprims, apt-get s'arrte immdiatement sans -poser de questions. lment de configuration : <literal/APT::Get::Remove/. - </VarListEntry> - - <VarListEntry><term><option/--only-source/</> - <ListItem><Para> -Cette option n'a de sens qu'avec la commande <literal/source/. Elle indique -que les noms de sources donns ne doivent pas tre reprs travers la -table binaire. Cela signifie que si cette option est choisie, la commande -<literal/source/ acceptera seulement des noms de paquets-source -comme argument ; elle n'acceptera pas de les rechercher partir des noms de -paquets binaires correspondants. -lment de configuration : <literal/APT::Get::Only-Source/ - </VarListEntry> - - <VarListEntry><term><option/--diff-only/</><term><option/--tar-only/</> - <ListItem><Para> -Ne rcuprer que le fichier diff ou tar d'une archive de source. -lment de configuration : <literal/APT::Get::Diff-Only/ et -<literal/APT::Get::Tar-Only/. - </VarListEntry> - - <VarListEntry><term><option/--arch-only/</> - <ListItem><Para> -Ne traiter que les dpendances de construction pour telle architecture. -lment de configuration : <literal/APT::Get::Arch-Only/ - </VarListEntry> - - - &apt-commonoptions; - - </VariableList> - </RefSect1> - - <RefSect1><Title>Fichiers</> - <variablelist> - <VarListEntry><term><filename>/etc/apt/sources.list</></term> - <ListItem><Para> -Liste les emplacements o aller chercher les paquets. -lment de configuration : <literal/Dir::Etc::SourceList/. - </VarListEntry> - - <VarListEntry><term><filename>/etc/apt/apt.conf</></term> - <ListItem><Para> -Fichier de configuration d'APT. -lment de configuration : <literal/Dir::Etc::Main/. - </VarListEntry> - - <VarListEntry><term><filename>/etc/apt/apt.conf.d/</></term> - <ListItem><Para> -lments du fichier de configuration d'APT. -lment de configuration : <literal/Dir::Etc::Parts/. - </VarListEntry> - - <VarListEntry><term><filename>/etc/apt/preferences</></term> - <ListItem><Para> -Fichier des prfrences. -C'est dans ce fichier qu'on peut faire de l'tiquetage (pinning) c'est--dire, -choisir d'obtenir des paquets d'une source distincte ou d'une distribution -diffrente. -lment de configuration : <literal/Dir::Etc::Preferences/. - </VarListEntry> - - - <VarListEntry><term><filename>&cachedir;/archives/</></term> - <ListItem><Para> -Zone de stockage pour les paquets rcuprs. -lment de configuration : <literal/Dir::Cache::Archives/. - </VarListEntry> - - <VarListEntry><term><filename>&cachedir;/archives/partial/</></term> - <ListItem><Para> -Zone de stockage pour les paquets en transit. -lment de configuration : <literal/Dir::Cache::Archives/ (implicitement, partial). - </VarListEntry> - - <VarListEntry><term><filename>&statedir;/lists/</></term> - <ListItem><Para> -Zone de stockage des informations concernant chaque ressource spcifie dans -&sources-list;. -lment de configuration : <literal/Dir::State::Lists/. - </VarListEntry> - - <VarListEntry><term><filename>&statedir;/lists/partial/</></term> - <ListItem><Para> -Zone de stockage pour les informations d'tat des paquets en transit. -lment de configuration : <literal/Dir::State::Lists/ (implicit partial). - </VarListEntry> - </variablelist> - </RefSect1> - - <RefSect1><Title>Voir aussi</> - <para> - &apt-cache;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, -&apt-config;, -le guide  APT users guide  dans &docdir;, &apt-preferences;, -le APT Howto. - </RefSect1> - - <RefSect1><Title>Diagnostics</> - <para> -<command/apt-get/ retourne zro aprs un droulement normal, et le nombre -dcimal 100 en cas d'erreur. - </RefSect1> - - &manbugs; - &manauthor; - &deux-traducteurs; -</refentry> diff --git a/doc/fr/apt-get.fr.8.xml b/doc/fr/apt-get.fr.8.xml new file mode 100644 index 000000000..8832dd22e --- /dev/null +++ b/doc/fr/apt-get.fr.8.xml @@ -0,0 +1,576 @@ +<?xml version="1.0" encoding="iso-8859-15" standalone="no"?> +<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" + "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ + +<!ENTITY % aptent SYSTEM "apt.ent.fr"> +%aptent; + +]> + +<refentry lang="fr"> + + <refentryinfo> + &apt-author.jgunthorpe; + &apt-author.team; + &apt-email; + &apt-product; + <!-- The last update date --> + <date>29 Fvrier 2004</date> + </refentryinfo> + +<refmeta> +<refentrytitle>apt-get</refentrytitle> +<manvolnum>8</manvolnum> +</refmeta> + +<refnamediv> +<refname>apt-get</refname> +<refpurpose>Utilitaire d'APT pour la manipulation de paquets -- interface en ligne de commande.</refpurpose> +</refnamediv> + +<refsynopsisdiv> +<cmdsynopsis> +<command>apt-get</command> +<arg><option>-hvs</option></arg> +<arg><option>-o=<replaceable>option de configuration</replaceable></option></arg> +<arg><option>-c=<replaceable>fichier</replaceable></option></arg> +<group choice="req"> +<arg>update</arg> +<arg>upgrade</arg> +<arg>dselect-upgrade</arg> +<arg>install <arg choice="plain" rep="repeat"><replaceable>paquet</replaceable></arg></arg> +<arg>remove <arg choice="plain" rep="repeat"><replaceable>paquet</replaceable></arg></arg> +<arg>source <arg choice="plain" rep="repeat"><replaceable>paquet</replaceable></arg></arg> +<arg>build-dep <arg choice="plain" rep="repeat"><replaceable>paquet</replaceable></arg></arg> +<arg>check</arg> +<arg>clean</arg> +<arg>autoclean</arg> +</group> +</cmdsynopsis> +</refsynopsisdiv> + +<refsect1><title>Description + +Apt-get est l'outil en ligne de commande pour manipuler les +paquets. Il peut tre considr par l'utilisateur comme un gnrateur de +sortie pour les autres outils de la bibliothque APT. +Plusieurs interfaces utilisateur existent, comme dselect, aptitude, +synaptic, gnome-apt ou wajig. + + + moins que l'option , ou ne soit donne, l'une des +commandes suivantes doit tre prsente. + + update + +La commande update permet de resynchroniser un fichier rpertoriant +les paquets disponibles et sa source. Ces fichiers sont rcuprs aux +endroits spcifis dans /etc/apt/sources.list. Ainsi, lorsqu'on +utilise une archive Debian, cette commande rcupre les fichiers +Packages.gz et les analyse de manire rendre disponibles +les informations concernant les nouveaux paquets et les paquets mis jour. +On doit toujours excuter une commande update avant les commandes +upgrade ou dist-upgrade. Il faut savoir que l'indicateur +de progression d'ensemble n'est pas correct puisque la taille de ces fichiers +ne peut tre connue l'avance. + + + +upgrade + +La commande upgrade permet d'installer les versions les plus +rcentes de tous les paquets prsents sur le systme en utilisant les +sources numres dans /etc/apt/sources.list. Les paquets +installs dont il existe de nouvelles versions sont rcuprs et mis +niveau. En aucun cas des paquets dj installs ne sont supprims ; de +mme, des paquets qui ne sont pas dj installs ne sont ni rcuprs ni +installs. Les paquets dont de nouvelles versions ne peuvent pas tre +installes sans changer le statut d'installation d'un autre paquet sont +laisss dans leur version courante. On doit d'abord excuter la commande +update pour que apt-get connaisse +l'existence de nouvelles versions des paquets. + + + +dselect-upgrade + +dselect-upgrade est utilise conjointement avec &dselect;, l'interface +traditionnelle Debian pour la gestion des paquets. +La commande dselect-upgrade suit les modifications faites par +&dselect; dans le champ Status des paquets disponibles, et effectue +les actions ncessaires la ralisation de cet tat (par exemple, +suppression d'anciens paquets, installation de nouveaux paquets). + + + +dist-upgrade + +La commande dist-upgrade effectue la fonction upgrade en +y ajoutant une gestion intelligente des changements de dpendances dans les +nouvelles versions des paquets ; apt-get possde un systme + intelligent  de rsolution des conflits et il essaye, quand c'est +ncessaire, de mettre niveau les paquets les plus importants aux dpens +des paquets les moins importants. Le fichier /etc/apt/sources.list +contient une liste de sources o rcuprer les paquets dsirs. +Voyez aussi &apt-preferences; pour un mcanisme de remplacement des paramtres +gnraux pour certains paquets. + + + +install + +La commande install est suivie par un ou plusieurs paquets +installer. Chaque paquet est un nom de paquet ; ce n'est pas un nom de +fichier entirement dfini (par exemple, dans un systme Debian GNU/Linux, +on indiquera libc6 et non pas libc6_1.9.6-2.deb). Tous les +paquets requis par le(s) paquet(s) que l'on veut installer sont aussi +rcuprs et installs. On se sert du fichier +/etc/apt/sources.list pour localiser les paquets dsirs. Quand +un trait d'union est accol (sans espace intermdiaire) au nom d'un paquet +dj install, ce paquet est supprim. De mme on peut ajouter un signe + +  pour dsigner un paquet installer. +Cette dernire fonctionnalit peut tre utilise pour annuler les dcisions +prises par le systme de rsolution des conflits d'apt-get. + + +On peut choisir d'installer une version particulire d'un paquet en faisant +suivre son nom par un signe gal et par la version. Cette version sera +localise et l'installation sera demande. On peut aussi choisir une +distribution particulire en faisant suivre le nom du paquet par une barre +oblique et par le nom de la distribution ou de l'archive (stable, testing, +unstable). + + +Avec ces possibilits de choisir la version, de vieilles versions d'un paquet +peuvent tre installes. Il faut faire attention. + + +Enfin, le mcanisme d'&apt-preferences; permet de crer d'autres rgles pour +l'installation des paquets. + + +Quand aucun paquet ne correspond l'expression donne en argument et que cette +expression contient l'un des caractres  . ,  ?  ou + * , on considre que c'est une expression rationnelle POSIX et +elle est applique tous les paquets de la base de donnes. Tout paquet +correspondant est install (ou supprim). Notez que la comparaison est +effectue par sous-chane et  lo  correspond aussi bien + how-lo  qu'  lowest . Si vous ne le voulez pas, ancrez +l'expression par un caractre  ^  ou un caractre  $ , +ou bien crez une expression plus prcise. + + + +remove + +La commande remove est identique la commande install ; +Mais les paquets sont supprims et non pas installs. Quand un signe plus est +accol (sans espace intermdiaire) au nom du paquet, le paquet est install au lieu +d'tre supprim. + + + +source + +Avec la commande source, apt-get rcupre des paquets +sources. APT examine les paquets disponibles pour choisir le paquet source + rcuprer. Il trouve ensuite et tlcharge dans le rpertoire courant +la version la plus rcente. Les paquets source sont suivis diffremment que +les paquets binaires, via les lignes de type deb-src dans le fichier +&sources-list;. On n'obtiendra probablement pas les mmes sources que celles +du paquet install ou celles du paquet qu'on pourrait installer. Si l'option + est spcifie, le paquet est compil en un binaire .deb +avec dpkg-buildpackage. Si est +spcifi, le source n'est pas dcompact. + + +De la mme faon qu'avec les paquets binaires, on peut rcuprer une version +particulire d'un paquet source en faisant suivre son nom par un signe gal +et par la version. Cela permet une comparaison exacte entre le nom du paquet +source et la version ; cela lance implicitement la commande +APT::Get::Only-Source. + + +Notez que les paquets sources ne sont pas suivis comme le sont les paquets +binaires. Ils ne sont prsents que dans le rpertoire courant et sont +semblables des sources tlchargs sous forme de tarball. + + + +build-dep + +Avec la commande build-dep, apt-get installe ou supprime des paquets +dans le but de satisfaire les dpendances de construction d'un paquet source. +Pour l'instant, dans la cas d'un paquet virtuel, un paquet est choisi au +hasard. + + +check + +La commande check est un outil de diagnostic ; il met jour +le cache des paquets et cherche des dpendances dfectueuses. + + + +clean + +La commande clean nettoie le rfrentiel local des paquets +rcuprs. Il supprime tout, except le fichier lock situ dans +&cachedir;/archives/ et &cachedir;/archives/partial/. +Quand APT est utilis comme mode de &dselect;, clean est effectu +automatiquement. Quand on n'utilise pas dselect, il faut excuter +apt-get clean de temps en temps si l'on veut librer de l'espace +disque. + + + +autoclean + +Tout comme clean, autoclean nettoie le rfrentiel local +des paquets rcuprs. La diffrence est qu'il supprime uniquement les paquets +qui ne peuvent plus tre tlchargs et qui sont grandement inutiles. +On peut ainsi contrler la taille de ce cache sur une longue priode. +Tant qu'elle n'est pas active, l'option de configuration +APT::Clean-Installed empche la suppression de paquets installs. + + + + +Options +&apt-cmdblurb; + + + + + +Rcupration seule ; les paquets sont rcuprs mais ne sont ni dpaquets +ni installs. lment de configuration : APT::Get::Download-Only. + + + + + +Correction ; essaye de rparer un systme dont les dpendances sont +dfectueuses. Cette option, utilise avec install ou remove, peut omettre +tout paquet de faon permettre APT de dduire une solution viable. +Chaque paquet spcifi doit compltement corriger le problme. Cette option +est quelquefois ncessaire lorsque l'on excute APT pour la premire fois ; +APT lui-mme interdit les dpendances dfectueuses dans un systme. Il est +possible que la structure de dpendances d'un systme soit tellement +corrompue qu'elle requiert une intervention manuelle (ce qui veut dire la +plupart du temps utiliser &dselect; ou dpkg --remove pour liminer +les paquets en cause). L'utilisation de cette option conjointement avec + peut produire une erreur dans certaines situations. +lment de configuration : APT::Get::Fix-Broken. + + + + + + +Ignorer les paquets manquants ; si des paquets ne peuvent tre +rcuprs, ou, aprs rcupration, ne satisfont pas au contrle d'intgrit, +cette commande met ces paquets de ct et gre le rsultat. Utiliser cette +option conjointement avec peut produire une erreur dans +certaines situations. Quand un paquet, slectionn pour une installation +(particulirement si c'est mentionn en ligne de commande), ne peut tre +rcupr, il est mis silencieusement de ct. lment de configuration : +APT::Get::Fix-Missing. + + + + + +Pas de rcupration. Le mieux est d'utiliser cette option avec + pour forcer APT n'utiliser que les .deb qu'il a +dj rcuprs. +lment de configuration : APT::Get::Download. + + + + + +Mode silencieux ; cette commande produit une sortie destine +l'enregistrement dans un fichier-journal en omettant les indicateurs de +progression. Un plus grand nombre de  q  (2 au plus) produit un +plus grand silence. +On peut aussi utiliser pour positionner le niveau de silence, +et annuler le fichier de configuration. Notez qu'un niveau de silence gal 2 +implique et vous ne devez jamais utiliser sans +l'accompagner d'un modificateur tel que , + ou  : APT pourrait excuter des actions inattendues ! +lment de configuration : quiet. + + + + + + + + + + +Simulation ; cette commande ralise une simulation des actions qui +seraient excutes mais ne modifie pas le systme. +lment de configuration : APT::Get::Simulate. + + +La simulation affiche une srie de lignes reprsentant chacune une opration +de dpkg, Configure (Conf),Remove (Remv),Unpack (Inst). Les crochets encadrent +des paquets endommags et des crochets n'encadrant rien indiquent que les +dommages n'ont aucune consquence (rare). + + + + + + +Rpond automatiquement oui aux questions ; prsume  oui  +comme rponse toutes les questions et s'excute de manire non interactive. +Dans le cas d'une situation indsirable, comme le changement d'un paquet +gel, l'installation d'un paquet non authentifi ou la suppression d'un +paquet essentiel, apt-get s'interrompt. +lment de configuration : APT::Get::Assume-Yes. + + + + + +Afficher les paquets mis niveau ; affiche une liste de tous les paquets +mettre niveau. lment de configuration : APT::Get::Show-Upgraded. + + + + + +Afficher les versions compltes des paquets installs ou mis niveau. +lment de configuration : APT::Get::Show-Versions. + + + + + + +Cette commande compile un paquet source aprs l'avoir rcupr. +lment de configuration : APT::Get::Compile. + + + + + +Cette commande ignore la marque  Hold  d'un paquet ; par ce biais, +apt-get ignore un  hold  plac sur un paquet. cela peut tre utile +avec dist-upgrade pour annuler un grand nombre de  hold  +indsirables. lment de configuration : APT::Ignore-Hold. + + + + + +Aucune mise niveau ; quand elle est utilise avec install, +cette commande empche les paquets lists sur la ligne de commande d'tre mis + niveau. +lment de configuration : APT::Get::Upgrade. + + + + + +Forcer l'acceptation ; cette option est dangereuse parce qu'elle laisse +APT continuer sans poser de questions quand il ralise quelque chose de +potentiellement dommageable. Cette option ne doit tre utilise que dans des +circonstances trs spciales. Utiliser force-yes peut dtruire le systme ! +lment de configuration : APT::Get::force-yes. + + + + + +Au lieu d'aller chercher les paquets installer, leurs URI sont affiches. +Chaque URI a un chemin, un nom de fichier destination, une taille et une +cl md5 attendue. Notez que le nom de fichier afficher ne correspond pas +toujours au nom de fichier sur le site distant ! Cette option fonctionne +aussi avec la commande source et avec la commande +update. Avec la commande update, +la somme MD5 et la taille ne sont pas donnes et c'est l'utilisateur de +dcompresser les fichiers compresss. +lment de configuration : APT::Get::Print-URIs. + + + + + +Utiliser purge la place de remove pour supprimer tout ce qui peut tre +supprim. +Un astrisque (*) sera affich prs des paquets qui vont tre purgs. +lment de configuration : APT::Get::Purge. + + + + + +Rinstaller les paquets dj installs avec leur version la plus rcente. +lment de configuration : APT::Get::ReInstall. + + + + +Cette option est active par dfaut ; utilisez --no-list-cleanup +pour la dsactiver. Quand elle est active, apt-get gre +automatiquement le contenu de &statedir;/lists afin d'assurer +que les fichiers obsoltes soient effacs. La seule raison de la dsactiver +est une modification frquente de votre liste de sources. +lment de configuration : APT::Get::List-Cleanup. + + + + + + + +Cette option contrle l'entre par dfaut pour les questions de +distribution ; une tiquette (pin) par dfaut dont la priorit vaut 990 +est cr en utilisant la chane spcifie. Le fichier des prfrences peut +annuler cette dcision. En clair, cette option permet de contrler simplement +dans quelle distribution seront rcuprs les paquets. Par exemple : + ou . +lment de configuration : APT::Default-Release. +Voyez aussi la page de manuel d'&apt-preferences;. + + + + + +Ne ralise que les oprations  triviales . Logiquement ceci peut tre +considr comme relatif . Alors que + rpond oui n'importe quelle question, + rpond non. +lment de configuration : APT::Get::Trivial-Only. + + + + + +Quand des paquets doivent tre supprims, apt-get s'arrte immdiatement sans +poser de questions. lment de configuration : APT::Get::Remove. + + + + + +Cette option n'a de sens qu'avec les commandes source et +build-dep. Elle indique +que les noms de sources donns ne doivent pas tre reprs travers le +tableau des binaires. Cela signifie que si cette option est choisie, la commande +source acceptera seulement des noms de paquets source +comme argument ; elle n'acceptera pas de les rechercher partir des noms de +paquets binaires correspondants. +lment de configuration : APT::Get::Only-Source + + + + + +Ne rcuprer que le fichier diff ou tar d'une archive de source. +lment de configuration : APT::Get::Diff-Only et +APT::Get::Tar-Only. + + + + + +Ne traiter que les dpendances de construction pour telle architecture. +lment de configuration : APT::Get::Arch-Only + + + + + +Ignorer le fait que les paquets ne peuvent pas tre authentifis ; pas +d'interrogation de l'utilisateur. C'est trs utile pour certains outils + comme pbuilder +lment de configuration : +APT::Get::AllowUnauthenticated. + + + +&apt-commonoptions; + + + + +Fichiers + +/etc/apt/sources.list + +Liste les emplacements o aller chercher les paquets. +lment de configuration : Dir::Etc::SourceList. + + + +/etc/apt/apt.conf +Fichier de configuration d'APT. +lment de configuration : Dir::Etc::Main. + + + +/etc/apt/apt.conf.d/ + +lments du fichier de configuration d'APT. +lment de configuration : Dir::Etc::Parts. + + + +/etc/apt/preferences + +Fichier des prfrences. +C'est dans ce fichier qu'on peut faire de l'tiquetage (pinning) c'est--dire, +choisir d'obtenir des paquets d'une source distincte ou d'une distribution +diffrente. +lment de configuration : Dir::Etc::Preferences. + + + +&cachedir;/archives/ + +Zone de stockage pour les paquets rcuprs. +lment de configuration : Dir::Cache::Archives. + + + +&cachedir;/archives/partial/ + +Zone de stockage pour les paquets en transit. +lment de configuration : Dir::Cache::Archives (implicitement, partial). + + + +&statedir;/lists/ + +Zone de stockage des informations concernant chaque ressource spcifie dans +&sources-list;. +lment de configuration : Dir::State::Lists. + + + +&statedir;/lists/partial/ + +Zone de stockage pour les informations d'tat des paquets en transit. +lment de configuration : Dir::State::Lists (implicit partial). + + + + + +Voir aussi + +&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, + &apt-conf;, &apt-config;, + le guide  APT users guide  dans &docdir;, &apt-preferences;, +le guide APT. + + + + &manbugs; +&deux-traducteurs; + diff --git a/doc/fr/apt-key.fr.8.xml b/doc/fr/apt-key.fr.8.xml new file mode 100644 index 000000000..a31fb7855 --- /dev/null +++ b/doc/fr/apt-key.fr.8.xml @@ -0,0 +1,88 @@ + + +%aptent; + +]> + + + &apt-docinfo; + + + apt-key + 8 + + + + + apt-key + APT key management utility + + + + + + apt-key + command/ + + + + + Description + + apt-key gre les cls dont se sert apt pour +authentifier les paquets. Les paquets authentifis par ces cls seront +rputs + + + +Commandes + + add fichier + + + +Ajouter une cl la liste des cls fiables. La cl est lue dans +fichier, ou sur l'entre standard si +fichier est -. + + + + + + + del keyid + + + +Supprimer une cl de la liste des cls fiables. + + + + + + + list + + + +Afficher la liste des cls fiables. + + + + + + + + + + + + + &manbugs; + &manauthor; +&traducteur; + + diff --git a/doc/fr/apt-sortpkgs.fr.1.sgml b/doc/fr/apt-sortpkgs.fr.1.sgml deleted file mode 100644 index d0058c614..000000000 --- a/doc/fr/apt-sortpkgs.fr.1.sgml +++ /dev/null @@ -1,75 +0,0 @@ - - - -%aptent; - -]> - - - &apt-docinfo; - - - apt-sortpkgs - 1 - - - - - apt-sortpkgs - Un outil pour trier les index de paquets. - - - - - - apt-sortpkgs - - - - - - - - Description</> - <para> -<command/apt-sortpkgs/ prend un index (un index de Source ou un index de -paquet) et trie leurs enregistrements selon le nom de paquet. Un tri des -champs de chaque enregistrement est ralis selon des rgles internes. - - <para> -Le rsultat est envoy sur la sortie standard ; l'entre doit tre un -fichier analysable. - </RefSect1> - - <RefSect1><Title>Options</> - &apt-cmdblurb; - - <VariableList> - <VarListEntry><term><option/-s/</><term><option/--source/</> - <ListItem><Para> -Se servir d'un index de sources pour le tri des champs. -lment de configuration : <literal/APT::SortPkgs::Source/. - </VarListEntry> - - &apt-commonoptions; - - </VariableList> - </RefSect1> - - <RefSect1><Title>Voir aussi</> - <para> - &apt-conf; - </RefSect1> - - <RefSect1><Title>Diagnostics</> - <para> -<command/apt-sortpkgs/ retourne zro si tout se passe bien ou 100 en cas -d'erreur. - </RefSect1> - - &manbugs; - &manauthor; - &traducteur; -</refentry> diff --git a/doc/fr/apt-sortpkgs.fr.1.xml b/doc/fr/apt-sortpkgs.fr.1.xml new file mode 100644 index 000000000..109a23c48 --- /dev/null +++ b/doc/fr/apt-sortpkgs.fr.1.xml @@ -0,0 +1,84 @@ +<?xml version="1.0" encoding="iso-8859-15" standalone="no"?> +<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" + "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ + +<!ENTITY % aptent SYSTEM "apt.ent.fr"> +%aptent; + +]> + +<refentry lang="fr"> + + <refentryinfo> + &apt-author.jgunthorpe; + &apt-author.team; + &apt-email; + &apt-product; + <!-- The last update date --> + <date>29 February 2004</date> + </refentryinfo> + +<refmeta> +<refentrytitle>apt-sortpkgs</refentrytitle> +<manvolnum>1</manvolnum> +</refmeta> + +<refnamediv lang="fr"> +<refname>apt-sortpkgs</refname><refpurpose>Un outil pour trier les index de paquets. + </refpurpose> +</refnamediv> + +<refsynopsisdiv> +<cmdsynopsis> +<command>apt-sortpkgs</command> +<arg><option>-hvs</option></arg> +<arg><option>-o=<replaceable>option de configuration</replaceable></option></arg> +<arg><option>-c=<replaceable>fichier</replaceable></option></arg> +<arg choice="plain" rep="repeat"><replaceable>fichier</replaceable></arg> +</cmdsynopsis> +</refsynopsisdiv> + +<refsect1><title>Description + +Apt-sortpkgs prend un index (un index de Source ou un index de +paquet) et trie leurs enregistrements selon le nom de paquet. Un tri des +champs de chaque enregistrement est ralis selon des rgles internes. + + + +Le rsultat est envoy sur la sortie standard ; l'entre doit tre un +fichier analysable. + + + +Options +&apt-cmdblurb; + + + + +Se servir d'un index de sources pour le tri des champs. +lment de configuration : APT::SortPkgs::Source. + + + +&apt-commonoptions; + + + +Voir aussi + +&apt-conf; + + + +Diagnostics + +apt-sortpkgs retourne zro si tout se passe bien ou 100 en cas +d'erreur. + + + +&manbugs; +&traducteur; + \ No newline at end of file diff --git a/doc/fr/apt.conf.fr.5.sgml b/doc/fr/apt.conf.fr.5.sgml deleted file mode 100644 index 942fed10c..000000000 --- a/doc/fr/apt.conf.fr.5.sgml +++ /dev/null @@ -1,451 +0,0 @@ - - - -%aptent; - -]> - - - &apt-docinfo; - - - apt.conf - 5 - - - - - apt.conf - Fichier de configuration pour APT - - - Description</> - <para> - <filename/apt.conf/ est le principal fichier de configuration de la -collection d'outils que constitue APT ; tous les outils font appel ce -fichier de configuration et utilisent un analyseur syntaxique en ligne de -commande commun afin de fournir un environnement uniforme. Quand un outil -d'APT dmarre, il lit (si elle existe) la variable d'environnement -<envar/APT_CONFIG/ ; puis il lit les fichiers situs dans -<literal/Dir::Etc::Parts/ ainsi que le principal fichier de configuration -indiqu par <literal/Dir::Etc::main/ ; enfin il applique les options de -la ligne de commande qui annulent les directives de configuration, chargeant, -si ncessaire, d'autres fichiers de configuration. - <para> -Le fichier de configuration est construit comme un arbre d'options -organises en groupes fonctionnels. On se sert du double deux points ( :: ) pour indiquer une option ; par exemple, <literal/APT::Get::Assume-Yes/ est -une option pour le groupe d'outils APT, destine l'outil Get. Les options -n'hritent pas des groupes de leurs parents. - <para> -Syntaxiquement, le langage de configuration est conu sur le mme modle -que les langages utiliss par des outils ISC tels que bind et dhcp. Une ligne -qui commence par <literal>//</literal> est un commentaire et elle est ignore. -Chaque ligne est de la forme : - <literallayout>APT::Get::Assume-Yes "true";</literallayout> -Le point-virgule final est obligatoire et les guillemets sont optionnels. -On peut dclarer un nouveau champ d'action avec des accolades, comme -suit : -<informalexample><programlisting> -APT { - Get { - Assume-Yes "true"; - Fix-Broken "true"; - }; -}; -</programlisting></informalexample> -avec des retours la ligne pour faciliter la lecture. On peut crer des -listes en ouvrant un champ d'action et en mettant un seul mot entre -apostrophes suivi d'un point-virgule. On peut mettre plusieurs entres, -spares par un point-virgule. -<informalexample><programlisting> -DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; -</programlisting></informalexample> - <para> -Les modles <filename>&docdir;/examples/apt.conf</> &configureindex; -montrent quoi devrait ressembler le fichier de configuration. - <para> -Deux lments spciaux sont autoriss : <literal/#include/ et -<literal/#clear/. <literal/#include/ inclut le fichier donn en argument, -moins que le nom ne se termine par une barre oblique. <literal/#clear/ sert -effacer une liste de noms. - <para> -Tous les outils d'APT possdent une option <option>-o</> qui permet de -spcifier une configuration arbitraire depuis la ligne de commande. La -syntaxe consiste en un nom complet d'option (par exemple -<literal/APT::Get::Assume-Yes/) suivi par un signe gal, puis par la nouvelle -valeur de l'option. On peut complter une liste en ajoutant un  ::  au nom -de la liste. - </RefSect1> - - <RefSect1><Title>Le groupe APT</> - <para> -Ce groupe d'options contrle aussi bien le comportement global d'APT que -la prise en compte des options pour chaque outil. - - <VariableList> - <VarListEntry><Term>Architecture</Term> - <ListItem><Para> -L'architecture du systme ; cette option positionne l'architecture utiliser -pour rcuprer des fichiers et analyser des listes de paquets. L'architecture -interne par dfaut est celle pour laquelle APT a t compil. - </VarListEntry> - - <VarListEntry><Term>Ignore-Hold</Term> - <ListItem><Para> -Ignore les paquets  gels  ; cette option globale indique au -systme de rsolution de ne pas tenir compte des paquets  gels  -dans sa prise de dcision. - </VarListEntry> - - <VarListEntry><Term>Clean-Installed</Term> - <ListItem><Para> -Avec cette option qui est active par dfaut, la fonctionnalit  autoclean  -supprime tout paquet qui ne peut plus tre rcupr dans le cache. -Quand cette option est dsactive, les paquets qui sont installs localement -sont aussi exclus du nettoyage - mais notez que APT ne fournit aucun moyen -direct pour les rinstaller. - </VarListEntry> - - <VarListEntry><Term>Immediate-Configure</Term> - <ListItem><Para> -Dsactive la configuration immdiate ; cette dangereuse option dsactive -une partie du code de mise en ordre de APT pour que ce dernier effectue le -moins d'appels possible Dpkg. C'est peut-tre ncessaire sur des systmes -lents un seul utilisateur mais c'est extrmement dangereux et cela peut -faire chouer les scripts d'installation, voire pire. -Utilisez-la vos risques et prils. - </VarListEntry> - - <VarListEntry><Term>Force-LoopBreak</Term> - <ListItem><Para> -Ne jamais activer cette option moins que vous ne sachiez - rellement - ce -que vous faites. Elle autorise APT supprimer temporairement un paquet -essentiel pour mettre fin une boucle Conflicts / Conflicts ou -Conflicts / Pre-Depends entre deux paquets essentiels. UNE TELLE BOUCLE -NE DOIT JAMAIS SE PRODUIRE : C'EST UN BOGUE SRIEUX. Cette option -fonctionne si les paquets essentiels ne sont pas tar, gzip, libc, dpkg, bash -ou tous les paquets dont ces paquets dpendent. - </VarListEntry> - - <VarListEntry><Term>Cache-Limit</Term> - <ListItem><Para> -APT utilise un fichier cache d'une taille mmoire fixe pour ranger les -informations du fichier  available . Cette option fixe la taille -de ce cache. - </VarListEntry> - - <VarListEntry><Term>Build-Essential</Term> - <ListItem><Para> - Cette option dfinit les paquets qui sont considrs comme faisant partie -des dpendances essentielles pour la construction des paquets. - </VarListEntry> - - <VarListEntry><Term>Get</Term> - <ListItem><Para> -La sous-section <literal/Get/ contrle l'outil &apt-get;, veuillez consulter -sa documentation pour avoir plus d'informations sur les options en question. - </VarListEntry> - - <VarListEntry><Term>Cache</Term> - <ListItem><Para> -La sous-section <literal/Cache/ contrle l'outil &apt-cache;, veuillez -consulter sa documentation pour avoir plus d'informations sur les options en -question. - </VarListEntry> - - <VarListEntry><Term>CDROM</Term> - <ListItem><Para> -La sous-section <literal/CDROM/ contrle l'outil &apt-cdrom;, veuillez -consulter sa documentation pour avoir plus d'informations sur les options en -question. - </VarListEntry> - </VariableList> - </RefSect1> - - <RefSect1><Title>Le groupe Acquire</> - <para> -Le groupe d'options <literal/Acquire/ contrle le tlchargement des paquets et -les gestionnaires d'URI. - - <VariableList> - <VarListEntry><Term>Queue-Mode</Term> - <ListItem><Para> -Le mode file d'attente ; <literal/Queue-Mode/ peut prendre une valeur -parmi <literal/host/ ou <literal/access/ et cela dtermine comment APT -paralllise les connexions sortantes. <literal/host/ signifie qu'une -connexion par cible sera initie, tandis que <literal/access/ signifie qu'une -connexion par type d'URI sera initie. - </VarListEntry> - - <VarListEntry><Term>Retries</Term> - <ListItem><Para> -Nombre d'essais effectuer. Si ce nombre n'est pas nul, APT essaie de -rcuprer, le nombre donn de fois, les fichiers dont la rcupration a chou. - </VarListEntry> - - <VarListEntry><Term>Source-Symlinks</Term> - <ListItem><Para> -Utilise des liens symboliques pour les archives de sources. Positionne - true , cette option cre si possible des liens symboliques vers -les archives de sources au lieu de les copier. -Par dfaut  true . - </VarListEntry> - - <VarListEntry><Term>http</Term> - <ListItem><Para> -HTTP URIs; http::Proxy est le mandataire (proxy) http utiliser par dfaut. -Il se prsente sous la forme standard : -<literal>http://[[user][:pass]@]host[:port]/</>. En utilisant la syntaxe : -<literal/http::Proxy::<host>/, o le mot-cl spcial <literal/DIRECT/ -indique de n'utiliser aucun mandataire, on peut spcifier un mandataire -pour chaque machine distante. La variable d'environnement <envar/http_proxy/ -remplace tous ces paramtres. - <para> -Trois options de configuration sont fournies pour le contrle des caches qui -sont compatibles avec HTTP/1.1. <literal/No-Cache/ signifie que le mandataire -ne doit pas du tout utiliser les rponses qu'il a stockes ; <literal/Max-Age/ -sert uniquement pour les fichiers d'index : cela demande au cache de les -mettre jour quand leur anciennet est suprieure au nombre de secondes -donn. Debian met jour son fichier d'index de manire journalire, la -valeur par dfaut est donc de 1 jour. <literal/No-Store/ sert uniquement -pour les fichiers d'archive : cela demande au cache de ne jamais garder -la requte. Cela peut viter de polluer un cache mandataire avec des -fichiers .deb trs grands. Note : Squid 2.0.2 ne prend en compte aucune de -ces options. - <para> -L'option <literal/timeout/ positionne le compteur de temps mort (timeout) -utilis par la mthode : cela vaut pour tout (connexion, donnes). - <para> -Une option de configuration est fournie pour contrler la profondeur du tube -pour le cas o un serveur distant n'est pas conforme la RFC ou est bogu -(comme Squid 2.0.2). Acquire::http::Pipeline-Depth a une valeur -comprise entre 0 et 5 : elle indique le nombre de requtes en attente qui -peuvent tre mises. Quand la machine distante ne conserve pas correctement -les connexions TCP, on DOIT donner une valeur gale 0 -- sinon des -donnes seront corrompues. Les machines qui ont besoin de cette option -ne respectent pas la RFC 2068. - </VarListEntry> - - <VarListEntry><Term>ftp</Term> - <ListItem><Para> -FTP URIs ; ftp::Proxy est le serveur mandataire par dfaut utiliser. Il se -prsente sous la forme standard : -<literal>ftp://[[user][:pass]@]host[:port]/</> ; il est remplac par la -variable d'environnement <envar/ftp_proxy/. Pour utiliser un mandataire ftp, -vous devez renseigner l'entre <literal/ftp::ProxyLogin/ dans le fichier de -configuration. Cette entre spcifie les commandes qui disent au serveur -mandataire comment se connecter. Voyez &configureindex; pour savoir -comment faire. Les variables de substitution disponibles sont : -<literal/$(PROXY_USER)/, <literal/$(PROXY_PASS)/, <literal/$(SITE_USER)/, -<literal/$(SITE_PASS)/, <literal/$(SITE)/, et <literal/$(SITE_PORT)/. -Chacune correspond un lment de l'URI. - <para> -L'option <literal/timeout/ positionne le compteur de temps mort (timeout) -utilis par la mthode : cela vaut pour tout (connexion, donnes). - <para> -Plusieurs options de configuration sont fournies pour contrler le mode -passif. Gnralement, c'est plus sr d'activer le mode passif ; cela -marche dans presque tous les environnements. Cependant, certaines situations -ncessitent que le mode passif soit dsactiv et que le mode - port  de ftp -soit utilis la place. On peut le faire globalement, pour des -connexions qui passent par un mandataire ou pour une machine -spcifique (examinez le modle de fichier de configuration). - <para> -On peut utiliser un mandataire FTP pour atteindre une cible HTTP en -positionnant la variable d'environnement <envar/ftp_proxy/ une url http -- -consultez la mthode http ci-dessus pour la syntaxe. On ne peut pas fixer -cette variable dans le fichier de configuration et il n'est pas recommand -d'utiliser HTTP par FTP cause de son peu d'efficacit. - <para> -L'option <literal/ForceExtended/ contrle l'utilisation des commandes lies - la RFC 2428, <literal/EPSV/ et <literal/EPRT/. Par dfaut, elle vaut - false  ; ce qui signifie que ces commandes ne sont -utilises que pour une connexion de type IPv6. Quand elle vaut - true , on les utilise mme si la connexion est de type IPv4. La -plupart des serveurs FTP ne suivent pas la RFC 2428. - </VarListEntry> - - <VarListEntry><Term>cdrom</Term> - <ListItem><Para> -CDROM URIs ; la seule option de configuration pour les URIs de CDROM -est le point de montage : <literal/cdrom::Mount/ ; il doit -reprsenter le point de montage du lecteur de cdrom indiqu dans -<filename>/etc/fstab</>. -On peut fournir d'autres commandes de montage et de dmontage quand le -point de montage ne peut tre list dans le fichier <filename>/etc/fstab</> -(par exemple, un montage SMB ou ...). Syntaxiquement, il faut placer -<literallayout>"/cdrom/"::Mount "foo";</literallayout> dans le bloc cdrom. -La barre oblique finale est importante. Les commandes de dmontage -peuvent tre spcifies en utilisant <literal/UMount/. - </VarListEntry> - </VariableList> - </RefSect1> - - <RefSect1><Title>Les rpertoires</> - <para> -Les rpertoires de la section <literal/Dir::State/ concernent le systme -local. <literal/lists/ est le rpertoire o placer les listes de paquets -tlchargs et <literal/status/ est le nom du fichier d'tat de Dpkg. -<literal/preferences/ concerne APT : c'est le nom du fichier des -prfrences. -<literal/Dir::State/ contient le rpertoire par dfaut prfix tous les -sous-lments, quand ceux-ci ne commencent pas par <filename>/</> -ou <filename>./</>. - <para> -<literal/Dir::Cache/ contient les emplacements qui renseignent sur le -cache local : par exemple, les deux caches de paquets -<literal/srcpkgcache/ et <literal/pkgcache/, et aussi l'endroit o sont -places les archives tlcharges, <literal/Dir::Cache::archives/. On peut -empcher la cration des caches en laissant leur nom en blanc. Cela ralentit -le dmarrage mais cela sauve de l'espace disque. Il vaut mieux se passer du -cache <literal/pkgcache/ plutt que se passer du cache <literal/srcpkgcache/. -Comme pour <literal/Dir::State/, le rpertoire par dfaut est contenu dans -<literal/Dir::Cache/. - <para> -<literal/Dir::Etc/ contient l'emplacement des fichiers de configuration, -<literal/sourcelist/ indique l'emplacement de la liste de sources et -<literal/main/ est le fichier de configuration par dfaut (le modifier -n'a aucun effet, moins qu'on ne le modifie avec le fichier de -configuration indiqu par la variable <envar/APT_CONFIG/). - <para> -<literal/Dir::Parts/ lit, par ordre d'entre, tous les fragments de -configuration dans le rpertoire indiqu. Ensuite, le fichier principal -de configuration est charg. - <para> -Les programmes binaires sont points par <literal/Dir::Bin/. -L'emplacement des gestionnaires de mthodes est indiqu par -<literal/Dir::Bin::Methods/ ; <literal/gzip/, <literal/Dpkg/, <literal/apt-get/, -<literal/dpkg-source/, <literal/dpkg-buildpackage/ et <literal/apt-cache/ -indiquent l'emplacement des programmes correspondants. - </RefSect1> - - <RefSect1><Title>APT et DSelect</> - <para> -Quand APT est utilis comme une mthode de &dselect;, plusieurs directives -contrlent le comportement par dfaut. On les trouve dans la section -<literal/DSelect/. - - <VariableList> - <VarListEntry><Term>Clean</Term> - <ListItem><Para> -Mode de nettoyage du cache ; cette variable peut prendre l'une des valeurs -suivantes :  always ,  prompt , - auto ,  pre-auto  et  never . - always  et  prompt  suppriment tous les paquets du -cache aprs la mise niveau ;  prompt  (valeur par dfaut) -les supprime aprs une demande et  auto  ne supprime que les -archives qui ne peuvent plus tre tlcharges (remplaces, par exemple, par -une nouvelle version).  pre-auto  les supprime avant de rcuprer -de nouveaux paquets. - </VarListEntry> - - <VarListEntry><Term>Options</Term> - <ListItem><Para> -Le contenu de cette variable est pass &apt-get; avec les options de la ligne -de commande quand ce programme est utilis dans la phase d'installation. - </VarListEntry> - - <VarListEntry><Term>UpdateOptions</Term> - <ListItem><Para> -Le contenu de cette variable est pass &apt-get; avec les options de la -ligne de commande quand ce programme est utilis dans la phase de mise jour. - </VarListEntry> - - <VarListEntry><Term>PromptAfterUpdate</Term> - <ListItem><Para> -Si cette option est  vraie , l'opration [U]pdate de &dselect; -interroge toujours l'utilisateur avant de continuer. Par dfaut, ce n'est -qu'en cas d'erreur que l'on propose l'utilisateur d'intervenir. - </VarListEntry> - </VariableList> - </RefSect1> - - <RefSect1><Title>Comment APT appelle Dpkg</> - <para> -Plusieurs directives de configuration contrlent la manire dont APT -invoque &dpkg; : elles figurent dans la section <literal/DPkg/. - - <VariableList> - <VarListEntry><Term>Options</Term> - <ListItem><Para> -Il s'agit d'une liste d'options passer dpkg. Les options doivent tre -dclares en utilisant la notation de liste et chaque lment de liste est -pass comme un seul argument &dpkg;. - </VarListEntry> - - <VarListEntry><Term>Pre-Invoke</Term><Term>Post-Invoke</Term> - <ListItem><Para> -Il s'agit d'une liste de commandes shell excuter avant ou aprs l'appel de -&dpkg;. Tout comme pour <literal/Options/, on doit utiliser la notation de -liste. Les commandes sont appeles dans l'ordre, en utilisant -<filename>/bin/sh</> : APT s'arrte ds que l'une d'elles choue. - </VarListEntry> - - <VarListEntry><Term>Pre-Install-Pkgs</Term> - <ListItem><Para> -Il s'agit d'une liste de commandes shell excuter avant d'appeler Dpkg. -Tout comme pour <literal/Options/, on doit utiliser la notation de liste. -Les commandes sont appeles dans l'ordre, en utilisant -<filename>/bin/sh</> : APT s'arrte ds que l'une d'elles choue. Sur -l'entre standard, APT transmet aux commandes les noms de tous les fichiers -.deb qu'il va installer, raison d'un par ligne. - <para> -La deuxime version de ce protocole donne plus de renseignements : on -obtient la version du protocole, la configuration de APT et les paquets, -fichiers ou versions qui ont chang. On autorise cette version en positionnant -<literal/DPkg::Tools::Options::cmd::Version/ 2. <literal/cmd/ est une -commande passe <literal/Pre-Install-Pkgs/. - </VarListEntry> - - <VarListEntry><Term>Run-Directory</Term> - <ListItem><Para> -APT se place dans ce rpertoire avant d'appeler Dpkg ; par dfaut c'est -le rpertoire <filename>/</>. - </VarListEntry> - - <VarListEntry><Term>Build-Options</Term> - <ListItem><Para> -Ces options sont passes &dpkg-buildpackage; lors de la compilation des -paquets ; par dfaut la signature est dsactive et tous les binaires sont -crs. - </VarListEntry> - </VariableList> - </RefSect1> - - <RefSect1><Title>Les options de dbogage</> - <para> -La plupart des options de la section <literal/debug/ n'ont aucun intrt -pour le simple utilisateur ; cependant, -<literal/Debug::pkgProblemResolver/ affiche d'intressantes informations sur -les dcisions que prend la commande dist-upgrade. <literal/Debug::NoLocking/ -dsactive le verrouillage de fichier de manire ce que APT puisse effectuer -quelques oprations sans tre  root  et -<literal/Debug::pkgDPkgPM/ affiche la ligne de commande chaque appel de -Dpkg. <literal/Debug::IdentCdrom/ dsactive l'inclusion de -donnes de type statfs dans les ID de CDROM. - </RefSect1> - - <RefSect1><Title>Exemples</> - <para> - &configureindex; contient un modle de fichier montrant les valeurs par -dfaut de toutes les options possibles. - </RefSect1> - - <RefSect1><Title>Fichiers</> - <para> - <filename>/etc/apt/apt.conf</> - </RefSect1> - - <RefSect1><Title>Voir aussi</> - <para> - &apt-cache;, &apt-config;, &apt-preferences;. - </RefSect1> - - &manbugs; - &manauthor; - &deux-traducteurs; - -</refentry> diff --git a/doc/fr/apt.conf.fr.5.xml b/doc/fr/apt.conf.fr.5.xml new file mode 100644 index 000000000..88ce46134 --- /dev/null +++ b/doc/fr/apt.conf.fr.5.xml @@ -0,0 +1,517 @@ +<?xml version="1.0" encoding="iso-8859-15" standalone="no"?> +<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" + "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ + +<!ENTITY % aptent SYSTEM "apt.ent.fr"> +%aptent; + +]> + +<refentry lang="fr"> + + <refentryinfo> + &apt-author.jgunthorpe; + &apt-author.team; + &apt-email; + &apt-product; + <!-- The last update date --> + <date>29 Fvrier 2004</date> + </refentryinfo> + +<refmeta> +<refentrytitle>apt.conf</refentrytitle> +<manvolnum>5</manvolnum> +</refmeta> + +<refnamediv><refname>apt.conf</refname> +<refpurpose>Fichier de configuration pour APT</refpurpose> +</refnamediv> + +<refsect1><title>Description + +Le fichier apt.conf est le principal fichier de configuration +de la collection d'outils que constitue APT ; tous les outils font appel ce +fichier de configuration et utilisent un analyseur syntaxique en ligne de +commande commun afin de fournir un environnement uniforme. Quand un outil +d'APT dmarre, il lit (si elle existe) la variable d'environnement +APT_CONFIG ; puis il lit les fichiers situs dans +Dir::Etc::Parts ainsi que le principal fichier de configuration +indiqu par Dir::Etc::main ; enfin il applique les options de +la ligne de commande qui annulent les directives de configuration, chargeant, +si ncessaire, d'autres fichiers de configuration. + + +Le fichier de configuration est construit comme un arbre d'options +organises en groupes fonctionnels. On se sert du double deux points ( :: ) +pour indiquer une option ; par exemple, APT::Get::Assume-Yes est +une option pour le groupe d'outils APT, destine l'outil Get. Les options +n'hritent pas des groupes de leurs parents. + + +Syntaxiquement, le langage de configuration est conu sur le mme modle +que les langages utiliss par des outils ISC tels que bind et dhcp. Une ligne +qui commence par // est un commentaire et elle est ignore. +Chaque ligne est de la forme : + APT::Get::Assume-Yes "true"; +Le point-virgule final est obligatoire et les guillemets sont optionnels. +On peut dclarer un nouveau champ d'action avec des accolades, comme +suit : + + + +APT { + Get { + Assume-Yes "true"; + Fix-Broken "true"; + }; +}; + + + +avec des retours la ligne pour faciliter la lecture. On peut crer des +listes en ouvrant un champ d'action et en mettant un seul mot entre +apostrophes suivi d'un point-virgule. On peut mettre plusieurs entres, +spares par un point-virgule. + + + +DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; + + + +Les modles &docdir;examples/apt.conf &configureindex; +montrent quoi devrait ressembler le fichier de configuration. + + +Deux lments spciaux sont autoriss : #include et +#clear. #include inclut le fichier donn en argument, + moins que le nom ne se termine par une barre oblique. #clear sert +effacer une liste de noms. + + +Tous les outils d'APT possdent une option qui permet de +spcifier une configuration arbitraire depuis la ligne de commande. La +syntaxe consiste en un nom complet d'option (par exemple +APT::Get::Assume-Yes) suivi par un signe gal, puis par la nouvelle +valeur de l'option. On peut complter une liste en ajoutant un  ::  au nom +de la liste. + + + +Le groupe APT + +Ce groupe d'options contrle aussi bien le comportement global d'APT que +la prise en compte des options pour chaque outil. + + +Architecture + +L'architecture du systme ; cette option positionne l'architecture utiliser +pour rcuprer des fichiers et analyser des listes de paquets. L'architecture +interne par dfaut est celle pour laquelle APT a t compil. + + + +Ignore-Hold + +Ignore les paquets  gels  ; cette option globale indique au +systme de rsolution de ne pas tenir compte des paquets  gels  +dans sa prise de dcision. + + + +Clean-Installed + +Avec cette option qui est active par dfaut, la fonctionnalit  autoclean  +supprime tout paquet qui ne peut plus tre rcupr dans le cache. +Quand cette option est dsactive, les paquets qui sont installs localement +sont aussi exclus du nettoyage - mais notez que APT ne fournit aucun moyen +direct pour les rinstaller. + + + +Immediate-Configure + +Dsactive la configuration immdiate ; cette dangereuse option dsactive +une partie du code de mise en ordre de APT pour que ce dernier effectue le +moins d'appels possible Dpkg. C'est peut-tre ncessaire sur des systmes +lents un seul utilisateur mais c'est extrmement dangereux et cela peut +faire chouer les scripts d'installation, voire pire. +Utilisez-la vos risques et prils. + + + +Force-LoopBreak + +Ne jamais activer cette option moins que vous ne sachiez - rellement - ce +que vous faites. Elle autorise APT supprimer temporairement un paquet +essentiel pour mettre fin une boucle Conflicts / Conflicts ou +Conflicts / Pre-Depends entre deux paquets essentiels. UNE TELLE BOUCLE +NE DOIT JAMAIS SE PRODUIRE : C'EST UN BOGUE SRIEUX. Cette option +fonctionne si les paquets essentiels ne sont pas tar, gzip, libc, dpkg, bash +ou tous les paquets dont ces paquets dpendent. + + + +Cache-Limit + +APT utilise un fichier cache d'une taille mmoire fixe pour ranger les +informations du fichier  available . Cette option fixe la taille +de ce cache. + + + +Build-Essential + + Cette option dfinit les paquets qui sont considrs comme faisant partie +des dpendances essentielles pour la construction des paquets. + + + +Get +La sous-section Get contrle l'outil &apt-get;, +veuillez consulter +sa documentation pour avoir plus d'informations sur les options en question. + + + +Cache +La sous-section Cache contrle l'outil &apt-cache;, +veuillez +consulter sa documentation pour avoir plus d'informations sur les options en +question. + + + +CDROM +La sous-section CDROM contrle l'outil&apt-cdrom;, +veuillez +consulter sa documentation pour avoir plus d'informations sur les options en +question. + + + + + +Le groupe Acquire + +Le groupe d'options Acquire contrle le tlchargement des paquets et +les gestionnaires d'URI. + + +Queue-Mode + +Le mode file d'attente ; Queue-Mode peut prendre une valeur +parmi host ou access et cela dtermine comment APT +paralllise les connexions sortantes. Host signifie qu'une +connexion par cible sera initie, tandis que access signifie qu'une +connexion par type d'URI sera initie. + + + +Retries + +Nombre d'essais effectuer. Si ce nombre n'est pas nul, APT essaie de +rcuprer, le nombre donn de fois, les fichiers dont la rcupration a chou. + + + +Source-Symlinks + +Utilise des liens symboliques pour les archives de sources. Positionne + true , cette option cre si possible des liens symboliques vers +les archives de sources au lieu de les copier. +Par dfaut  true . + + + +http + +URI HTTP ; http::Proxy est le mandataire (proxy) http utiliser par dfaut. +Il se prsente sous la forme standard : +http://[[user][:pass]@]host[:port]/. En utilisant la syntaxe : +http::Proxy::<host>, o le mot-cl spcial DIRECT +indique de n'utiliser aucun mandataire, on peut spcifier un mandataire +pour chaque machine distante. La variable d'environnement http_proxy +remplace tous ces paramtres. + + +Trois options de configuration sont fournies pour le contrle des caches qui +sont compatibles avec HTTP/1.1. No-Cache signifie que le mandataire +ne doit pas du tout utiliser les rponses qu'il a stockes ; Max-Age +sert uniquement pour les fichiers d'index : cela demande au cache de les +mettre jour quand leur anciennet est suprieure au nombre de secondes +donn. Debian met jour son fichier d'index de manire journalire, la +valeur par dfaut est donc de 1 jour. No-Store sert uniquement +pour les fichiers d'archive : cela demande au cache de ne jamais garder +la requte. Cela peut viter de polluer un cache mandataire avec des +fichiers .deb trs grands. Note : Squid 2.0.2 ne prend en compte aucune de +ces options. + + +L'option timeout positionne le compteur de temps mort (timeout) +utilis par la mthode : cela vaut pour tout (connexion, donnes). + + +Une option de configuration est fournie pour contrler la profondeur du tube +pour le cas o un serveur distant n'est pas conforme la RFC ou est bogu +(comme Squid 2.0.2). Acquire::http::Pipeline-Depth a une valeur +comprise entre 0 et 5 : elle indique le nombre de requtes en attente qui +peuvent tre mises. Quand la machine distante ne conserve pas correctement +les connexions TCP, on DOIT donner une valeur gale 0 -- sinon des +donnes seront corrompues. Les machines qui ont besoin de cette option +ne respectent pas la RFC 2068. + + + +ftp + +URI FTP ; ftp::Proxy est le serveur mandataire par dfaut utiliser. Il se +prsente sous la forme standard : +ftp://[[user][:pass]@]host[:port]/ ; il est remplac par la +variable d'environnement ftp_proxy. Pour utiliser un mandataire ftp, +vous devez renseigner l'entre ftp::ProxyLogin dans le fichier de +configuration. Cette entre spcifie les commandes qui disent au serveur +mandataire comment se connecter. Voyez &configureindex; pour savoir +comment faire. Les variables de substitution disponibles sont : +$(PROXY_USER), $(PROXY_PASS), $(SITE_USER), +$(SITE_PASS), $(SITE), et $(SITE_PORT). +Chacune correspond un lment de l'URI. + + +L'option timeout positionne le compteur de temps mort (timeout) +utilis par la mthode : cela vaut pour tout (connexion, donnes). + + +Plusieurs options de configuration sont fournies pour contrler le mode +passif. Gnralement, c'est plus sr d'activer le mode passif ; cela +marche dans presque tous les environnements. Cependant, certaines situations +ncessitent que le mode passif soit dsactiv et que le mode + port  de ftp +soit utilis la place. On peut le faire globalement, pour des +connexions qui passent par un mandataire ou pour une machine +spcifique (examinez le modle de fichier de configuration). + + +On peut utiliser un mandataire FTP pour atteindre une cible HTTP en +positionnant la variable d'environnement ftp_proxy une url http -- +consultez la mthode http ci-dessus pour la syntaxe. On ne peut pas fixer +cette variable dans le fichier de configuration et il n'est pas recommand +d'utiliser HTTP par FTP cause de son peu d'efficacit. + + +L'option ForceExtended contrle l'utilisation des commandes lies + la RFC 2428, EPSV et EPRT. Par dfaut, elle vaut + false  ; ce qui signifie que ces commandes ne sont +utilises que pour une connexion de type IPv6. Quand elle vaut + true , on les utilise mme si la connexion est de type IPv4. La +plupart des serveurs FTP ne suivent pas la RFC 2428. + + + +cdrom + +URI CDROM ; la seule option de configuration pour les URI de CDROM +est le point de montage : cdrom::Mount ; il doit +reprsenter le point de montage du lecteur de cdrom indiqu dans +/etc/fstab. +On peut fournir d'autres commandes de montage et de dmontage quand le +point de montage ne peut tre list dans le fichier /etc/fstab +(par exemple, un montage SMB). Syntaxiquement, il faut placer +"/cdrom/"::Mount "foo"; dans le bloc cdrom. +La barre oblique finale est importante. Les commandes de dmontage +peuvent tre spcifies en utilisant UMount. + + + + gpgv + +URI GPGV ; la seule option pour les URI GPGV est celle qui permet de + passer des paramtres gpgv. + gpgv::Options Options supplmentaires passes + gpgv. + + + + + + + +Les rpertoires + +Les rpertoires de la section Dir::State concernent le systme +local. lists est le rpertoire o placer les listes de paquets +tlchargs et status est le nom du fichier d'tat de Dpkg. +preferences concerne APT : c'est le nom du fichier des +prfrences. +Dir::State contient le rpertoire par dfaut prfix tous les +sous-lments, quand ceux-ci ne commencent pas par / +ou ./. + + +Dir::Cache contient les emplacements qui renseignent sur le +cache local : par exemple, les deux caches de paquets +srcpkgcache et pkgcache, et aussi l'endroit o sont +places les archives tlcharges, Dir::Cache::archives. On peut +empcher la cration des caches en laissant leur nom en blanc. Cela ralentit +le dmarrage mais cela sauve de l'espace disque. Il vaut mieux se passer du +cache pkgcache plutt que se passer du cache srcpkgcache. +Comme pour Dir::State, le rpertoire par dfaut est contenu dans +Dir::Cache. + + +Dir::Etc contient l'emplacement des fichiers de configuration, +sourcelist indique l'emplacement de la liste de sources et +main est le fichier de configuration par dfaut (le modifier +n'a aucun effet, moins qu'on ne le modifie avec le fichier de +configuration indiqu par la variable APT_CONFIG). + + +Dir::Parts lit, par ordre d'entre, tous les fragments de +configuration dans le rpertoire indiqu. Ensuite, le fichier principal +de configuration est charg. + + +Les programmes binaires sont points par Dir::Bin. +L'emplacement des gestionnaires de mthodes est indiqu par +Dir::Bin::Methods ; gzip, +Dpkg, apt-get, +dpkg-source, dpkg-buildpackage +et apt-cache +indiquent l'emplacement des programmes correspondants. + + + +APT et DSelect + +Quand APT est utilis comme une mthode de &dselect;, plusieurs directives +contrlent le comportement par dfaut. On les trouve dans la section +DSelect. + + + +Clean + +Mode de nettoyage du cache ; cette variable peut prendre l'une des valeurs +suivantes :  always ,  prompt , + auto ,  pre-auto  et  never . + always  et  prompt  suppriment tous les paquets du +cache aprs la mise niveau ;  prompt  (valeur par dfaut) +les supprime aprs une demande et  auto  ne supprime que les +archives qui ne peuvent plus tre tlcharges (remplaces, par exemple, par +une nouvelle version).  pre-auto  les supprime avant de rcuprer +de nouveaux paquets. + + + +Options + +Le contenu de cette variable est pass &apt-get; avec les options de la ligne +de commande quand ce programme est utilis dans la phase d'installation. + + +UpdateOptions + +Le contenu de cette variable est pass &apt-get; avec les options de la +ligne de commande quand ce programme est utilis dans la phase de mise jour. + + + +PromptAfterUpdate + +Si cette option est  vraie , l'opration [U]pdate de &dselect; +interroge toujours l'utilisateur avant de continuer. Par dfaut, ce n'est +qu'en cas d'erreur que l'on propose l'utilisateur d'intervenir. + + + + + +Comment APT appelle Dpkg + +Plusieurs directives de configuration contrlent la manire dont APT +invoque &dpkg; : elles figurent dans la section DPkg. + + +Options + +Il s'agit d'une liste d'options passer dpkg. Les options doivent tre +dclares en utilisant la notation de liste et chaque lment de liste est +pass comme un seul argument &dpkg;. + + +Pre-InvokePost-Invoke + +Il s'agit d'une liste de commandes shell excuter avant ou aprs l'appel de +&dpkg;. Tout comme pour Options, on doit utiliser la notation de +liste. Les commandes sont appeles dans l'ordre, en utilisant +/bin/sh : APT s'arrte ds que l'une d'elles choue. + + +Pre-Install-Pkgs + +Il s'agit d'une liste de commandes shell excuter avant d'appeler Dpkg. +Tout comme pour Options, on doit utiliser la notation de liste. +Les commandes sont appeles dans l'ordre, en utilisant +/bin/sh : APT s'arrte ds que l'une d'elles choue. Sur +l'entre standard, APT transmet aux commandes les noms de tous les fichiers +.deb qu'il va installer, raison d'un par ligne. + + +La deuxime version de ce protocole donne plus de renseignements : on +obtient la version du protocole, la configuration de APT et les paquets, +fichiers ou versions qui ont chang. On autorise cette version en positionnant +DPkg::Tools::Options::cmd::Version 2. cmd est une +commande passe Pre-Install-Pkgs. + + +Run-Directory + +APT se place dans ce rpertoire avant d'appeler Dpkg ; par dfaut c'est +le rpertoire /. + + +Build-Options + +Ces options sont passes &dpkg-buildpackage; lors de la compilation des +paquets ; par dfaut la signature est dsactive et tous les binaires sont +crs. + + + + + +Les options de dbogage + +La plupart des options de la section debug n'ont aucun intrt +pour le simple utilisateur ; cependant, +Debug::pkgProblemResolver affiche d'intressantes informations sur +les dcisions que prend la commande dist-upgrade. Debug::NoLocking +dsactive le verrouillage de fichier de manire ce que APT puisse effectuer +quelques oprations sans tre  root  et +Debug::pkgDPkgPM affiche la ligne de commande chaque appel de +Dpkg. Debug::IdentCdrom dsactive l'inclusion de +donnes de type statfs dans les ID de CDROM. +Debug::Acquire::gpgv Dbogage de la mthode gpgv. + + + +Exemples + +Le fichier &configureindex; contient un modle de fichier montrant les valeurs par +dfaut de toutes les options possibles. + + + +Fichiers + /etc/apt/apt.conf + + +Voir aussi + +&apt-cache;, &apt-config;, &apt-preferences;. + + +&manbugs; +&deux-traducteurs; + \ No newline at end of file diff --git a/doc/fr/apt.ent.fr b/doc/fr/apt.ent.fr index 7c93d2888..075d85698 100644 --- a/doc/fr/apt.ent.fr +++ b/doc/fr/apt.ent.fr @@ -1,163 +1,210 @@ - - + + -&docdir;examples/configure-index.gz"> -/etc/apt.conf"> +&docdir;examples/configure-index.gz"> +/etc/apt.conf"> - - - + + apt.conf + 5 + "> - - - + + apt-get + 8 + "> - - - "> + + apt-config + 8 + "> - - - + + apt-cdrom + 8 + "> - - - + + apt-cache + 8 + "> - - - "> + + apt_preferences + 5 + "> - - - + + sources.list + 5 + "> - - - + + reportbug + 1 + "> - - - + + dpkg + 8 + "> - - - + + dpkg-buildpackage + 1 + "> - - - + + gzip + 1 + "> - - - + + dpkg-scanpackages + 8 + "> - - - + + dpkg-scansources + 8 + "> - - - "> + + dselect + 8 + "> -
apt@packages.debian.org
- Jason Gunthorpe - 1998-2001 Jason Gunthorpe - 12 March 2001 - + +
apt@packages.debian.org
+ Jason Gunthorpe + 1998-2001 Jason Gunthorpe + 14 dcembre 2003 + Linux + "> + + apt@packages.debian.org + +"> + + + Jason + Gunthorpe + +"> + + + APT team + +"> + +Linux +"> + + apt@packages.debian.org + +"> + + + Jason Gunthorpe + 1998-2001 + +"> + + Bogues</> + <refsect1><title>Bogues -Voyez la page concernant les bogues de APT. +Voyez la page concernant les bogues de APT. Si vous voulez rapporter un bogue, consultez le texte - /usr/share/doc/debian/bug-reporting.txt ou utilisez la -commande &reportbug;. - -"> + /usr/share/doc/debian/bug-reporting.txt ou utilisez la +commande &reportbug;. + + "> Auteur</> + <refsect1><title>Auteur - APT a t crit par l'quipe APT apt@packages.debian.org. - + APT a t crit par l'quipe APT apt@packages.debian.org. + + "> Traduction</> +<refsect1><title>Traduction -Jrme Marant. 2000 ; mise jour : Philippe Batailler. 2004. - +Jrme Marant. 2000 ; mise jour : Philippe Batailler. 2005. + + "> Traduction</> +<refsect1><title>Traduction -Philippe Batailler. debian-l10n-french@lists.debian.org. 2004. - +Philippe Batailler. debian-l10n-french@lists.debian.org. 2005. + "> contient le fichier Release du site - - - - -Lignes facultatives dans le fichier des prfrences - -Toute entre du fichier des prfrences peut commencer par une ou -plusieurs lignes contenant le mot - -La ligne - - - -Exemples</> -<RefSect2><Title>Comment suivre Stable ? - -Le fichier des prfrences suivant affecte une priorit plus haute que -la priorit par dfaut (500) tous les exemplaires appartenant la -distribution -Explanation: Ne pas installer des exemplaires d'origine Debian -Explanation: sauf ceux de la distribution stable -Package: * -Pin: release a=stable -Pin-Priority: 900 - -Package: * -Pin: release o=Debian -Pin-Priority: -10 - - - -Avec le fichier des prfrences ci-dessus et un fichier &sources-list; -adquat, les commandes suivantes utiliseront les versions les plus rcentes -de -apt-get install paquet -apt-get upgrade -apt-get dist-upgrade - - - -La commande suivante utilisera la version la plus rcente de la -distribution -apt-get install paquet/testing - - - - Comment suivre Testing ou Unstable ? - -Le fichier des prfrences suivant affecte une priorit haute aux -versions des paquets appartenant la distribution -Package: * -Pin: release a=testing -Pin-Priority: 900 - -Package: * -Pin: release a=unstable -Pin-Priority: 800 - -Package: * -Pin: release o=Debian -Pin-Priority: -10 - - - -Avec un fichier &sources-list; appropri et le fichier des prfrences -ci-dessus, les commandes suivantes -utiliseront les versions les plus rcentes de -apt-get install paquet -apt-get upgrade -apt-get dist-upgrade - - - -La commande suivante utilisera la version la plus rcente de la -distribution apt-get upgrade mettra le paquet jour -avec la plus rcente version dans -apt-get install paquet/unstable - - - - - - - See Also</> -<para> -&apt-get; &apt-cache; &apt-conf; &sources-list; - </RefSect1> - - &manbugs; - &manauthor; -&traducteur; -</refentry> diff --git a/doc/fr/apt_preferences.fr.5.xml b/doc/fr/apt_preferences.fr.5.xml new file mode 100644 index 000000000..c6b2c8794 --- /dev/null +++ b/doc/fr/apt_preferences.fr.5.xml @@ -0,0 +1,581 @@ +<?xml version="1.0" encoding="iso-8859-15" standalone="no"?> +<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" + "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ + +<!ENTITY % aptent SYSTEM "apt.ent.fr"> +%aptent; + +]> + +<refentry> + + <refentryinfo> + &apt-author.team; + &apt-email; + &apt-product; + <!-- The last update date --> + <date>29 Fvrier 2004</date> + </refentryinfo> + +<refmeta> +<refentrytitle>apt_preferences</refentrytitle> +<manvolnum>5</manvolnum> +</refmeta> + +<refnamediv> +<refname>apt_preferences</refname> +<refpurpose>Un fichier de contrle des prfrences pour APT</refpurpose> +</refnamediv> + +<refsect1><title>Description + +Le fichier d'APT, /etc/apt/preferences, peut tre utilis pour +choisir la version des paquets que l'on veut installer. + +Quand le fichier &sources-list; contient des rfrences plusieurs +distributions (par exemple, stable et +testing), plusieurs versions d'un paquet peuvent tre +installes. APT affecte une priorit chaque version disponible. La commande +apt-get, tenant compte des contraintes de +dpendance, installe la version qui possde la priorit la plus haute. +Le fichier des prfrences annule les priorits assignes par dfaut +aux versions des paquets : ainsi l'utilisateur peut choisir la version +qu'il veut installer. + + +Si le fichier &sources-list; contient, pour une mme distribution, +des rfrences plusieurs sites de tlchargement, il peut exister plusieurs +exemplaires de la mme version d'un paquet. Dans ce cas, +apt-get tlcharge l'exemplaire qui apparat en premier +dans le fichier &sources-list;. Le fichier des prfrences n'influe pas sur +le choix des exemplaires, seulement sur le choix de la version. + + +Les priorits affectes par dfaut + +Quand le fichier des prfrences n'existe pas, ou quand aucune entre +de ce fichier ne s'applique une version prcise, la priorit affecte +cette version est la priorit de la distribution laquelle elle appartient. +On peut distinguer une distribution et lui donner une priorit plus haute +que celle des autres distributions : on l'appelle la distribution par +dfaut ou  target release  et elle peut tre dfinie sur la ligne +de commande de apt-get ou dans le fichier de configuration +d'APT, /etc/apt/apt.conf. +Par exemple : + + +apt-get install -t testing paquet + + + +APT::Default-Release "stable"; + + + +Quand une distribution par dfaut a t indique, APT utilise +l'algorithme suivant pour dterminer la priorit des versions d'un +paquet : + + +une priorit gale 100 +est affecte la version dj installe (si elle existe). + + +une priorit gale 500 +est affecte aux versions qui ne sont pas installes et +qui n'appartiennent pas la distribution par dfaut. + + +une priorit gale 990 +est affecte aux versions qui ne sont pas installes et +qui appartiennent la distribution par dfaut. + + + + +Quand aucune distribution par dfaut n'a t indique, APT affecte +simplement une priorit gale 100 toute version installe d'un paquet +et une priorit gale 500 tout version non installe. + + +Puis APT applique les rgles suivantes pour dterminer la version +du paquet qu'il faut installer (elles sont listes par ordre de priorit) : + + + +Ne jamais revenir en arrire, sauf si la priorit d'une +version disponible dpasse 1000.  Revenir en arrire  signifie +installer une version moins rcente que la version installe. Il +faut noter qu'aucune des priorits par dfaut n'excde 1000 ; de telles +valeurs ne peuvent tre dfinies que dans le fichier des prfrences. Notez +aussi qu'il est risqu de revenir en arrire. + + +Installer la version qui possde la priorit la plus +haute. + + +Quand deux (ou plus) versions ont la mme priorit, +installer la version la plus rcente (c.--d. celle dont le numro de +version est le plus grand). + + +Quand deux (ou plus) versions ont la mme priorit et le +mme numro de version, mais soit les paquets diffrent par certaines +mtadonnes, soit l'option --reinstall a t donne, installer la +version qui n'est pas installe. + + + + +En gnral, la version installe d'un paquet (priorit 100) n'est +pas aussi rcente que les versions disponibles dans les sources +listes dans le fichier &sources-list; (priorit 500 ou 990). Et donc le +paquet sera mis niveau avec la commande : +apt-get install paquet ou +apt-get dist-upgrade. + + +La version installe d'un paquet peut tre - rarement - +plus rcente que tout autre version disponible. Les commandes +apt-get install paquet ou +apt-get upgrade ne provoquent pas de retour en arrire. + + +Parfois, la version installe d'un paquet est plus rcente que la +version appartenant la distribution par dfaut, mais moins rcente que +la version appartenant une autre distribution. Une telle version sera mise + niveau par les commandes +apt-get install paquet ou +apt-get upgrade car au moins l'une des versions +disponibles possde une plus haute priorit que celle de la version installe. + + + +Consquences des prfrences + +Le fichier des prfrences permet l'administrateur systme de +contrler l'affectation des priorits. Ce fichier est constitu d'une ou +plusieurs entres spares par des lignes blanches. Ces entres peuvent avoir +deux formes, une forme particulire et une forme gnrale. + + +La forme particulire affecte une priorit +(Pin-Priority) un paquet prcis, une version prcise +ou un intervalle spcifiant plusieurs versions. Par exemple, l'entre +suivante affecte une priorit haute toutes les versions du paquet +perl dont le numro de version commence par 5.8. + + + +Package: perl +Pin: version 5.8* +Pin-Priority: 1001 + + + + +La forme gnrale affecte une priorit toutes les versions d'un paquet dans +une distribution donne (c'est--dire, toutes les versions d'un paquet qui +sont listes dans un fichier Release), ou toutes les versions +d'un paquet provenant d'un site internet identifi par un nom compltement +qualifi. + + +Cette forme gnrale des entres du fichier des prfrences +s'applique seulement aux groupes de paquets. Par exemple, l'entre suivante +affecte une priorit haute toutes les versions disponibles dans le +site local. + + + +Package: * +Pin: origin "" +Pin-Priority: 999 + + +Attention ! le mot-cl utilis ici, origin, ne doit pas +tre confondu avec l'Origine d'une distribution indique dans +un fichier Release. Ce qui suit l'tiquette  Origin:  +dans un fichier Release n'est pas une adresse internet +mais le nom d'un auteur ou d'un distributeur, comme Debian ou Ximian. + +L'entre suivante affecte une priorit basse toutes les versions +d'un paquet appartenant toute distribution dont le nom +d' Archive  est unstable. + + + +Package: * +Pin: release a=unstable +Pin-Priority: 50 + + +L'entre suivante affecte une priorit haute toutes les versions +d'un paquet appartenant toute distribution dont le nom +d' Archive  est stable et dont le numro +de  Version  est 3.0. + + + +Package: * +Pin: release a=stable, v=3.0 +Pin-Priority: 500 + + + + + + + +Comment APT interprte-t-il les priorits ? + +Les priorits (P) indiques dans le fichier des prfrences doivent +tre des entiers positifs ou ngatifs. Ils sont interprts peu prs +comme suit : + + +P > 1000 + +Cette priorit entrane l'installation du paquet mme s'il +s'agit d'un retour en arrire. + + + +990 < P <=1000 + +La version sera installe, mme si elle n'appartient pas +la distribution par dfaut ; mais elle ne sera pas installe si la +version installe est plus rcente. + + + +500 < P <=990 + +La version sera installe, sauf s'il existe une version +appartenant la distribution par dfaut ou si la version installe est plus +rcente. + + + +100 < P <=500 + +La version sera installe, sauf s'il existe une version +appartenant une autre distribution ou si la version installe est plus +rcente. + + + +0 < P <=100 + +La version sera installe si aucune version du paquet +n'est installe. + + + +P < 0 + +Cette priorit empche l'installation de la version. + + + + + +Si l'une des entres de forme particulire correspond la version +disponible d'un paquet, la premire entre trouve dtermine la priorit de +cette version. S'il n'en existe pas, et si l'une des entres de forme gnrale +correspond la version disponible d'un paquet, la premire entre trouve +dtermine la priorit. + + +Supposons par exemple que le fichier des prfrences contienne les trois +entres dcrites ci-dessous : + + + +Package: perl +Pin: version 5.8* +Pin-Priority: 1001 + +Package: * +Pin: origin "" +Pin-Priority: 999 + +Package: * +Pin: release unstable +Pin-Priority: 50 + + + +Alors : + + + +La version la plus rcente du paquet perl sera +install pour autant que son numro de version commence par 5.8. +Si l'une des versions 5.8* existe et si la version installe est +une version 5.9*, il y aura un retour en arrire. + + +Les versions des paquets (autres que perl) +disponibles dans le site local ont priorit sur les autres versions, +mme celles appartenant la distribution par dfaut. + + +La version d'un paquet dont l'origine n'est pas le site +local mais un site internet list dans &sources-list; et qui appartient une +distribution unstable, ne sera installe que si aucune version +du paquet n'est dj installe. + + + + + +Dtermination de la version des paquets et des proprits des +distributions + +Chaque source liste dans le fichier &sources-list; doit fournir +les fichiers Packages et Release +qui dcrivent les paquets disponibles cet endroit. + +Le fichier Packages se trouve normalement dans le +rpertoire +.../dists/dist-name/component/arch, par exemple, +.../dists/stable/main/binary-i386/Packages. Il consiste +en entres composes de lignes, une pour chaque paquet disponible dans le +rpertoire. Seules deux lignes des entres sont pertinentes pour la +dtermination des priorits : + + +La ligne Package: + +donne le nom du paquet + + + +La ligne Version: + +donne le numro de version du paquet + + + + + +Le fichier Release se trouve normalement dans le +rpertoire +.../dists/dist-name, par exemple, .../dists/stable/Release, ou .../dists/woody/Release. +Il consiste en une seule entre compose de plusieurs lignes qui s'applique +tous les paquets situs dans les rpertoires sous +le rpertoire parent. Contrairement au fichier Packages, presque +toutes les lignes du fichier Release sont pertinentes pour +dterminer les priorits : + + + +La ligne Archive: + +nomme l'archive laquelle appartiennent tous les +paquets situs dans les rpertoires. Par exemple, la ligne +Archive: stable indique que tous les paquets dans les rpertoires +situs sous le rpertoire parent du fichier Release appartiennent + l'archive stable. Indiquer cette valeur dans le fichier des +prfrences demanderait cette ligne : + + +Pin: release a=stable + + + + + +La ligne Version: + +indique la version de la distribution. Par exemple, les +paquets dans les rpertoires peuvent appartenir la +distribution Debian GNU/Linux version 3.0. Il n'y a pas de numro de version +pour les distributions testing et unstable car elles +n'ont pas encore t publies. Indiquer cette valeur dans le fichier des prfrences demanderait +ces lignes : + + +Pin: release v=3.0 +Pin: release a=stable, v=3.0 +Pin: release 3.0 + + + + + +La ligne Component: + +nomme un composant qui indique le type de licence associe +aux paquets situs dans les rpertoires sous le fichier +Release. Par exemple, la ligne Component: main indique +que tous les exemplaires dans les rpertoires appartiennent au composant +main, c'est--dire que leur licence est en accord avec les +Directives Debian pour le logiciel libre. Indiquer ce composant dans le +fichier des prfrences demanderait cette ligne : + + +Pin: release c=main + + + + + +La ligne Origin: + +nomme l'origine des paquets situs +dans les rpertoires sous le fichier Release. En gnral, c'est +Debian. Indiquer cette origine dans le fichier des prfrences +demanderait cette ligne : + + +Pin: release o=Debian + + + + + +La ligne Label: + +indique un label pour les paquets qui se trouvent +dans les rpertoires sous le fichier Release. En gnral, c'est +Debian. Indiquer cette origine dans le fichier des prfrences +demanderait cette ligne : + + +Pin: release l=Debian + + + + + +Tous les fichiers Packages et +Release rcuprs dans des sources listes par le +fichier &sources-list; sont conservs dans le rpertoire +/var/lib/apt/lists ou dans le fichier spcifi par la +variable Dir::State::Lists dans le fichier apt.conf. +Par exemple, le fichier +debian.lcs.mit.edu_debian_dists_unstable_contrib_binary-i386_Release +contient le fichier Release du site +debian.lcs.mit.edu, architecture binary-i386 et +composant contrib de la distribution unstable. + + + +Lignes facultatives dans le fichier des prfrences + +Toute entre du fichier des prfrences peut commencer par une ou +plusieurs lignes contenant le mot Explanation:. Cela permet des +commentaires. + +La ligne Pin-Priority: d'une entre est facultative. Si elle +n'existe pas, APT affecte une priorit infrieure de 1 la valeur spcifie +sur une ligne commenant par Pin-Priority: release .... + + + + + +Exemples +Comment suivre Stable ? + +Le fichier des prfrences suivant affecte une priorit plus haute que +la priorit par dfaut (500) tous les exemplaires appartenant la +distribution stable et une priorit prohibitivement basse tous +les exemplaires appartenant d'autres distributions Debian. + + +Explanation: Ne pas installer des exemplaires d'origine Debian +Explanation: sauf ceux de la distribution stable +Package: * +Pin: release a=stable +Pin-Priority: 900 + +Package: * +Pin: release o=Debian +Pin-Priority: -10 + + + +Avec le fichier des prfrences ci-dessus et un fichier &sources-list; +adquat, les commandes suivantes utiliseront les versions les plus rcentes +de stable pour faire la mise niveau : + + +apt-get install paquet +apt-get upgrade +apt-get dist-upgrade + + + +La commande suivante utilisera la version la plus rcente de la +distribution testing pour mettre niveau le paquet spcifi ; +cependant les mises niveau ultrieures du paquet ne se feront pas + moins de relancer la commande. + + +apt-get install paquet/testing + + + + +Comment suivre Testing ou Unstable ? + +Le fichier des prfrences suivant affecte une priorit haute aux +versions des paquets appartenant la distribution testing, une +priorit moindre aux versions appartenant la distribution unstable +et une priorit prohibitivement basse aux versions appartenant d'autres +distributions Debian. + + +Package: * +Pin: release a=testing +Pin-Priority: 900 + +Package: * +Pin: release a=unstable +Pin-Priority: 800 + +Package: * +Pin: release o=Debian +Pin-Priority: -10 + + + +Avec un fichier &sources-list; appropri et le fichier des prfrences +ci-dessus, les commandes suivantes +utiliseront les versions les plus rcentes de testing pour faire +la mise niveau : + + +apt-get install paquet +apt-get upgrade +apt-get dist-upgrade + + + +La commande suivante utilisera la version la plus rcente de la +distribution unstable pour mettre niveau le paquet spcifi ; +Par la suite, apt-get upgrade mettra le paquet jour +avec la plus rcente version dans testing si elle est plus rcente +que la version installe ou avec la plus rcente version dans +unstable si elle est plus rcente que la version installe. + + +apt-get install paquet/unstable + + + + + +See Also + +&apt-get; &apt-cache; &apt-conf; &sources-list; + + + + &manbugs; +&traducteur; + \ No newline at end of file diff --git a/doc/fr/makefile b/doc/fr/makefile index 2b9278457..c0e7fa7ed 100644 --- a/doc/fr/makefile +++ b/doc/fr/makefile @@ -8,6 +8,48 @@ include ../../buildlib/defaults.mak # Man pages SOURCE = apt-cache.fr.8 apt-get.fr.8 apt-cdrom.fr.8 apt.conf.fr.5 \ sources.list.fr.5 apt-config.fr.8 apt-sortpkgs.fr.1 \ - apt-ftparchive.fr.1 apt_preferences.fr.5 apt-extracttemplates.fr.1 + apt-ftparchive.fr.1 apt_preferences.fr.5 apt-extracttemplates.fr.1 \ + apt-key.fr.8 + INCLUDES = apt.ent.fr -include $(SGML_MANPAGE_H) + +doc: $(SOURCE) + +$(SOURCE) :: % : %.xml $(INCLUDES) + echo Creating man page $@ + $(XMLTO) man $< + +apt-cache.fr.8:: apt-cache.8 + cp $< $@ + +apt-get.fr.8:: apt-get.8 + cp $< $@ + +apt-cdrom.fr.8:: apt-cdrom.8 + cp $< $@ + +apt.conf.fr.5:: apt.conf.5 + cp $< $@ + +apt-config.fr.8:: apt-config.8 + cp $< $@ + +sources.list.fr.5:: sources.list.5 + cp $< $@ + +apt-sortpkgs.fr.1:: apt-sortpkgs.1 + cp $< $@ + +apt-ftparchive.fr.1:: apt-ftparchive.1 + cp $< $@ + +apt_preferences.fr.5:: apt_preferences.5 + cp $< $@ + +apt-extracttemplates.fr.1:: apt-extracttemplates.1 + cp $< $@ + +apt-key.fr.8:: apt-key.8 + cp $< $@ + + diff --git a/doc/fr/sources.list.fr.5.sgml b/doc/fr/sources.list.fr.5.sgml deleted file mode 100644 index ed3deabf2..000000000 --- a/doc/fr/sources.list.fr.5.sgml +++ /dev/null @@ -1,207 +0,0 @@ - - - -%aptent; - -]> - - - &apt-docinfo; - - - sources.list - 5 - - - - - sources.list - Une liste, utilise par APT, indiquant les ressources de paquets - - - Description</> - <para> -La liste des ressources de paquets indique o trouver les archives -du systme de distribution de paquets utilis. Pour l'instant, cette page -de manuel ne documente que le systme d'empaquetage utilis par le systme -Debian GNU/Linux. Ce fichier de contrle est situ dans -<filename>/etc/apt/sources.list</>. - <para> -La liste des sources est conue pour prendre en compte un nombre quelconque -de sources actives et diffrents mdia. Le fichier prsente -une source par ligne et la source prfre apparat en premier. Le format de -chaque ligne est : <literal/type uri args/. Le premier lment, -<literal/type/, dtermine le format des <literal/args/. <literal/uri/ est un -identificateur universel de ressources (URI), qui est un sur-ensemble du plus -spcifique et bien connu repre universel de ressources, ou URL. La fin de la -ligne peut tre un commentaire commenant par un caractre #. - </RefSect1> - - <RefSect1><Title>Les types deb et deb-src.</> - <para> -Le type <literal/deb/ dcrit une archive Debian classique deux niveaux, -<filename>distribution/composant</>. <literal/distribution/ peut prendre -l'une des valeurs suivantes : <literal/stable/, <literal/unstable/, ou -<literal/frozen/, et composant : <literal/main/, <literal/contrib/, -<literal/non-free/, ou <literal/non-us/. Le type <literal/deb-src/ dcrit le -code source pour une distribution Debian dans le mme format que le type -<literal/deb/. Une ligne <literal/deb-src/ est ncessaire pour rcuprer les -index de sources. -<para> -Le format d'une entre dans <filename/sources.list/ utilisant les types -<literal/deb/ et <literal/deb-src/ est de la forme : - <literallayout>deb uri distribution [composant1] [composant2] [...]</literallayout> - <para> -L'URI de type <literal/deb/ doit indiquer la base de la distribution Debian -dans laquelle APT trouvera les informations dont il a besoin. -<literal/distribution/ peut spcifier le chemin exact : dans ce cas, on -doit omettre les composants et <literal/distribution/ doit se terminer par une -barre oblique (/). C'est utile quand seule une sous-section particulire de -l'archive dcrite par cet URI est intressante. Quand <literal/distribution/ -n'indique pas un chemin exact, un <literal/component/ au moins doit tre -prsent. - <para> -<literal/distribution/ peut aussi contenir une variable <literal/$(ARCH)/, -qui sera remplace par l'architecture Debian (i386, m68k, powerpc, ...) -sur laquelle s'excute le systme. On peut ainsi utiliser un fichier -<filename/sources.list/ qui ne dpend pas d'une architecture. En gnral, -ce n'est intressant que si l'on indique un chemin exact ; sinon -<literal/APT/ cre automatiquement un URI en fonction de l'architecture -effective. - <para> -Puisqu'on ne peut indiquer qu'une seule distribution par ligne, il peut tre -ncessaire de disposer le mme URI sur plusieurs lignes quand on veut -accder un sous-ensemble des distributions ou composants disponibles cette -adresse. APT trie les URI aprs avoir cre pour lui-mme la liste -complte ; il regroupe les rfrences multiples au mme hte Internet -en vue d'une connexion unique et il vite ainsi, par exemple, d'tablir une -connexion FTP, de la fermer, faire autre chose, puis d'tablir encore cette -connexion. Cette fonctionnalit permet l'accs des sites FTP surchargs qui -limitent le nombre de connexions simultanes pour les utilisateurs anonymes. -APT paralllise aussi les connexions diffrents htes pour tirer plus -efficacement parti des sites faible bande passante. - <para> -Il est important d'indiquer les sources par ordre de prfrence, -la source principale apparaissant en premier. Un tri est fait, de la plus -rapide la plus lente ; par exemple, CD-ROM suivi par les htes d'un -rseau local, puis les htes Internet distants. - <para> -Voici quelques exemples : - <literallayout> -deb http://http.us.debian.org/debian stable main contrib non-free -deb http://http.us.debian.org/debian dists/stable-updates/ - </literallayout> - </RefSect1> - - <RefSect1><title>La spcification des URI - -Les URI actuellement reconnus sont : cdrom, file, http et ftp. - - file - -Le procd - - cdrom - -Le procd - - http - -Le procd - - ftp - -Le procd - - copy - -Le procd - - rshssh - -Le procd rsh/ssh utilise rsh/ssh pour se connecter une -machine distante en tant que tel utilisateur donn et pour accder aux -fichiers. Aucune authentification par mot de passe n'est possible : il -faut au pralable rgler ce problme avec des cls RSA ou bien rhosts. Pour -l'accs aux fichiers de la machine distante et le transfert, on utilise les -commandes standard - - - - Exemples - -Utiliser l'archive stocke localement (ou monte via NFS) dans -/home/jason/debian pour stable/main, stable/contrib et stable/non-free. - deb file:/home/jason/debian stable main contrib non-free - -Comme ci-dessus, except que cette ligne utilise la distribution - unstable  (dveloppement). - deb file:/home/jason/debian unstable main contrib non-free - -La prcdente ligne, mais pour les sources. - deb-src file:/home/jason/debian unstable main contrib non-free - -Utiliser HTTP pour accder l'archive situe archive.debian.org, et -n'utiliser que la section hamm/main. - deb http://archive.debian.org/debian-archive hamm main - -Utiliser FTP pour accder l'archive situe ftp.debian.org, dans le -rpertoire debian, et n'utiliser que la section stable/contrib. - deb ftp://ftp.debian.org/debian stable contrib - -Utiliser FTP pour accder l'archive situe ftp.debian.org, dans le -rpertoire debian, et n'utiliser que la section unstable/contrib. Si cette -ligne et celle de l'exemple prcdent dans deb ftp://ftp.debian.org/debian unstable contrib - -Utiliser HTTP pour accder l'archive situe nonus.debian.org, dans le -rpertoire debian-non-US. - deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free - -Utiliser HTTP pour accder l'archive situe nonus.debian.org, dans le -rpertoire debian-non-US, et n'utiliser que les fichiers trouvs dans -unstable/binary-i386 pour les machines i386, dans -unstable/binary-m68k pour les machines m68k et ainsi de suite -pour les autres architectures supportes. [Notez que cet exemple montre -seulement la manire d'utiliser la variable substituer, non-us n'tant plus -structur de cette manire.] - deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/ - - - Voir aussi</> - <para> - &apt-cache; &apt-conf; - </RefSect1> - - &manbugs; - &manauthor; - &deux-traducteurs; -</refentry> diff --git a/doc/fr/sources.list.fr.5.xml b/doc/fr/sources.list.fr.5.xml new file mode 100644 index 000000000..4abd9c95e --- /dev/null +++ b/doc/fr/sources.list.fr.5.xml @@ -0,0 +1,249 @@ +<?xml version="1.0" encoding="iso-8859-15" standalone="no"?> +<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" + "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ + +<!ENTITY % aptent SYSTEM "apt.ent.fr"> +%aptent; + +]> + +<refentry lang="fr"> + + <refentryinfo> + &apt-author.jgunthorpe; + &apt-author.team; + &apt-email; + &apt-product; + <!-- The last update date --> + <date>29 February 2004</date> + </refentryinfo> + +<refmeta> +<refentrytitle>sources.list</refentrytitle> +<manvolnum>5</manvolnum> +</refmeta> + +<refnamediv> +<refname>sources.list</refname> +<refpurpose>Une liste, utilise par APT, indiquant les ressources de paquets</refpurpose> +</refnamediv> + +<refsect1><title>Description + +La liste des ressources de paquets indique o trouver les archives +du systme de distribution de paquets utilis. Pour l'instant, cette page +de manuel ne documente que le systme d'empaquetage utilis par le systme +Debian GNU/Linux. Ce fichier de contrle est situ dans +/etc/apt/sources.list. + + +La liste des sources est conue pour prendre en compte un nombre quelconque +de sources actives et diffrents mdia. Le fichier prsente +une source par ligne et la source prfre apparat en premier. Le format de +chaque ligne est : type uri args. Le premier lment, +type, dtermine le format des args. +uri est un +identificateur universel de ressources (URI), qui est un sur-ensemble du plus +spcifique et bien connu repre universel de ressources, ou URL. La fin de la +ligne peut tre un commentaire commenant par un caractre #. + + + +Les types deb et deb-src. + +Le type deb dcrit une archive Debian classique deux niveaux, +distribution/composant. distribution peut prendre +l'une des valeurs suivantes : stable, unstable, ou +testing, et composant : main, contrib, +non-free, ou non-us. Le type deb-src +dcrit le +code source pour une distribution Debian dans le mme format que le type +deb. Une ligne deb-src est ncessaire pour rcuprer les +index de sources. + + +Le format d'une entre dans sources.list utilisant les types +deb et deb-src est de la forme : + + deb uri distribution [composant1] [composant2] [...] + +L'URI de type deb doit indiquer la base de la distribution Debian +dans laquelle APT trouvera les informations dont il a besoin. +distribution peut spcifier le chemin exact : dans ce cas, on +doit omettre les composants et distribution doit se terminer par une +barre oblique (/). C'est utile quand seule une sous-section particulire de +l'archive dcrite par cet URI est intressante. Quand distribution +n'indique pas un chemin exact, un component au moins doit tre +prsent. + + +distribution peut aussi contenir une variable $(ARCH), +qui sera remplace par l'architecture Debian (i386, m68k, powerpc, ...) +sur laquelle s'excute le systme. On peut ainsi utiliser un fichier +sources.list qui ne dpend pas d'une architecture. En gnral, +ce n'est intressant que si l'on indique un chemin exact ; sinon +APT cre automatiquement un URI en fonction de l'architecture +effective. + + +Puisqu'on ne peut indiquer qu'une seule distribution par ligne, il peut tre +ncessaire de disposer le mme URI sur plusieurs lignes quand on veut +accder un sous-ensemble des distributions ou composants disponibles cette +adresse. APT trie les URI aprs avoir cre pour lui-mme la liste +complte ; il regroupe les rfrences multiples au mme hte Internet +en vue d'une connexion unique et il vite ainsi, par exemple, d'tablir une +connexion FTP, de la fermer, faire autre chose, puis d'tablir encore cette +connexion. Cette fonctionnalit permet l'accs des sites FTP surchargs qui +limitent le nombre de connexions simultanes pour les utilisateurs anonymes. +APT paralllise aussi les connexions diffrents htes pour tirer plus +efficacement parti des sites faible bande passante. + + +Il est important d'indiquer les sources par ordre de prfrence, +la source principale apparaissant en premier. Un tri est fait, de la plus +rapide la plus lente ; par exemple, CD-ROM suivi par les htes d'un +rseau local, puis les htes Internet distants. + +Voici quelques exemples : + + + +deb http://http.us.debian.org/debian stable main contrib non-free +deb http://http.us.debian.org/debian dists/stable-updates/ + + + +La spcification des URI + +Les URI actuellement reconnus sont : cdrom, file, http et ftp. + +file + +Le procd file permet qu'un rpertoire arbitraire au sein du +systme de fichier soit considr comme une archive. On s'en sert avec les +montages NFS, les miroirs et les archives locaux. + + + +cdrom + +Le procd cdrom permet l'utilisation d'un lecteur de CDROM local +avec la possibilit de changer de media. Utilisez le programme &apt-cdrom; +pour crer des entres dans la liste de sources. + + + + +http + +Le procd http indique un serveur HTTP comme archive. Si une +variable d'environnement http_proxy (au format http://server:port/) +existe, le serveur mandataire indiqu par http_proxy est utilis. +Quand un serveur mandataire HTTP/1.1 demande une authentification, on peut +utiliser la chane http://user:pass@server:port/. Notez qu'il s'agit d'une +mthode d'authentification peu sre. + + + + +ftp + +Le procd ftp indique un serveur FTP comme archive. Le +fonctionnement en mode ftp est grandement configurable ; rfrez-vous + la page de manuel de &apt-cdrom; pour davantage de renseignements. On +remarquera qu'on peut indiquer un mandataire ftp avec la variable +d'environnement ftp_proxy. On peut aussi spcifier un mandataire http +(les serveurs mandataires http comprennent souvent les URL ftp) en utilisant +cette mthode et SEULEMENT cette mthode. Les mandataires ftp utilisant http +et qui sont spcifis dans le fichier de configuration seront ignors. + + + + +copy + +Le procd copy est identique au procd file +except que +les paquets sont copis dans le cache du rpertoire au lieu d'tre utiliss +directement depuis leur emplacement. C'est utile aux gens qui utilisent un +disque zip pour recopier des fichiers avec APT. + + + +rshssh + +Le procd rsh/ssh utilise rsh/ssh pour se connecter une +machine distante en tant que tel utilisateur donn et pour accder aux +fichiers. Aucune authentification par mot de passe n'est possible : il +faut au pralable rgler ce problme avec des cls RSA ou bien rhosts. Pour +l'accs aux fichiers de la machine distante et le transfert, on utilise les +commandes standard find et dd. + + + + + + +Exemples + +Utiliser l'archive stocke localement (ou monte via NFS) dans +/home/jason/debian pour stable/main, stable/contrib et stable/non-free. + + deb file:/home/jason/debian stable main contrib non-free + + +Comme ci-dessus, except que cette ligne utilise la distribution + unstable  (dveloppement). + + deb file:/home/jason/debian unstable main contrib non-free + + +La prcdente ligne, mais pour les sources. + +deb-src file:/home/jason/debian unstable main contrib non-free + + +Utiliser HTTP pour accder l'archive situe archive.debian.org, et +n'utiliser que la section hamm/main. + + deb http://archive.debian.org/debian-archive hamm main + + +Utiliser FTP pour accder l'archive situe ftp.debian.org, dans le +rpertoire debian, et n'utiliser que la section stable/contrib. + + deb ftp://ftp.debian.org/debian stable contrib + + +Utiliser FTP pour accder l'archive situe ftp.debian.org, dans le +rpertoire debian, et n'utiliser que la section unstable/contrib. Si cette +ligne et celle de l'exemple prcdent dans sources.list +apparaissent, une seule session FTP sera utilise pour les deux lignes. + + deb ftp://ftp.debian.org/debian unstable contrib + + +Utiliser HTTP pour accder l'archive situe nonus.debian.org, dans le +rpertoire debian-non-US. + + deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free + + +Utiliser HTTP pour accder l'archive situe nonus.debian.org, dans le +rpertoire debian-non-US, et n'utiliser que les fichiers trouvs dans +unstable/binary-i386 pour les machines i386, dans +unstable/binary-m68k pour les machines m68k et ainsi de suite +pour les autres architectures reconnues. [Notez que cet exemple montre +seulement la manire d'utiliser la variable substituer, non-us n'tant plus +structur de cette manire.] + + deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/ + + +Voir aussi +&apt-cache; &apt-conf; + + +&manbugs; +&traducteur; + \ No newline at end of file diff --git a/doc/fr/vendors.list.fr.5.sgml b/doc/fr/vendors.list.fr.5.sgml deleted file mode 100644 index a19aa0dc8..000000000 --- a/doc/fr/vendors.list.fr.5.sgml +++ /dev/null @@ -1,104 +0,0 @@ - - - -%aptent; - -]> - - - &apt-docinfo; - - - vendors.list - 5 - - - - - vendors.list - Configuration de la cl de scurit pour APT - - - Description</> - <para> -La liste des distributeurs de paquets contient une liste de tous les -distributeurs -pour lesquels vous souhaitez authentifier les paquets que vous tlchargez. -Pour chaque distributeur, elle doit contenir l'empreinte de la cl PGP ; -ce qui permettra une vrification de la signature du fichier release et la -la vrification consquente des sommes de contrle des paquets tlchargs. -Pour cela, vous devez ajouter, dans une ligne du fichier sources.list, la -chane, enferme dans des crochets, identifiant le distributeur -(voyez plus loin), et cela pour tous les miroirs du rfrentiel de ce -distributeur. - <para> -Le format de ce fichier est semblable au format du fichier apt.conf. C'est un -nombre quelconque de blocs concernant des distributeurs ; chaque bloc -commence -par une chane donnant la <replaceable/key_type/ et le <replaceable/vendor_id/. - <para> -Un distributeur peut avoir plusieurs blocs pour dfinir diffrentes rgles -de scurit pour diffrentes distributions. Par exemple, Debian utilise -des mthodes de signature diffrents pour les distributions stable et unstable. - <para> - <replaceable/key_type/ est le type de vrification requis. -Actuellement, il n'existe qu'un seul type disponible, savoir - <literal/simple-key/. - <para> - <replaceable/vendor_id/ est la chane identifiant le distributeur. C'est -une chane quelconque que vous devez donner pour identifier de faon unique -un distributeur list dans ce fichier. - - Exemple : -<informalexample><programlisting> -simple-key "joe" -{ - Fingerprint "0987AB4378FSD872343298787ACC"; - Name "Joe Shmoe <joe@shmoe.com>"; -} -</programlisting></informalexample> - - </RefSect1> - - <RefSect1><Title>Le type simple-key</> - <para> -Ce type de vrification est utilis quand le distributeur possde une -seule cl servant la signature du fichier Release. Les lments -suivants doivent tre prsents : - - <VariableList> - <VarListEntry><Term>Fingerprint</Term> - <ListItem><Para> - L'empreinte PGP de la cl. L'empreinte sera note de faon standard avec -ou sans espaces. L'option <option/--fingerprint/ pour - <CiteRefEntry><RefEntryTitle><command/gpg/</RefEntryTitle><ManVolNum/1/</CiteRefEntry> -affichera L'empreinte pour la (les) cl(s) slectionn(e)s. - </VarListEntry> - - <VarListEntry><Term>Name</Term> - <ListItem><Para> -C'est une chane dcrivant le propritaire de la cl ou le distributeur. On -peut mettre le nom du distributeur et son adresse lectronique. Cette chane -doit tre mise entre des ". - </VarListEntry> - - </VariableList> - </RefSect1> - - <RefSect1><Title>Fichiers</> - <para> - <filename>/etc/apt/vendors.list</> - </RefSect1> - - <RefSect1><Title>Voir aussi</> - <para> - &sources-list; - </RefSect1> - - &manbugs; - &manauthor; - &traducteur; -</refentry> - diff --git a/ftparchive/cachedb.h b/ftparchive/cachedb.h index 1229b98ef..1b043e1aa 100644 --- a/ftparchive/cachedb.h +++ b/ftparchive/cachedb.h @@ -69,7 +69,7 @@ class CacheDB enum FlagList {FlControl = (1<<0),FlMD5=(1<<1),FlContents=(1<<2)}; struct StatStore { - uint32_t mtime; + time_t mtime; uint32_t Flags; } CurStat; struct StatStore OldStat; diff --git a/methods/ftp.cc b/methods/ftp.cc index 8bf8a2ee6..f595e0ca4 100644 --- a/methods/ftp.cc +++ b/methods/ftp.cc @@ -1102,7 +1102,7 @@ int main(int argc,const char *argv[]) // Run the http method string Path = flNotFile(argv[0]) + "http"; - execl(Path.c_str(),Path.c_str(),0); + execl(Path.c_str(),Path.c_str(),(char *)NULL); cerr << _("Unable to invoke ") << Path << endl; exit(100); } diff --git a/methods/http.cc b/methods/http.cc index 27f0dafef..2ec1fe631 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -672,9 +672,9 @@ void HttpMethod::SendReq(FetchItem *Itm,CircleBuf &Out) and a no-store directive for archives. */ sprintf(Buf,"GET %s HTTP/1.1\r\nHost: %s\r\n", Itm->Uri.c_str(),ProperHost.c_str()); - if (_config->FindB("Acquire::http::No-Cache",false) == true) - strcat(Buf,"Cache-Control: no-cache\r\nPragma: no-cache\r\n"); - else + // only generate a cache control header if we actually want to + // use a cache + if (_config->FindB("Acquire::http::No-Cache",false) == false) { if (Itm->IndexFile == true) sprintf(Buf+strlen(Buf),"Cache-Control: max-age=%u\r\n", @@ -686,6 +686,10 @@ void HttpMethod::SendReq(FetchItem *Itm,CircleBuf &Out) } } } + // generate a no-cache header if needed + if (_config->FindB("Acquire::http::No-Cache",false) == true) + strcat(Buf,"Cache-Control: no-cache\r\nPragma: no-cache\r\n"); + string Req = Buf; diff --git a/po/bs.po b/po/bs.po index f249ceecc..d4f9b1f66 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: 2005-03-05 12:06+0100\n" +"POT-Creation-Date: 2005-03-29 07:17+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" @@ -315,7 +315,7 @@ msgid "" " --no-delink Enable delinking debug mode\n" " --contents Control contents file generation\n" " -c=? Read this configuration file\n" -" -o=? Set an arbitary configuration option" +" -o=? Set an arbitrary configuration option" msgstr "" #: ftparchive/apt-ftparchive.cc:757 @@ -669,7 +669,7 @@ msgid "WARNING: The following packages cannot be authenticated!" msgstr "Slijedeći paketi će biti nadograđeni:" #: cmdline/apt-get.cc:698 -msgid "Install these packages without verification? [y/N] " +msgid "Install these packages without verification [y/N]? " msgstr "" #: cmdline/apt-get.cc:700 @@ -739,7 +739,8 @@ msgid "Abort." msgstr "Odustani." #: cmdline/apt-get.cc:886 -msgid "Do you want to continue? [Y/n] " +#, fuzzy +msgid "Do you want to continue [Y/n]? " msgstr "Da li želite nastaviti? [Y/n]" #: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959 @@ -1372,7 +1373,7 @@ msgid "Internal error adding a diversion" msgstr "" #: apt-inst/deb/dpkgdb.cc:383 -msgid "The pkg cache must be initialize first" +msgid "The pkg cache must be initialized first" msgstr "" #: apt-inst/deb/dpkgdb.cc:386 @@ -1433,7 +1434,8 @@ msgid "" msgstr "" #: methods/cdrom.cc:130 methods/cdrom.cc:168 -msgid "Wrong CD" +#, fuzzy +msgid "Wrong CD-ROM" msgstr "Pogrešan CD" #: methods/cdrom.cc:163 @@ -1441,7 +1443,7 @@ msgstr "Pogrešan CD" msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "Ne mogu demontirati CD-ROM na %s, moguće je da se još uvijek koristi." -#: methods/cdrom.cc:177 methods/file.cc:77 +#: methods/cdrom.cc:177 methods/file.cc:77 methods/rsh.cc:264 msgid "File not found" msgstr "Datoteka nije pronađena" @@ -1522,7 +1524,7 @@ msgstr "" msgid "Protocol corruption" msgstr "Oštećenje protokola" -#: methods/ftp.cc:446 methods/rsh.cc:232 +#: methods/ftp.cc:446 methods/rsh.cc:232 apt-pkg/contrib/fileutl.cc:492 msgid "Write error" msgstr "Greška pri pisanju" @@ -2189,37 +2191,37 @@ msgstr "" #: apt-pkg/pkgcachegen.cc:117 #, c-format -msgid "Error occured while processing %s (NewPackage)" +msgid "Error occurred while processing %s (NewPackage)" msgstr "" #: apt-pkg/pkgcachegen.cc:129 #, c-format -msgid "Error occured while processing %s (UsePackage1)" +msgid "Error occurred while processing %s (UsePackage1)" msgstr "" #: apt-pkg/pkgcachegen.cc:150 #, c-format -msgid "Error occured while processing %s (UsePackage2)" +msgid "Error occurred while processing %s (UsePackage2)" msgstr "" #: apt-pkg/pkgcachegen.cc:154 #, c-format -msgid "Error occured while processing %s (NewFileVer1)" +msgid "Error occurred while processing %s (NewFileVer1)" msgstr "" #: apt-pkg/pkgcachegen.cc:184 #, c-format -msgid "Error occured while processing %s (NewVersion1)" +msgid "Error occurred while processing %s (NewVersion1)" msgstr "" #: apt-pkg/pkgcachegen.cc:188 #, c-format -msgid "Error occured while processing %s (UsePackage3)" +msgid "Error occurred while processing %s (UsePackage3)" msgstr "" #: apt-pkg/pkgcachegen.cc:192 #, c-format -msgid "Error occured while processing %s (NewVersion2)" +msgid "Error occurred while processing %s (NewVersion2)" msgstr "" #: apt-pkg/pkgcachegen.cc:207 @@ -2236,12 +2238,12 @@ msgstr "" #: apt-pkg/pkgcachegen.cc:241 #, c-format -msgid "Error occured while processing %s (FindPkg)" +msgid "Error occurred while processing %s (FindPkg)" msgstr "" #: apt-pkg/pkgcachegen.cc:254 #, c-format -msgid "Error occured while processing %s (CollectFileProvides)" +msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "" #: apt-pkg/pkgcachegen.cc:260 diff --git a/po/ca.po b/po/ca.po index b9cf11c5f..980c2ec42 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: 2005-03-05 22:10+0100\n" +"POT-Creation-Date: 2005-03-29 07:17+0200\n" "PO-Revision-Date: 2005-02-15 18:53+0100\n" "Last-Translator: Jordi Mallach <jordi@debian.org>\n" "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n" @@ -325,6 +325,7 @@ msgid "Error processing contents %s" msgstr "S'ha produït un error en processar el fitxer de continguts %s" #: ftparchive/apt-ftparchive.cc:551 +#, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -363,7 +364,7 @@ msgid "" " --no-delink Enable delinking debug mode\n" " --contents Control contents file generation\n" " -c=? Read this configuration file\n" -" -o=? Set an arbitary configuration option" +" -o=? Set an arbitrary configuration option" msgstr "" "Forma d'ús: apt-ftparchive [opcions] ordre\n" "Ordres: packages camí_binaris [fitxer_substitucions prefix_camí]]\n" @@ -1553,7 +1554,7 @@ msgid "Internal error adding a diversion" msgstr "Error intern afegint una desviació" #: apt-inst/deb/dpkgdb.cc:383 -msgid "The pkg cache must be initialize first" +msgid "The pkg cache must be initialized first" msgstr "Primer s'ha d'inicialitzar la memòria cau d'aquest paquet" #: apt-inst/deb/dpkgdb.cc:386 @@ -2384,37 +2385,37 @@ msgstr "La memòria cau té un sistema de versions incompatible" #: apt-pkg/pkgcachegen.cc:117 #, c-format -msgid "Error occured while processing %s (NewPackage)" +msgid "Error occurred while processing %s (NewPackage)" msgstr "S'ha produït un error durant el processament de %s (NewPackage)" #: apt-pkg/pkgcachegen.cc:129 #, c-format -msgid "Error occured while processing %s (UsePackage1)" +msgid "Error occurred while processing %s (UsePackage1)" msgstr "S'ha produït un error durant el processament de %s (UsePackage1)" #: apt-pkg/pkgcachegen.cc:150 #, c-format -msgid "Error occured while processing %s (UsePackage2)" +msgid "Error occurred while processing %s (UsePackage2)" msgstr "S'ha produït un error durant el processament de %s (UsePackage2)" #: apt-pkg/pkgcachegen.cc:154 #, c-format -msgid "Error occured while processing %s (NewFileVer1)" +msgid "Error occurred while processing %s (NewFileVer1)" msgstr "S'ha produït un error durant el processament de %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:184 #, c-format -msgid "Error occured while processing %s (NewVersion1)" +msgid "Error occurred while processing %s (NewVersion1)" msgstr "S'ha produït un error durant el processament de %s (NewVersion1)" #: apt-pkg/pkgcachegen.cc:188 #, c-format -msgid "Error occured while processing %s (UsePackage3)" +msgid "Error occurred while processing %s (UsePackage3)" msgstr "S'ha produït un error durant el processament de %s (UsePackage3)" #: apt-pkg/pkgcachegen.cc:192 #, c-format -msgid "Error occured while processing %s (NewVersion2)" +msgid "Error occurred while processing %s (NewVersion2)" msgstr "S'ha produït un error durant el processament de %s (NewVersion2)" #: apt-pkg/pkgcachegen.cc:207 @@ -2433,12 +2434,12 @@ msgstr "" #: apt-pkg/pkgcachegen.cc:241 #, c-format -msgid "Error occured while processing %s (FindPkg)" +msgid "Error occurred while processing %s (FindPkg)" msgstr "S'ha produït un error durant el processament de %s (FindPkg)" #: apt-pkg/pkgcachegen.cc:254 #, c-format -msgid "Error occured while processing %s (CollectFileProvides)" +msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "" "S'ha produït un error durant el processament de %s (CollectFileProvides)" diff --git a/po/cs.po b/po/cs.po index 9a5a04022..7dceb8c07 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-05 22:10+0100\n" +"POT-Creation-Date: 2005-03-29 07:17+0200\n" "PO-Revision-Date: 2005-02-11 16:14+0100\n" "Last-Translator: Miroslav Kure <kurem@debian.cz>\n" "Language-Team: Czech <provoz@debian.cz>\n" @@ -320,6 +320,7 @@ msgid "Error processing contents %s" msgstr "Chyba při zpracovávání obsahu %s" #: ftparchive/apt-ftparchive.cc:551 +#, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -358,7 +359,7 @@ msgid "" " --no-delink Enable delinking debug mode\n" " --contents Control contents file generation\n" " -c=? Read this configuration file\n" -" -o=? Set an arbitary configuration option" +" -o=? Set an arbitrary configuration option" msgstr "" "Použití: apt-ftparchive [volby] příkaz\n" "Příkazy: packages binárnícesta [souboroverride [prefixcesty]]\n" @@ -1529,7 +1530,7 @@ msgid "Internal error adding a diversion" msgstr "Vnitřní chyba při přidávání diverze" #: apt-inst/deb/dpkgdb.cc:383 -msgid "The pkg cache must be initialize first" +msgid "The pkg cache must be initialized first" msgstr "Cache balíků se musí nejprve inicializovat" #: apt-inst/deb/dpkgdb.cc:386 @@ -2355,37 +2356,37 @@ msgstr "Cache má nekompatibilní systém správy verzí" #: apt-pkg/pkgcachegen.cc:117 #, c-format -msgid "Error occured while processing %s (NewPackage)" +msgid "Error occurred while processing %s (NewPackage)" msgstr "Při zpracování %s se objevila chyba (NewPackage)" #: apt-pkg/pkgcachegen.cc:129 #, c-format -msgid "Error occured while processing %s (UsePackage1)" +msgid "Error occurred while processing %s (UsePackage1)" msgstr "Při zpracování %s se objevila chyba (UsePackage1)" #: apt-pkg/pkgcachegen.cc:150 #, c-format -msgid "Error occured while processing %s (UsePackage2)" +msgid "Error occurred while processing %s (UsePackage2)" msgstr "Při zpracování %s se objevila chyba (UsePackage2)" #: apt-pkg/pkgcachegen.cc:154 #, c-format -msgid "Error occured while processing %s (NewFileVer1)" +msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Při zpracování %s se objevila chyba (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:184 #, c-format -msgid "Error occured while processing %s (NewVersion1)" +msgid "Error occurred while processing %s (NewVersion1)" msgstr "Při zpracování %s se objevila chyba (NewVersion1)" #: apt-pkg/pkgcachegen.cc:188 #, c-format -msgid "Error occured while processing %s (UsePackage3)" +msgid "Error occurred while processing %s (UsePackage3)" msgstr "Při zpracování %s se objevila chyba (UsePackage3)" #: apt-pkg/pkgcachegen.cc:192 #, c-format -msgid "Error occured while processing %s (NewVersion2)" +msgid "Error occurred while processing %s (NewVersion2)" msgstr "Při zpracování %s se objevila chyba (NewVersion2)" #: apt-pkg/pkgcachegen.cc:207 @@ -2404,12 +2405,12 @@ msgstr "" #: apt-pkg/pkgcachegen.cc:241 #, c-format -msgid "Error occured while processing %s (FindPkg)" +msgid "Error occurred while processing %s (FindPkg)" msgstr "Chyba při zpracování %s (FindPkg)" #: apt-pkg/pkgcachegen.cc:254 #, c-format -msgid "Error occured while processing %s (CollectFileProvides)" +msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Při zpracování %s se objevila chyba (CollectFileProvides)" #: apt-pkg/pkgcachegen.cc:260 diff --git a/po/cy.po b/po/cy.po new file mode 100644 index 000000000..d8360fc3f --- /dev/null +++ b/po/cy.po @@ -0,0 +1,2503 @@ +# APT yn Gymraeg: APT in Welsh. +# This file is under the same licence as APT itself. +# Dafydd Harries <daf@muse.19inch.net>, 2004. +# +msgid "" +msgstr "" +"Project-Id-Version: APT\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-04-29 21:56-0700\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" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: cmdline/apt-cache.cc:133 +#, c-format +msgid "Package %s version %s has an unmet dep:\n" +msgstr "Mae gan y pecyn %s fersiwn %s ddibyniaeth heb ei gwrdd:\n" + +#: cmdline/apt-cache.cc:173 cmdline/apt-cache.cc:525 cmdline/apt-cache.cc:613 +#: cmdline/apt-cache.cc:769 cmdline/apt-cache.cc:987 cmdline/apt-cache.cc:1355 +#: cmdline/apt-cache.cc:1506 +#, c-format +msgid "Unable to locate package %s" +msgstr "Ni ellir lleoli'r pecyn %s" + +#: cmdline/apt-cache.cc:230 +msgid "Total Package Names : " +msgstr "Cyfanswm Enwau Pecynnau : " + +#: cmdline/apt-cache.cc:270 +msgid " Normal Packages: " +msgstr " Pecynnau Normal: " + +#: cmdline/apt-cache.cc:271 +msgid " Pure Virtual Packages: " +msgstr " Pecynnau Cwbl Rhithwir: " + +#: cmdline/apt-cache.cc:272 +msgid " Single Virtual Packages: " +msgstr " Pecynnau Rhithwir Sengl: " + +#: cmdline/apt-cache.cc:273 +msgid " Mixed Virtual Packages: " +msgstr " Pecynnau Rhithwir Cymysg: " + +#: cmdline/apt-cache.cc:274 +msgid " Missing: " +msgstr " Ar Goll: " + +#: cmdline/apt-cache.cc:276 +msgid "Total Distinct Versions: " +msgstr "Cyfanswm Fersiynau Gwahanol: " + +#: cmdline/apt-cache.cc:278 +msgid "Total Dependencies: " +msgstr "Cyfanswm Dibyniaethau: " + +#: cmdline/apt-cache.cc:281 +msgid "Total Ver/File relations: " +msgstr "Cyfanswm perthyniadau fersiwn/ffeil: " + +#: cmdline/apt-cache.cc:283 +msgid "Total Provides Mappings: " +msgstr "Cyfanswm Mapiau Darpariath: " + +#: cmdline/apt-cache.cc:295 +msgid "Total Globbed Strings: " +msgstr "Cyfanswm Llinynau Glob: " + +#: cmdline/apt-cache.cc:309 +msgid "Total Dependency Version space: " +msgstr "Cyfanswm gofod Fersiwn Dibyniaeth: " + +#: cmdline/apt-cache.cc:314 +msgid "Total Slack space: " +msgstr "Cyfanswm gofod Slac: " + +#: cmdline/apt-cache.cc:322 +msgid "Total Space Accounted for: " +msgstr "Cyfanswm Gofod Cyfrifwyd: " + +#: cmdline/apt-cache.cc:444 cmdline/apt-cache.cc:1187 +#, c-format +msgid "Package file %s is out of sync." +msgstr "Nid yw'r ffeil pecyn %s yn gydamseredig." + +#: cmdline/apt-cache.cc:1229 +msgid "You must give exactly one pattern" +msgstr "Rhaid i chi ddarparu un patrwm yn union" + +#: cmdline/apt-cache.cc:1383 +msgid "No packages found" +msgstr "Canfuwyd dim pecyn" + +#: cmdline/apt-cache.cc:1460 +msgid "Package Files:" +msgstr "Ffeiliau Pecynnau:" + +#: cmdline/apt-cache.cc:1467 cmdline/apt-cache.cc:1553 +msgid "Cache is out of sync, can't x-ref a package file" +msgstr "Nid yw'r storfa yn gydamserol, ni ellir croesgyfeirio ffeil pecym" + +#: cmdline/apt-cache.cc:1468 +#, c-format +msgid "%4i %s\n" +msgstr "%4i %s\n" + +#. Show any packages have explicit pins +#: cmdline/apt-cache.cc:1480 +msgid "Pinned Packages:" +msgstr "Pecynnau wedi eu Pinio:" + +#: cmdline/apt-cache.cc:1492 cmdline/apt-cache.cc:1533 +msgid "(not found)" +msgstr "(heb ganfod)" + +#. Installed version +#: cmdline/apt-cache.cc:1513 +msgid " Installed: " +msgstr " Wedi Sefydlu: " + +#: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1523 +msgid "(none)" +msgstr "(dim)" + +#. Candidate Version +#: cmdline/apt-cache.cc:1520 +msgid " Candidate: " +msgstr " Ymgeisydd: " + +#: cmdline/apt-cache.cc:1530 +msgid " Package Pin: " +msgstr " Pin Pecyn: " + +#. Show the priority tables +#: cmdline/apt-cache.cc:1539 +msgid " Version Table:" +msgstr " Tabl Fersiynnau:" + +#: cmdline/apt-cache.cc:1554 +#, c-format +msgid " %4i %s\n" +msgstr " %4i %s\n" + +#: cmdline/apt-cache.cc:1581 cmdline/apt-cdrom.cc:731 cmdline/apt-config.cc:70 +#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545 +#: cmdline/apt-get.cc:2299 cmdline/apt-sortpkgs.cc:144 +#, c-format +msgid "%s %s for %s %s compiled on %s %s\n" +msgstr "%s %s ar gyfer %s %s wedi ei grynhow ar %s %s\n" + +#: cmdline/apt-cache.cc:1588 +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 arbitary configuration option, eg -o dir::cache=/tmp\n" +"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" +msgstr "" +"Defnydd: apt-cache [opsiynnau] gorchymyn\n" +" apt-cache [opsiynnau] add ffeil1 [ffeil2 ...]\n" +" apt-cache [opsiynnau] showpkg pecyn1 [pecyn2 ...]\n" +" apt-cache [opsiynnau] showsrc pecyn1 [pecyn2 ...]\n" +"\n" +"Mae apt-cache yn erfyn lefel isel a ddefnyddir i ymdrin a ffeiliau storfa " +"deuol APT, ac ymholi gwybodaeth ohonynt\n" +"\n" +"Gorchmynion:\n" +" add - Ychwanegu ffeil pecyn i'r storfa ffynhonell\n" +" gencaches - Adeiladu'r storfeydd pecyn a ffynhonell\n" +" showpkg - Dangos gwybodaeth cyffredinol am becyn sengl\n" +" showsrc - Dangos cofnodion ffynhonell\n" +" stats - Dangos rhyw ystadegau sylfaenol\n" +" dump - Dangos y ffeil cyfan mewn ffurf syml\n" +" dumpavail - Dangos ffeil argaeledd\n" +" unmet - Dangos dibyniaethau heb eu darparu\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 arbitary configuration option, eg -o dir::cache=/tmp\n" +"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" + +#: cmdline/apt-config.cc:41 +msgid "Arguments not in pairs" +msgstr "Nid yw ymresymiadau mewn parau" + +#: 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 arbitary configuration option, eg -o dir::cache=/tmp\n" +msgstr "Defnydd: apt-config [opsiynnau] gorchymyn\n" +"\n" +"Mae apt-config yn erfyn syml sy'n darllen ffeil cyfluniad APT\n" +"\n" +"Gorchmynion:\n" +" shell - Modd plisgyn\n" +" dump - Dangod y cyfluniad\n" +"\n" +"Opsiynnau:\n" +" -h Y testun cymorth hwn\n" +" -c=? Darllen y ffeil cyfluniad\n" +" -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n" + +#: cmdline/apt-extracttemplates.cc:98 +#, c-format +msgid "%s not a valid DEB package." +msgstr "Nid yw %s yn becyn DEB dilys." + +# FIXME: "debian" +#: 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 arbitary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" +"Defnydd: apt-extracttemplates ffeil1 [ffeil2 ...]\n" +"\n" +"Mae apt-extracttemplates yn erfyn ar gyfer echdynnu manylion cyfluniad a\n" +"templed o becynnau Debian.\n" +"\n" +"Opsiynnau:\n" +" -h Dangos y testun cymorth hwn\n" +" -t Gosod y cyfeiriadur dros dro\n" +" -c=? Darllen y ffeil cyfluniad hwn\n" +" -o=? Gosod opsiwn cyfluniad mympwyol e.e. -o dir::cache=/tmp\n" + +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#, c-format +msgid "Unable to write to %s" +msgstr "Ni ellir ysgrifennu i %s" + +#: cmdline/apt-extracttemplates.cc:310 +msgid "Cannot get debconf version. Is debconf installed?" +msgstr "Ni ellir cael fersiwn debconf. Ydi debconf wedi ei sefydlu?" + +#: ftparchive/apt-ftparchive.cc:163 ftparchive/apt-ftparchive.cc:337 +msgid "Package extension list is too long" +msgstr "Mae'r rhestr estyniad pecyn yn rhy hir." + +#: ftparchive/apt-ftparchive.cc:165 ftparchive/apt-ftparchive.cc:179 +#: ftparchive/apt-ftparchive.cc:202 ftparchive/apt-ftparchive.cc:252 +#: ftparchive/apt-ftparchive.cc:266 ftparchive/apt-ftparchive.cc:288 +#, c-format +msgid "Error Processing directory %s" +msgstr "Gwall wrth brosesu'r cyfeiriadur %s" + +#: ftparchive/apt-ftparchive.cc:250 +msgid "Source extension list is too long" +msgstr "Mae'r rhestr estyniad ffynhonell yn rhy hir" + +#: ftparchive/apt-ftparchive.cc:367 +msgid "Error writing header to contents file" +msgstr "Gwall wrth ysgrifennu pennawd i'r ffeil cynnwys" + +#: ftparchive/apt-ftparchive.cc:397 +#, c-format +msgid "Error Processing Contents %s" +msgstr "Gwall wrth Brosesu Cynnwys %s" + +# FIXME: full stops +#: ftparchive/apt-ftparchive.cc:551 +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 arbitary configuration option" +msgstr "" +"Defnydd: apt-ftparchive [opsiynnau] gorchymyn\n" +"Gorchmynion: packages llwybrdeuol [ffeilgwrthwneud [cynddodiadllwybr]]\n" +" sources llwybrffynhonell [ffeilgwrthwneud [cynddodiadllwybr]]\n" +" contents llwybr\n" +" release llwybr\n" +" generate cyfluniad [grŵpiau]\n" +" clean cyfluniad\n" +"\n" +"Mae apt-ftparchive yn cynhyrchu ffeiliau mynegai ar gyfer archifau Debian.\n" +"Mae'n cynnal nifer o arddulliau o gynhyrchiad, yn cynnwys modd wedi\n" +"awtomeiddio'n llwyr a modd yn debyg i dpkg-scanpackages a " +"dpkg-scansources.\n" +"\n" +"Gall apt-ftparchive gynhyrchu ffeil Package o goeden o ffeiliau .deb.\n" +"Mae'r ffeil Package yn cynnwys yr holl feysydd rheoli o bob pecyn yn\n" +"ogystal a'r stwnsh MD5 a maint y ffeil. Cynhelir ffeil gwrthwneud er mwyn\n" +"gorfodi'r gwerthoedd Priority a Section.\n" +"\n" +"Yn debyg, gall apt-ftparchive gynhyrchu ffeil Sources o goeden o ffeiliau\n" +".dsc. Gellir defnyddio'r opsiwn --source-override er mwyn penodi ffeil\n" +"gwrthwneud ffynhonell.\n" +"\n" +"Dylid rhedeg y gorchmynion 'packages' a 'sources' yng ngwraidd y goeden.\n" +"Fe ddylai llwybrdeuol bwyntio at sail y chwilio ailadroddus a fe ddylai\n" +"ffeilgwrthwneud gynnwys y gosodiadau gwrthwneud. Ychwanegir\n" +"cynddodiadllwybr i'r meysydd enw ffeil os ydynt yn bresennol. Esiampl\n" +"defnydd o'r archif Debian:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Opsiynnau:\n" +" -h Y testun cymorth hwn\n" +" --md5 Rheoli cynhyrchiad stwnch MD5\n" +" -s=? Ffeil gwrthwneud ffynhonell\n" +" -q Tawel\n" +" -d=? Dewis cronda data storfa opsiynnol\n" +" --no-delink Galluogi'r modd datgysylltu datnamu\n" +" --contents Rheoli cynhyrchiad ffeil cynnwys\n" +" -c=? Darllen y ffeil cyfluniad hwn\n" +" -o=? Gosod opsiwn cyfluniad mympwyol" + +#: ftparchive/apt-ftparchive.cc:757 +msgid "No selections matched" +msgstr "Dim dewisiadau'n cyfateb" + +#: ftparchive/apt-ftparchive.cc:830 +#, c-format +msgid "Some files are missing in the package file group `%s'" +msgstr "Mae rhai ffeiliau ar goll yn y grŵp ffeiliau pecyn `%s'" + +#: ftparchive/cachedb.cc:45 +#, c-format +msgid "DB was corrupted, file renamed to %s.old" +msgstr "Llygrwyd y cronfa data, ailenwyd y ffeil i %s.old" + +#: ftparchive/cachedb.cc:63 +#, c-format +msgid "DB is old, attempting to upgrade %s" +msgstr "Hen gronfa data, yn ceisio uwchraddio %s" + +#: ftparchive/cachedb.cc:73 +#, c-format +msgid "Unable to open DB file %s: %s" +msgstr "Ni ellir agor y ffeil DB2 %s: %s" + +#: ftparchive/cachedb.cc:114 +#, c-format +msgid "File date has changed %s" +msgstr "Dyddiad ffeil wedi newid %s" + +#: ftparchive/cachedb.cc:155 +msgid "Archive has no control record" +msgstr "Does dim cofnod rheoli gan yr archif" + +#: ftparchive/cachedb.cc:267 +msgid "Unable to get a cursor" +msgstr "Ni ellir cael cyrchydd" + +#: ftparchive/writer.cc:79 +#, c-format +msgid "W: Unable to read directory %s\n" +msgstr "Rh: Ni ellir darllen y cyfeiriadur %s\n" + +#: ftparchive/writer.cc:84 +#, c-format +msgid "W: Unable to stat %s\n" +msgstr "Rh: Ni ellir gwneud stat() o %s\n" + +#: ftparchive/writer.cc:126 +msgid "E: " +msgstr "G: " + +#: ftparchive/writer.cc:128 +msgid "W: " +msgstr "Rh: " + +#: ftparchive/writer.cc:135 +msgid "E: Errors apply to file " +msgstr "G: Mae gwallau yn cymhwyso i'r ffeil " + +#: ftparchive/writer.cc:152 ftparchive/writer.cc:182 +#, c-format +msgid "Failed to resolve %s" +msgstr "Methwyd datrys %s" + +#: ftparchive/writer.cc:164 +msgid "Tree walking failed" +msgstr "Methwyd cerdded y goeden" + +#: ftparchive/writer.cc:189 +#, c-format +msgid "Failed to open %s" +msgstr "Methwyd agor %s" + +# FIXME +#: ftparchive/writer.cc:246 +#, c-format +msgid " DeLink %s [%s]\n" +msgstr " DatGysylltu %s [%s]\n" + +#: ftparchive/writer.cc:254 +#, c-format +msgid "Failed to readlink %s" +msgstr "Methwyd darllen y cyswllt %s" + +#: ftparchive/writer.cc:258 +#, c-format +msgid "Failed to unlink %s" +msgstr "Methwyd datgysylltu %s" + +#: ftparchive/writer.cc:265 +#, c-format +msgid "*** Failed to link %s to %s" +msgstr "*** Methwyd cysylltu %s at %s" + +#: ftparchive/writer.cc:275 +#, c-format +msgid " DeLink limit of %sB hit.\n" +msgstr " Tarwyd y terfyn cyswllt %sB.\n" + +#: ftparchive/writer.cc:352 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 +#, c-format +msgid "Failed to stat %s" +msgstr "Methodd stat() o %s" + +#: ftparchive/writer.cc:372 +msgid "Archive had no package field" +msgstr "Doedd dim maes pecyn gan yr archif" + +#: ftparchive/writer.cc:380 ftparchive/writer.cc:589 +#, c-format +msgid " %s has no override entry\n" +msgstr " Does dim cofnod gwrthwneud gan %s\n" + +#: ftparchive/writer.cc:423 ftparchive/writer.cc:671 +#, c-format +msgid " %s maintainer is %s not %s\n" +msgstr " Cynaliwr %s yw %s nid %s\n" + +#: ftparchive/contents.cc:346 ftparchive/contents.cc:377 +msgid "realloc - Failed to allocate memory" +msgstr "realloc - Methwyd neilltuo cof" + +#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#, c-format +msgid "Unable to open %s" +msgstr "Ni ellir agor %s" + +#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#, c-format +msgid "Malformed override %s line %lu #1" +msgstr "Gwrthwneud camffurfiol %s llinell %lu #1" + +#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#, c-format +msgid "Malformed override %s line %lu #2" +msgstr "Gwrthwneud camffurfiol %s llinell %lu #2" + +#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#, c-format +msgid "Malformed override %s line %lu #3" +msgstr "Gwrthwneud camffurfiol %s llinell %lu #3" + +#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#, c-format +msgid "Failed to read the override file %s" +msgstr "Methwydd darllen y ffeil dargyfeirio %s" + +#: ftparchive/multicompress.cc:75 +#, c-format +msgid "Unknown Compresison Algorithm '%s'" +msgstr "Dull Cywasgu Anhysbys '%s'" + +#: ftparchive/multicompress.cc:105 +#, c-format +msgid "Compressed output %s needs a compression set" +msgstr "Mae'r allbwn cywasgiedig %s angen cywasgiad wedi ei osod" + +#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +msgid "Failed to create IPC pipe to subprocess" +msgstr "Methwyd creu pibell cyfathrebu at isbroses" + +#: ftparchive/multicompress.cc:198 +msgid "Failed to create FILE*" +msgstr "Methwyd creu FILE*" + +#: ftparchive/multicompress.cc:201 +msgid "Failed to fork" +msgstr "Methodd fork()" + +#: ftparchive/multicompress.cc:215 +msgid "Compress Child" +msgstr "Plentyn Cywasgu" + +#: ftparchive/multicompress.cc:238 +#, c-format +msgid "Internal Error, Failed to create %s" +msgstr "Gwall Mewnol, Methwyd creu %s" + +#: ftparchive/multicompress.cc:289 +msgid "Failed to create subprocess IPC" +msgstr "Methwyd creu isbroses IPC" + +#: ftparchive/multicompress.cc:324 +msgid "Failed to exec compressor " +msgstr "Methwyd gweithredu cywasgydd " + +#: ftparchive/multicompress.cc:363 +msgid "decompressor" +msgstr "datgywasgydd" + +#: ftparchive/multicompress.cc:406 +msgid "IO to subprocess/file failed" +msgstr "Methodd MA i isbroses/ffeil" + +#: ftparchive/multicompress.cc:458 +msgid "Failed to read while computing MD5" +msgstr "Methwyd darllen wrth gyfrifo MD5" + +#: ftparchive/multicompress.cc:475 +#, c-format +msgid "Problem unlinking %s" +msgstr "Gwall wrth datgysylltu %s" + +#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#, c-format +msgid "Failed to rename %s to %s" +msgstr "Methwyd ailenwi %s at %s" + +#: cmdline/apt-get.cc:118 +msgid "Y" +msgstr "I" + +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1466 +#, c-format +msgid "Regex compilation error - %s" +msgstr "Gwall crynhoi patrwm - %s" + +#: cmdline/apt-get.cc:235 +msgid "The following packages have unmet dependencies:" +msgstr "Mae gan y pecynnau canlynol ddibyniaethau heb eu bodloni:" + +#: cmdline/apt-get.cc:325 +#, c-format +msgid "but %s is installed" +msgstr "ond mae %s wedi ei sefydlu" + +#: cmdline/apt-get.cc:327 +#, c-format +msgid "but %s is to be installed" +msgstr "ond mae %s yn mynd i gael ei sefydlu" + +#: cmdline/apt-get.cc:334 +msgid "but it is not installable" +msgstr "ond ni ellir ei sefydlu" + +#: cmdline/apt-get.cc:336 +msgid "but it is a virtual package" +msgstr "ond mae'n becyn rhithwir" + +#: cmdline/apt-get.cc:339 +msgid "but it is not installed" +msgstr "ond nid yw wedi ei sefydlu" + +#: cmdline/apt-get.cc:339 +msgid "but it is not going to be installed" +msgstr "ond nid yw'n mynd i gael ei sefydlu" + +#: cmdline/apt-get.cc:344 +msgid " or" +msgstr " neu" + +#: cmdline/apt-get.cc:373 +msgid "The following NEW packages will be installed:" +msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" + +#: cmdline/apt-get.cc:399 +msgid "The following packages will be REMOVED:" +msgstr "Caiff y pecynnau canlynol eu TYNNU:" + +#: cmdline/apt-get.cc:421 +msgid "The following packages have been kept back" +msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl" + +#: cmdline/apt-get.cc:442 +msgid "The following packages will be upgraded" +msgstr "Caiff y pecynnau canlynol eu uwchraddio" + +#: cmdline/apt-get.cc:463 +msgid "The following packages will be DOWNGRADED" +msgstr "Caiff y pecynnau canlynol eu ISRADDIO" + +#: cmdline/apt-get.cc:483 +msgid "The following held packages will be changed:" +msgstr "Caiff y pecynnau wedi eu dal canlynol eu newid:" + +#: cmdline/apt-get.cc:536 +#, c-format +msgid "%s (due to %s) " +msgstr "%s (oherwydd %s) " + +#: cmdline/apt-get.cc:544 +msgid "" +"WARNING: The following essential packages will be removed\n" +"This should NOT be done unless you know exactly what you are doing!" +msgstr "" +"RHYBUDD: Caiff y pecynnau hanfodol canlynol eu tynnu\n" +"NI DDYLIR gwneud hyn os nad ydych chi'n gwybod yn union beth rydych chi'n\n" +"ei wneud!" + +#: cmdline/apt-get.cc:575 +#, c-format +msgid "%lu upgraded, %lu newly installed, " +msgstr "%lu wedi uwchraddio, %lu newydd eu sefydlu, " + +#: cmdline/apt-get.cc:579 +#, c-format +msgid "%lu reinstalled, " +msgstr "%lu wedi ailsefydlu, " + +#: cmdline/apt-get.cc:581 +#, c-format +msgid "%lu downgraded, " +msgstr "%lu wedi eu israddio, " + +#: cmdline/apt-get.cc:583 +#, c-format +msgid "%lu to remove and %lu not upgraded.\n" +msgstr "%lu i'w tynnu a %lu heb eu uwchraddio.\n" + +#: cmdline/apt-get.cc:587 +#, c-format +msgid "%lu not fully installed or removed.\n" +msgstr "%lu heb eu sefydlu na tynnu'n gyflawn.\n" + +#: cmdline/apt-get.cc:647 +msgid "Correcting dependencies..." +msgstr "Yn cywiro dibyniaethau..." + +#: cmdline/apt-get.cc:650 +msgid " failed." +msgstr " wedi methu." + +#: cmdline/apt-get.cc:653 +msgid "Unable to correct dependencies" +msgstr "Ni ellir cywiro dibyniaethau" + +#: cmdline/apt-get.cc:656 +msgid "Unable to minimize the upgrade set" +msgstr "Ni ellir bychanu y set uwchraddio" + +#: cmdline/apt-get.cc:658 +msgid " Done" +msgstr " Wedi Gorffen" + +#: cmdline/apt-get.cc:662 +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." + +#: cmdline/apt-get.cc:665 +msgid "Unmet dependencies. Try using -f." +msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio -f." + +#: cmdline/apt-get.cc:687 +msgid "WARNING: The following packages cannot be securely authenticated!" +msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!" + +#: cmdline/apt-get.cc:698 +msgid "Abort? [Y/n] " +msgstr "Erthylu? [I/n] " + +#: cmdline/apt-get.cc:755 +msgid "Packages need to be removed but Remove is disabled." +msgstr "Rhaid tynnu pecynnau on mae Tynnu wedi ei analluogi." + +#: cmdline/apt-get.cc:781 cmdline/apt-get.cc:1755 cmdline/apt-get.cc:1788 +msgid "Unable to lock the download directory" +msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho" + +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1836 cmdline/apt-get.cc:2047 +#: apt-pkg/cachefile.cc:67 +msgid "The list of sources could not be read." +msgstr "Methwyd darllen y rhestr ffynhonellau." + +#: cmdline/apt-get.cc:811 +#, c-format +msgid "Need to get %sB/%sB of archives.\n" +msgstr "Mae angeyn cyrchu %sB/%sB o archifau.\n" + +#: cmdline/apt-get.cc:814 +#, c-format +msgid "Need to get %sB of archives.\n" +msgstr "Mae angen cyrchu %sB o archifau.\n" + +#: cmdline/apt-get.cc:819 +#, c-format +msgid "After unpacking %sB of additional disk space will be used.\n" +msgstr "Ar ôl dadbacio defnyddir %sB o ofod disg ychwanegol.\n" + +#: cmdline/apt-get.cc:822 +#, c-format +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:839 +#, c-format +msgid "You don't have enough free space in %s." +msgstr "Does dim digon o le rhydd gennych yn %s." + +#: cmdline/apt-get.cc:848 +msgid "There are problems and -y was used without --force-yes" +msgstr "Mae problemau a defnyddwyd -y heb --force-yes" + +#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:874 +msgid "Trivial Only specified but this is not a trivial operation." +msgstr "Penodwyd Syml Yn Unig ond nid yw hyn yn weithred syml." + +#: cmdline/apt-get.cc:856 +msgid "Yes, do as I say!" +msgstr "Ie, gwna fel rydw i'n dweud!" + +#: cmdline/apt-get.cc:858 +#, c-format +msgid "" +"You are about to do something potentially harmful\n" +"To continue type in the phrase '%s'\n" +" ?] " +msgstr "" +"Rydych ar fin gwneud rhywbeth a all fod yn niweidiol\n" +"Er mwyn mynd ymlaen, teipiwch y frawddeg '%s'\n" +" ?]" + +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:883 +msgid "Abort." +msgstr "Erthylu." + +#: cmdline/apt-get.cc:879 +msgid "Do you want to continue? [Y/n] " +msgstr "Ydych chi eisiau mynd ymlaen? [Y/n] " + +#: cmdline/apt-get.cc:954 cmdline/apt-get.cc:1325 cmdline/apt-get.cc:1945 +#, c-format +msgid "Failed to fetch %s %s\n" +msgstr "Methwyd cyrchu %s %s\n" + +#: cmdline/apt-get.cc:972 +msgid "Some files failed to download" +msgstr "Methodd rhai ffeiliau lawrlwytho" + +#: cmdline/apt-get.cc:973 cmdline/apt-get.cc:1954 +msgid "Download complete and in download only mode" +msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig" + +#: cmdline/apt-get.cc:979 +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"Ni ellir cyrchu rhai archifau, efallai dylwch rhedeg apt-get update, neu " +"geidio defnyddio --fix-missing?" + +#: cmdline/apt-get.cc:983 +msgid "--fix-missing and media swapping is not currently supported" +msgstr "Ni chynhelir cyfnewid cyfrwng efo --fix-missing ar hyn o bryd" + +#: cmdline/apt-get.cc:988 +msgid "Unable to correct missing packages." +msgstr "Ni ellir cywiro pecynnau ar goll." + +#: cmdline/apt-get.cc:989 +msgid "Aborting Install." +msgstr "Yn Erthylu'r Sefydliad." + +#: cmdline/apt-get.cc:1022 +#, c-format +msgid "Note, selecting %s instead of %s\n" +msgstr "Sylwer, yn dewis %s yn hytrach na %s\n" + +#: cmdline/apt-get.cc:1032 +#, c-format +msgid "Skipping %s, it is already installed and upgrade is not set.\n" +msgstr "Yn hepgor %s, mae wedi ei sefydlu a nid yw uwchraddio wedi ei osod.\n" + +#: cmdline/apt-get.cc:1050 +#, c-format +msgid "Package %s is not installed, so not removed\n" +msgstr "Nid yw'r pecyn %s wedi ei sefydlu, felly ni chaif ei dynnu\n" + +#: cmdline/apt-get.cc:1061 +#, c-format +msgid "Package %s is a virtual package provided by:\n" +msgstr "Mae'r pecyn %s yn becyn rhithwir a ddarparir gan:\n" + +#: cmdline/apt-get.cc:1073 +msgid " [Installed]" +msgstr " [Sefydliwyd]" + +#: cmdline/apt-get.cc:1078 +msgid "You should explicitly select one to install." +msgstr "Dylech ddewis un yn benodol i'w sefydlu." + +# FIXME: punctuation +#: cmdline/apt-get.cc:1083 +#, c-format +msgid "" +"Package %s has no available version, but exists in the database.\n" +"This typically means that the package was mentioned in a dependency and\n" +"never uploaded, has been obsoleted or is not available with the contents\n" +"of sources.list\n" +msgstr "" +"Does dim fersiwn gan y pecyn %s, ond mae'n bodoli yn y cronfa data.\n" +"Mae hyn fel arfer yn golygu y crybwyllwyd y pecyn mewn dibyniaeth ond heb\n" +"gael ei uwchlwytho, cafodd ei ddarfod neu nid yw ar gael drwy gynnwys y\n" +"ffeil sources.list.\n" + +#: cmdline/apt-get.cc:1103 +msgid "However the following packages replace it:" +msgstr "Fodd bynnag, mae'r pecynnau canlynol yn cymryd ei le:" + +#: cmdline/apt-get.cc:1106 +#, c-format +msgid "Package %s has no installation candidate" +msgstr "Does dim ymgeisydd sefydlu gan y pecyn %s" + +#: cmdline/apt-get.cc:1126 +#, c-format +msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" +msgstr "Nid yw ailsefydlu %s yn bosib, gan ni ellir ei lawrlwytho.\n" + +#: cmdline/apt-get.cc:1134 +#, c-format +msgid "%s is already the newest version.\n" +msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n" + +#: cmdline/apt-get.cc:1161 +#, c-format +msgid "Release '%s' for '%s' was not found" +msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'" + +#: cmdline/apt-get.cc:1163 +#, c-format +msgid "Version '%s' for '%s' was not found" +msgstr "Ni chanfuwyd y fersiwn '%s' o '%s' " + +#: cmdline/apt-get.cc:1169 +#, c-format +msgid "Selected version %s (%s) for %s\n" +msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n" + +#: cmdline/apt-get.cc:1279 +msgid "The update command takes no arguments" +msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau" + +#: cmdline/apt-get.cc:1292 +msgid "Unable to lock the list directory" +msgstr "Ni ellir cloi'r cyfeiriadur rhestr" + +#: cmdline/apt-get.cc:1344 +msgid "" +"Some index files failed to download, they have been ignored, or old ones " +"used instead." +msgstr "" +"Methwodd rhai ffeiliau mynegai lawrlwytho: maent wedi eu anwybyddu, neu hen " +"rai eu defnyddio yn lle." + +#: cmdline/apt-get.cc:1363 +msgid "Internal Error, AllUpgrade broke stuff" +msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" + +#: cmdline/apt-get.cc:1453 cmdline/apt-get.cc:1489 +#, c-format +msgid "Couldn't find package %s" +msgstr "Methwyd canfod pecyn %s" + +#: cmdline/apt-get.cc:1476 +#, 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:1506 +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:1509 +msgid "" +"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " +"solution)." +msgstr "" +"Dibyniaethau heb eu bodloni. Ceisiwch rhedeg 'apt-get -f install' efo dim " +"pecyn (neu penodwch ddatrys)" + +# FIXME: needs commas +#: cmdline/apt-get.cc:1521 +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 "" +"Methwyd sefydlu rhai pecynnau. Gall hyn olygu eich bod chi wedi gofyn\n" +"am sefyllfa amhosib neu, os ydych chi'n defnyddio'r dosraniad\n" +"ansefydlog, fod rhai pecynnau angenrheidiol heb gael eu creu eto neu\n" +"heb gael eu symud allan o Incoming." + +# FIXME: commas, wrapping +#: cmdline/apt-get.cc:1529 +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 "" +"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:1534 +msgid "The following information may help to resolve the situation:" +msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:" + +#: cmdline/apt-get.cc:1537 +msgid "Broken packages" +msgstr "Pecynnau wedi torri" + +#: cmdline/apt-get.cc:1563 +msgid "The following extra packages will be installed:" +msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:" + +#: cmdline/apt-get.cc:1629 +msgid "Suggested packages:" +msgstr "Pecynnau a awgrymmir:" + +#: cmdline/apt-get.cc:1630 +msgid "Recommended packages:" +msgstr "Pecynnau a argymhellir:" + +#: cmdline/apt-get.cc:1650 +msgid "Calculating Upgrade... " +msgstr "Yn Cyfrifo'r Uwchraddiad... " + +#: cmdline/apt-get.cc:1653 methods/ftp.cc:702 methods/connect.cc:99 +msgid "Failed" +msgstr "Methwyd" + +#: cmdline/apt-get.cc:1658 +msgid "Done" +msgstr "Wedi Gorffen" + +#: cmdline/apt-get.cc:1831 +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:1858 cmdline/apt-get.cc:2065 +#, c-format +msgid "Unable to find a source package for %s" +msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s" + +#: cmdline/apt-get.cc:1905 +#, 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:1910 +#, 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:1913 +#, c-format +msgid "Need to get %sB of source archives.\n" +msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n" + +#: cmdline/apt-get.cc:1919 +#, c-format +msgid "Fetch Source %s\n" +msgstr "Cyrchu Ffynhonell %s\n" + +#: cmdline/apt-get.cc:1950 +msgid "Failed to fetch some archives." +msgstr "Methwyd cyrchu rhai archifau." + +#: cmdline/apt-get.cc:1978 +#, 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:1990 +#, c-format +msgid "Unpack command '%s' failed.\n" +msgstr "Methodd y gorchymyn dadbacio '%s'.\n" + +#: cmdline/apt-get.cc:2007 +#, c-format +msgid "Build command '%s' failed.\n" +msgstr "Methodd y gorchymyn adeiladu '%s'.\n" + +#: cmdline/apt-get.cc:2026 +msgid "Child process failed" +msgstr "Methodd proses plentyn" + +#: cmdline/apt-get.cc:2042 +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:2070 +#, 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:2090 +#, c-format +msgid "%s has no build depends.\n" +msgstr "Nid oes dibyniaethau adeiladu gan %s.\n" + +#: cmdline/apt-get.cc:2142 +#, c-format +msgid "" +"%s dependency for %s cannot be satisfied because the package %s cannot be " +"found" +msgstr "" +"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn " +"%s" + +#: cmdline/apt-get.cc:2194 +#, c-format +msgid "" +"%s dependency for %s cannot be satisfied because no available versions of " +"package %s can satisfy version requirements" +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:2229 +#, 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:2254 +#, c-format +msgid "Failed to satisfy %s dependency for %s: %s" +msgstr "Methwyd bodloni dibyniaeth %s am %s: %s" + +#: cmdline/apt-get.cc:2268 +#, c-format +msgid "Build-dependencies for %s could not be satisfied." +msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s." + +#: cmdline/apt-get.cc:2272 +msgid "Failed to process build dependencies" +msgstr "Methwyd prosesu dibyniaethau adeiladu" + +#: cmdline/apt-get.cc:2304 +msgid "Supported Modules:" +msgstr "Modylau a Gynhelir:" + +# FIXME: split +#: cmdline/apt-get.cc:2345 +msgid "" +"Usage: apt-get [options] command\n" +" apt-get [options] install|remove pkg1 [pkg2 ...]\n" +" apt-get [options] source pkg1 [pkg2 ...]\n" +"\n" +"apt-get is a simple command line interface for downloading and\n" +"installing packages. The most frequently used commands are update\n" +"and install.\n" +"\n" +"Commands:\n" +" update - Retrieve new lists of packages\n" +" upgrade - Perform an upgrade\n" +" install - Install new packages (pkg is libc6 not libc6.deb)\n" +" remove - Remove packages\n" +" source - Download source archives\n" +" build-dep - Configure build-dependencies for source packages\n" +" dist-upgrade - Distribution upgrade, see apt-get(8)\n" +" dselect-upgrade - Follow dselect selections\n" +" clean - Erase downloaded archive files\n" +" autoclean - Erase old downloaded archive files\n" +" check - Verify that there are no broken dependencies\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -q Loggable output - no progress indicator\n" +" -qq No output except for errors\n" +" -d Download only - do NOT install or unpack archives\n" +" -s No-act. Perform ordering simulation\n" +" -y Assume Yes to all queries and do not prompt\n" +" -f Attempt to continue if the integrity check fails\n" +" -m Attempt to continue if archives are unlocatable\n" +" -u Show a list of upgraded packages as well\n" +" -b Build the source package after fetching it\n" +" -V Show verbose version numbers\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitary 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 "" +"Defnydd: apt-get [opsiynnau] gorchymyn\n" +" apt-get [opsiynnau] install|remove pecyn1 [pecyn2 ...]\n" +" apt-get [opsiynnau] source pecyn1 [pecyn2 ...]\n" +"\n" +"Mae apt-get yn rhyngwyneb llinell orchymyn syml ar gyfer lawrlwytho a\n" +"sefydlu pecynnau. Y gorchmynion \"update\" a \"install\" yw'r rhai a\n" +"ddefnyddir amlaf.\n" +"\n" +"Gorchmynion:\n" +" update - Cyrchu rhestrau pecynnau newydd\n" +" update - Uwchraddio pecynnau wedi sefydlu\n" +" install - Sefydlu pecynnau newydd (defnyddiwch libc6 nid libc6.deb)\n" +" remove - Tynnu pecynnau\n" +" source - Lawrlwytho archifau ffynhonell\n" +" build-dep - Cyflunio dibyniaethau adeiladu ar gyfer pecynnau ffynhonell\n" +" dist-upgrade - Uwchraddio dosraniad, gweler apt-get(8)\n" +" dselect-upgrade - Dilyn dewisiadau dselect\n" +" clean - Dileu ffeiliau archif wedi eu lawrlwytho\n" +" autoclean - Dileu hen ffeiliau archif wedi eu lawrlwytho\n" +" check - Gwirio fod dim dibyniaethau torredig\n" +"\n" +"Opsiynnau:\n" +" -h Y testun cymorth hwn.\n" +" -q Allbwn cofnodadwy - dim dangosydd cynydd\n" +" -qq Dim allbwn ar wahan i wallau\n" +" -d Lawrlwytho yn unig - peidio a sefydlu na dadbacio archifau\n" +" -s Peidio gweithredu. Gwneir efelychiad trefn.\n" +" -y Peidio a gofyn cwestiynnau a chymryd yn ganiataol mai 'Ie' yw'r ateb\n" +" -f Ceisio mynd ymlaen os mae'r prawf integredd yn methu\n" +" -m Ceisio mynd ymlaen os methir dod o hyd i archifau\n" +" -u Dangos rhestr o archifau a uwchraddir hefyd\n" +" -b Adeiladu'r pecyn ffynhonell ar ôl ei lawrlwytho\n" +" -V Dangos rhifau fersiwn cyflawn\n" +" -c=? Darllen y ffeil cyfluniad hwn\n" +" -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n" +"\n" +"Gweler y tudalenau llawlyfr apt-get(8) sources.list(5) a apt.conf(5) am\n" +"fwy o wybodaeth ac opsiynnau.\n" +"\n" +" Mae gan yr APT hwn bŵerau buwch hudol.\n" + +#: cmdline/acqprogress.cc:55 +msgid "Hit " +msgstr "Presennol " + +#: cmdline/acqprogress.cc:79 +msgid "Get:" +msgstr "Cyrchu:" + +#: cmdline/acqprogress.cc:110 +msgid "Ign " +msgstr "Anwybyddu " + +#: cmdline/acqprogress.cc:114 +msgid "Err " +msgstr "Gwall " + +#: cmdline/acqprogress.cc:135 +#, c-format +msgid "Fetched %sB in %s (%sB/s)\n" +msgstr "Cyrchwyd %sB yn %s (%sB/s)\n" + +#: cmdline/acqprogress.cc:225 +msgid " [Working]" +msgstr " [Gweithio]" + +#: 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 "" +"Newid Cyfrwng: Os gwelwch yn dda, rhowch y disg a'r label\n" +" '%s'\n" +"yn y gyrriant '%s' a gwasgwch Enter\n" + +#: cmdline/apt-sortpkgs.cc:86 +msgid "Unknown package record!" +msgstr "Cofnod pecyn anhysbys!" + +#: 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 arbitary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" +"Defnydd: apt-sortpkgs [opsiynnau] ffeil1 [ffeil2 ...]\n" +"\n" +"Mae apt-sortpkgs yn erfyn syml er mwyn trefnu ffeiliau pecyn. Defnyddir yr\n" +"opsiwn -s er mwyn penodi pa fath o ffeil ydyw.\n" +"\n" +"Opsiynnau:\n" +" -h Y testun cymorth hwn\n" +" -s Defnyddio trefnu ffeil ffynhonell\n" +" -c=? Darllen y ffeil cyfluniad hwn\n" +" -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n" + +#: dselect/install:32 +msgid "Bad default setting!" +msgstr "Rhagosodiad gwael!" + +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 +#: dselect/install:104 dselect/update:45 +msgid "Press enter to continue." +msgstr "Gwasgwch Enter er mwyn mynd ymlaen." + +#: dselect/install:100 +msgid "Some errors occurred while unpacking. I'm going to configure the" +msgstr "Digwyddod rhau gwallau wrth dadbacio. Rydw i'n mynd i gyflunio'r" + +#: dselect/install:101 +msgid "packages that were installed. This may result in duplicate errors" +msgstr "pecynnau a gafwyd eu sefydlu. Gall hyn achosi gwallau dyblyg neu" + +#: dselect/install:102 +msgid "or errors caused by missing dependencies. This is OK, only the errors" +msgstr "wallau a achosir gan ddibyniaethau coll. Mae hyn yn iawn, dim ond y" + +#: dselect/install:103 +msgid "" +"above this message are important. Please fix them and run [I]nstall again" +msgstr "" +"gwallau uwchben y neges hwn sy'n bwysig. Trwsiwch nhw a rhedwch [S]efydlu " +"eto." + +#: dselect/update:30 +msgid "Merging Available information" +msgstr "Yn cyfuno manylion Ar Gael" + +#: apt-inst/contrib/extracttar.cc:115 +msgid "Failed to create pipes" +msgstr "Methwyd creu pibau" + +#: apt-inst/contrib/extracttar.cc:140 +msgid "Failed to exec gzip " +msgstr "Methwyd gweithredu gzip" + +#: apt-inst/contrib/extracttar.cc:177 apt-inst/contrib/extracttar.cc:203 +msgid "Corrupted archive" +msgstr "Archif llygredig" + +#: apt-inst/contrib/extracttar.cc:192 +msgid "Tar Checksum failed, archive corrupted" +msgstr "Methodd swm gwirio Tar, archif llygredig" + +#: apt-inst/contrib/extracttar.cc:295 +#, c-format +msgid "Unknown TAR header type %u, member %s" +msgstr "Math pennawd TAR anhysbys %u, aelod %s" + +#: apt-inst/contrib/arfile.cc:73 +msgid "Invalid archive signature" +msgstr "Llofnod archif annilys" + +#: apt-inst/contrib/arfile.cc:81 +msgid "Error reading archive member header" +msgstr "Gwall wrth ddarllen pennawd aelod archif" + +#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +msgid "Invalid archive member header" +msgstr "Pennawd aelod archif annilys" + +#: apt-inst/contrib/arfile.cc:131 +msgid "Archive is too short" +msgstr "Mae'r archif yn rhy fyr" + +#: apt-inst/contrib/arfile.cc:135 +msgid "Failed to read the archive headers" +msgstr "Methwyd darllen pennawdau'r archif" + +#: apt-inst/filelist.cc:384 +msgid "DropNode called on still linked node" +msgstr "Galwyd DropNode ar nôd sydd o hyd wedi ei gysylltu" + +#: apt-inst/filelist.cc:416 +msgid "Failed to locate the hash element!" +msgstr "Methyd lleoli yr elfen <hash>!" + +#: apt-inst/filelist.cc:463 +msgid "Failed to allocate diversion" +msgstr "Methwyd neilltuo dargyfeiriad" + +#: apt-inst/filelist.cc:468 +msgid "Internal Error in AddDiversion" +msgstr "Gwall Mewnol yn AddDiversion" + +#: apt-inst/filelist.cc:481 +#, c-format +msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" +msgstr "Yn ceisio trosysgrifo dargyfeiriad, %s -> %s a %s/%s" + +# FIXME: "the" +#: apt-inst/filelist.cc:510 +#, c-format +msgid "Double add of diversion %s -> %s" +msgstr "Ychwanegiad dwbl o'r dargyfeiriad %s -> %s" + +#: apt-inst/filelist.cc:553 +#, c-format +msgid "Duplicate conf file %s/%s" +msgstr "Ffeil cyfluniad dyblyg %s/%s" + +#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#, c-format +msgid "Failed write file %s" +msgstr "Methwyd ysgrifennu ffeil %s" + +#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 +#, c-format +msgid "Failed to close file %s" +msgstr "Methwyd cau ffeil %s" + +#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#, c-format +msgid "The path %s is too long" +msgstr "Mae'r llwybr %s yn rhy hir" + +#: apt-inst/extract.cc:127 +#, c-format +msgid "Unpacking %s more than once" +msgstr "Yn dadbacio %s mwy nag unwaith" + +#: apt-inst/extract.cc:137 +#, c-format +msgid "The directory %s is diverted" +msgstr "Mae'r cyfeiriadur %s wedi ei ddargyfeirio" + +#: apt-inst/extract.cc:147 +#, c-format +msgid "The package is trying to write to the diversion target %s/%s" +msgstr "Mae'r pecyn yn ceisio ysgrifennu i'r targed dargyfeiriad %s/%s" + +#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +msgid "The diversion path is too long" +msgstr "Mae llwybr y dargyfeiriad yn rhy hir" + +#: apt-inst/extract.cc:243 +#, c-format +msgid "The directory %s is being replaced by a non-directory" +msgstr "Mae'r cyfeiriadur %s yn cael ei amnewid efo rhywbeth nid cyfeiriadur ydyw" + +#: apt-inst/extract.cc:283 +msgid "Failed to locate node in its hash bucket" +msgstr "Methwyd lleoli nôd yn ei fwced stwnsh" + +#: apt-inst/extract.cc:287 +msgid "The path is too long" +msgstr "Mae'r llwybr yn rhy hir" + +# FIXME: wtf? +#: apt-inst/extract.cc:417 +#, c-format +msgid "Overwrite package match with no version for %s" +msgstr "Cyfatebiad pecyn trosysgrifo gyda dim fersiwn am %s" + +#: apt-inst/extract.cc:434 +#, c-format +msgid "File %s/%s overwrites the one in the package %s" +msgstr "Mae'r ffeil %s/%s yn trosysgrifo'r un yn y pecyn %s" + +#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709 +#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38 +#, c-format +msgid "Unable to read %s" +msgstr "Ni ellir darllen %s" + +#: apt-inst/extract.cc:494 +#, c-format +msgid "Unable to stat %s" +msgstr "Ni ellir gwneud stat() o %s" + +#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#, c-format +msgid "Failed to remove %s" +msgstr "Methwyd dileu %s" + +#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#, c-format +msgid "Unable to create %s" +msgstr "Ni ellir creu %s" + +#: apt-inst/deb/dpkgdb.cc:118 +#, c-format +msgid "Failed to stat %sinfo" +msgstr "Methwyd stat() ar %sinfo" + +#: apt-inst/deb/dpkgdb.cc:123 +msgid "The info and temp directories need to be on the same filesystem" +msgstr "Rhaid i'r cyfeiriaduron 'info' a 'temp' for ar yr un system ffeiliau" + +#. Build the status cache +#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 +#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 +#: apt-pkg/pkgcachegen.cc:840 +msgid "Reading Package Lists" +msgstr "Yn Darllen Rhestrau Pecynnau" + +#: apt-inst/deb/dpkgdb.cc:180 +#, c-format +msgid "Failed to change to the admin dir %sinfo" +msgstr "Methwyd newid i'r cyfeiriadur gweinyddiaeth %sinfo" + +# FIXME +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 +#: apt-inst/deb/dpkgdb.cc:448 +msgid "Internal Error getting a Package Name" +msgstr "Gwall mewnol wrth gyrchu enw pecyn" + +#: apt-inst/deb/dpkgdb.cc:205 +msgid "Reading File Listing" +msgstr "Yn Darllen Rhestr Ffeiliau" + +#: apt-inst/deb/dpkgdb.cc:216 +#, c-format +msgid "" +"Failed to open the list file '%sinfo/%s'. If you cannot restore this file " +"then make it empty and immediately re-install the same version of the " +"package!" +msgstr "" +"Methwyd agor y ffeil rhestr '%sinfo/%s'. Os na allwch adfer y ffeil hwn yna " +"gwnewch e'n wag ac yna ail sefydlwch yr un ferswin o'r pecyn yn syth!" + +# FIXME +#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#, c-format +msgid "Failed reading the list file %sinfo/%s" +msgstr "Methwyd darllen y ffeil rhestr %sinfo/%s" + +#: apt-inst/deb/dpkgdb.cc:266 +msgid "Internal Error getting a Node" +msgstr "Gwall Mewnol wrth gael Nôd" + +# FIXME: literal +#: apt-inst/deb/dpkgdb.cc:309 +#, c-format +msgid "Failed to open the diversions file %sdiversions" +msgstr "Methwyd agor y ffeil dargyfeirio %sdiversions" + +#: apt-inst/deb/dpkgdb.cc:324 +msgid "The diversion file is corrupted" +msgstr "Mae'r ffeil dargyfeirio wed ei lygru" + +#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 +#: apt-inst/deb/dpkgdb.cc:341 +#, c-format +msgid "Invalid line in the diversion file: %s" +msgstr "Llinell annilys yn y ffeil dargyfeirio: %s" + +#: apt-inst/deb/dpkgdb.cc:362 +msgid "Internal Error adding a diversion" +msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad" + +#: apt-inst/deb/dpkgdb.cc:383 +msgid "The pkg cache must be initialize first" +msgstr "Rhaid i'r storfa pecynnau gael ei ymgychwyn yn gyntaf" + +#: apt-inst/deb/dpkgdb.cc:386 +msgid "Reading File List" +msgstr "Yn Darllen Rhestr Ffeiliau" + +#: apt-inst/deb/dpkgdb.cc:443 +#, c-format +msgid "Failed to find a Package: Header, offset %lu" +msgstr "Methwyd canfod pennawd \"Package:\". Atred: %lu" + +#: apt-inst/deb/dpkgdb.cc:465 +#, c-format +msgid "Bad ConfFile section in the status file. Offset %lu" +msgstr "Adrean \"ConfFile\" gwael yn y ffeil statws. Atred: %lu" + +#: apt-inst/deb/dpkgdb.cc:470 +#, c-format +msgid "Error parsing MD5. Offset %lu" +msgstr "Gwall wrth ramadegu MD5. Atred: %lu" + +#: apt-inst/deb/debfile.cc:55 +#, c-format +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:72 +#, c-format +msgid "Internal Error, could not locate member %s" +msgstr "Gwall Mewnol, methwyd lleoli aelod %s" + +#: apt-inst/deb/debfile.cc:104 +#, c-format +msgid "Couldn't change to %s" +msgstr "Methwyd newid i %s" + +#: apt-inst/deb/debfile.cc:125 +msgid "Internal Error, could not locate member" +msgstr "Gwall Methwyd, methwyd lleoli aelod" + +#: apt-inst/deb/debfile.cc:158 +msgid "Failed to locate a valid control file" +msgstr "Methwyd lleoli ffeil rheoli dilys" + +#: apt-inst/deb/debfile.cc:243 +msgid "Unparsible control file" +msgstr "Ffeil rheoli ni ellir ei ramadegu" + +#: methods/cdrom.cc:113 +#, c-format +msgid "Unable to read the cdrom database %s" +msgstr "Methwyd darllen y cronfa ddata CD-ROM %s" + +#: methods/cdrom.cc:122 +msgid "" +"Please use apt-cdrom to make this CD recognized by APT. apt-get update " +"cannot be used to add new CDs" +msgstr "" +"Defnyddiwch apt-cdrom fel bo APT yn adnabod y CD hwn. Ni ellir defnyddio " +"apt-get update i ychwanegu CDau newydd." + +#: methods/cdrom.cc:130 methods/cdrom.cc:168 +msgid "Wrong CD" +msgstr "CD Anghywir" + +#: methods/cdrom.cc:163 +#, c-format +msgid "Unable to unmount the CD-ROM in %s, it may still be in use." +msgstr "Ni ellir datglymu'r CD-ROM yn %s. Efallai ei fod e'n cael ei " +"ddefnyddio." + +#: methods/cdrom.cc:177 methods/file.cc:77 +msgid "File not found" +msgstr "Ffeil heb ei ganfod" + +#: methods/copy.cc:42 methods/gzip.cc:133 methods/gzip.cc:142 +msgid "Failed to stat" +msgstr "Methwyd stat()" + +#: methods/copy.cc:79 methods/gzip.cc:139 +msgid "Failed to set modification time" +msgstr "Methwyd gosod amser newid" + +#: methods/file.cc:42 +msgid "Invalid URI, local URIS must not start with //" +msgstr "URI annilys: rhaid i URIs lleol beidio a cychwyn efo \"//\"" + +#. Login must be before getpeername otherwise dante won't work. +#: methods/ftp.cc:162 +msgid "Logging in" +msgstr "Yn mewngofnodi" + +#: methods/ftp.cc:168 +msgid "Unable to determine the peer name" +msgstr "Ni ellir darganfod enw'r cymar" + +#: methods/ftp.cc:173 +msgid "Unable to determine the local name" +msgstr "Ni ellir darganfod yr enw lleol" + +#: methods/ftp.cc:204 methods/ftp.cc:232 +#, c-format +msgid "Server refused our connection and said: %s" +msgstr "Gwrthodwyd y gweinydd ein cysyllriad, a dwedodd: %s" + +#: methods/ftp.cc:210 +#, c-format +msgid "USER failed, server said: %s" +msgstr "Methodd gorchymyn USER; meddai'r gweinydd: %s" + +#: methods/ftp.cc:217 +#, c-format +msgid "PASS failed, server said: %s" +msgstr "Methodd gorchymyn PASS; meddai'r gweinydd: %s" + +#: methods/ftp.cc:237 +msgid "" +"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " +"is empty." +msgstr "" +"Penodwyd gweinydd dirprwy ond dim sgript mengofnodi. (Mae " +"Acquire::ftp::ProxyLogin yn wag.)" + +# FIXME +#: methods/ftp.cc:265 +#, c-format +msgid "Login script command '%s' failed, server said: %s" +msgstr "Methodd y gorchymyn sgript mewngofnodi '%s'; meddai'r gweinydd: %s" + +#: methods/ftp.cc:291 +#, c-format +msgid "TYPE failed, server said: %s" +msgstr "Methodd gorchymyn TYPE; meddai'r gweinydd: %s" + +#: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226 +msgid "Connection timeout" +msgstr "Goramser cysylltu" + +#: methods/ftp.cc:335 +msgid "Server closed the connection" +msgstr "Caeodd y gweinydd y cysylltiad" + +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:452 methods/rsh.cc:190 +msgid "Read error" +msgstr "Gwall darllen" + +#: methods/ftp.cc:345 methods/rsh.cc:197 +msgid "A response overflowed the buffer." +msgstr "Gorlifodd ateb y byffer." + +#: methods/ftp.cc:362 methods/ftp.cc:374 +msgid "Protocol corruption" +msgstr "Llygr protocol" + +#: methods/ftp.cc:446 methods/rsh.cc:232 +msgid "Write Error" +msgstr "Gwall Ysgrifennu" + +#: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729 +msgid "Could not create a socket" +msgstr "Methwyd creu soced" + +#: methods/ftp.cc:698 +msgid "Could not connect data socket, connection timed out" +msgstr "Methwyd cysylltu soced data, goramserodd y cyslltiad" + +#: methods/ftp.cc:704 +msgid "Could not connect passive socket" +msgstr "Methwyd cysylltu soced goddefol" + +# FIXME +#: methods/ftp.cc:722 +msgid "getaddrinfo was unable to get a listening socket" +msgstr "Methodd getaddrinfo gael soced gwrando" + +#: methods/ftp.cc:736 +msgid "Could not bind a socket" +msgstr "Methwyd rhwymo soced" + +#: methods/ftp.cc:740 +msgid "Could not listen on the socket" +msgstr "Methwyd gwrando ar y soced" + +#: methods/ftp.cc:747 +msgid "Could not determine the socket's name" +msgstr "Methwyd canfod enw'r soced" + +#: methods/ftp.cc:779 +msgid "Unable to send PORT command" +msgstr "Methwyd danfod gorchymyn PORT" + +#: methods/ftp.cc:789 +#, c-format +msgid "Unknown address family %u (AF_*)" +msgstr "Teulu cyfeiriad anhysbys %u (AF_*)" + +#: methods/ftp.cc:798 +#, c-format +msgid "EPRT failed, server said: %s" +msgstr "Methodd gorchymyn EPRT; meddai'r gweinydd: %s" + +#: methods/ftp.cc:818 +msgid "Data socket connect timed out" +msgstr "Goramserodd cysylltiad y soced data" + +#: methods/ftp.cc:825 +msgid "Unable to accept connection" +msgstr "Methwyd derbyn cysylltiad" + +#: methods/ftp.cc:864 methods/http.cc:912 methods/rsh.cc:303 +msgid "Problem hashing file" +msgstr "Problem wrth stwnshio ffeil" + +#: methods/ftp.cc:877 +#, c-format +msgid "Unable to fetch file, server said '%s'" +msgstr "Methwyd cyrchu ffeil; meddai'r gweinydd '%s'" + +#: methods/ftp.cc:892 methods/rsh.cc:322 +msgid "Data socket timed out" +msgstr "Goramserodd soced data" + +#: methods/ftp.cc:922 +#, c-format +msgid "Data transfer failed, server said '%s'" +msgstr "Methodd trosgludiad data; meddai'r gweinydd '%s'" + +#. Get the files information +#: methods/ftp.cc:997 +msgid "Query" +msgstr "Ymholiad" + +# FIXME +#: methods/ftp.cc:1104 +msgid "Unable to invoke " +msgstr "Methwyd gweithredu " + +#: methods/connect.cc:64 +#, c-format +msgid "Connecting to %s (%s)" +msgstr "Yn cysylltu i %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 "Methwyd creu soced ar gyfer %s (f=%u t=%u p=%u)" + +#: methods/connect.cc:86 +#, c-format +msgid "Cannot initiate the connection to %s:%s (%s)." +msgstr "Ni ellir cychwyn y cysylltiad i %s:%s (%s)." + +#: methods/connect.cc:92 +#, c-format +msgid "Could not connect to %s:%s (%s), connection timed out" +msgstr "Methwyd cysylltu i %s:%s (%s), goramserodd y cysylltiad" + +#: methods/connect.cc:104 +#, c-format +msgid "Could not connect to %s:%s (%s)." +msgstr "Methwyd cysylltu i %s:%s (%s)." + +#. We say this mainly because the pause here is for the +#. ssh connection that is still going +#: methods/connect.cc:132 methods/rsh.cc:425 +#, c-format +msgid "Connecting to %s" +msgstr "Yn cysylltu i %s" + +#: methods/connect.cc:163 +#, c-format +msgid "Could not resolve '%s'" +msgstr "Methwyd datrys '%s'" + +#: methods/connect.cc:167 +#, c-format +msgid "Temporary failure resolving '%s'" +msgstr "Methiant dros dro yn datrys '%s'" + +#: methods/connect.cc:169 +#, c-format +msgid "Something wicked happened resolving '%s:%s' (%i)" +msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)" + +#: methods/connect.cc:216 +#, c-format +msgid "Unable to connect to %s %s:" +msgstr "Methwyd cysylltu i %s %s:" + +#: methods/gzip.cc:57 +#, c-format +msgid "Couldn't open pipe for %s" +msgstr "Methwyd agor pibell ar gyfer %s" + +#: methods/gzip.cc:102 +#, c-format +msgid "Read error from %s process" +msgstr "Gwall darllen o broses %s" + +#: methods/http.cc:340 +msgid "Waiting for headers" +msgstr "Yn aros am benawdau" + +#: methods/http.cc:486 +#, c-format +msgid "Got a single header line over %u chars" +msgstr "Derbynnwyd llinell pennaws sengl dros %u nod" + +#: methods/http.cc:494 +msgid "Bad header line" +msgstr "Llinell pennawd gwael" + +#: methods/http.cc:513 methods/http.cc:520 +msgid "The http server sent an invalid reply header" +msgstr "Danfonodd y gweinydd HTTP bennawd ateb annilys" + +#: methods/http.cc:549 +msgid "The http server sent an invalid Content-Length header" +msgstr "Danfonodd y gweinydd HTTP bennawd Content-Length annilys" + +#: methods/http.cc:564 +msgid "The http server sent an invalid Content-Range header" +msgstr "Danfonodd y gweinydd HTTP bennawd Content-Range annilys" + +#: methods/http.cc:566 +msgid "This http server has broken range support" +msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri" + +#: methods/http.cc:590 +msgid "Unknown date format" +msgstr "Fformat dyddiad anhysbys" + +#: methods/http.cc:733 +msgid "Select failed" +msgstr "Methwyd dewis" + +#: methods/http.cc:738 +msgid "Connection timed out" +msgstr "Goramserodd y cysylltiad" + +#: methods/http.cc:761 +msgid "Error writing to output file" +msgstr "Gwall wrth ysgrifennu i ffeil allbwn" + +#: methods/http.cc:789 +msgid "Error writing to file" +msgstr "Gwall wrth ysgrifennu at ffeil" + +#: methods/http.cc:814 +msgid "Error writing to the file" +msgstr "Gwall wrth ysgrifennu at y ffeil" + +#: methods/http.cc:828 +msgid "Error reading from server Remote end closed connection" +msgstr "Gwall wrth ddarllen o'r gweinydd: caeodd yr ochr pell y cysylltiad" + +#: methods/http.cc:830 +msgid "Error reading from server" +msgstr "Gwall wrth ddarllen o'r gweinydd" + +#: methods/http.cc:1061 +msgid "Bad header Data" +msgstr "Data pennawd gwael" + +#: methods/http.cc:1078 +msgid "Connection failed" +msgstr "Methodd y cysylltiad" + +#: methods/http.cc:1169 +msgid "Internal error" +msgstr "Gwall mewnol" + +#: apt-pkg/contrib/mmap.cc:82 +msgid "Can't mmap an empty file" +msgstr "Ni ellir defnyddio mmap() ar ffeil gwag" + +#: apt-pkg/contrib/mmap.cc:87 +#, c-format +msgid "Couldn't make mmap of %lu bytes" +msgstr "Methwyd gwneud mmap() efo %lu beit" + +#: apt-pkg/contrib/strutl.cc:941 +#, c-format +msgid "Selection %s not found" +msgstr "Ni chanfuwyd y dewis %s" + +#: apt-pkg/contrib/configuration.cc:395 +#, c-format +msgid "Unrecognized type abbreviation: '%c'" +msgstr "Talgryniad math anhysbys: '%c'" + +#: apt-pkg/contrib/configuration.cc:453 +#, c-format +msgid "Opening configuration file %s" +msgstr "Yn agor y ffeil cyfluniad %s" + +#: apt-pkg/contrib/configuration.cc:471 +#, c-format +msgid "Line %d too long (max %d)" +msgstr "Linell %d yn rhy hir (uchaf %d)" + +#: apt-pkg/contrib/configuration.cc:567 +#, c-format +msgid "Syntax error %s:%u: Block starts with no name." +msgstr "Gwall cystrawen %s:%u: Mae bloc yn cychwyn efo dim enw." + +# FIXME +#: apt-pkg/contrib/configuration.cc:586 +#, c-format +msgid "Syntax error %s:%u: Malformed Tag" +msgstr "Gwall cystrawen %s:%u: Tag wedi camffurfio" + +#: apt-pkg/contrib/configuration.cc:603 +#, c-format +msgid "Syntax error %s:%u: Extra junk after value" +msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ôl y gwerth" + +#: apt-pkg/contrib/configuration.cc:643 +#, c-format +msgid "Syntax error %s:%u: Directives can only be done at the top level" +msgstr "Gwall cystrawen %s:%u: Ceir defnyddio cyfarwyddyd ar y lefel dop yn unig" + +#: apt-pkg/contrib/configuration.cc:650 +#, c-format +msgid "Syntax error %s:%u: Too many nested includes" +msgstr "Gwall cystrawen %s:%u: Gormod o gynhwysion nythol" + +#: apt-pkg/contrib/configuration.cc:654 apt-pkg/contrib/configuration.cc:659 +#, c-format +msgid "Syntax error %s:%u: Included from here" +msgstr "Gwall cystrawen %s:%u: Cynhwyswyd o fan hyn" + +#: apt-pkg/contrib/configuration.cc:663 +#, c-format +msgid "Syntax error %s:%u: Unsupported directive '%s'" +msgstr "Gwall cystrawen %s:%u: Cyfarwyddyd ni gynhelir '%s'" + +#: apt-pkg/contrib/configuration.cc:697 +#, c-format +msgid "Syntax error %s:%u: Extra junk at end of file" +msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ddiwedd y ffeil" + +#: apt-pkg/contrib/progress.cc:154 +#, c-format +msgid "%c%s... Error!" +msgstr "%c%s... Gwall!" + +#: apt-pkg/contrib/progress.cc:156 +#, c-format +msgid "%c%s... Done" +msgstr "%c%s... Wedi Gorffen" + +# FIXME +#: apt-pkg/contrib/cmndline.cc:80 +#, c-format +msgid "Command line option '%c' [from %s] is not known." +msgstr "Ni adnabyddir yr opsiwn llinell orchymyn '%c' (o %s)." + +#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 +#: apt-pkg/contrib/cmndline.cc:122 +#, c-format +msgid "Command line option %s is not understood" +msgstr "Ni adnabyddir yr opsiwn llinell orchymyn %s" + +#: apt-pkg/contrib/cmndline.cc:127 +#, c-format +msgid "Command line option %s is not boolean" +msgstr "Nid yw'r opsiwn llinell orchymyn %s yn fŵleaidd" + +#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#, c-format +msgid "Option %s requires an argument." +msgstr "Mae'r opsiwn %s yn mynnu ymresymiad." + +#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#, c-format +msgid "Option %s: Configuration item specification must have an =<val>." +msgstr "Opsiwn %s: Rhaid i benodiad eitem cyfluniad gael =<gwerth>." + +#: apt-pkg/contrib/cmndline.cc:237 +#, c-format +msgid "Option %s requires an integer argument, not '%s'" +msgstr "Mae'r opsiwn %s yn mynnu ymresymiad cyfanrif, nid '%s'" + +#: apt-pkg/contrib/cmndline.cc:268 +#, c-format +msgid "Option '%s' is too long" +msgstr "Opsiwn '%s' yn rhy hir" + +# FIXME: 'Sense'? +#: apt-pkg/contrib/cmndline.cc:301 +#, c-format +msgid "Sense %s is not understood, try true or false." +msgstr "Ni ddeallir %s, ceiswich ddefnyddio 'true' neu 'false'." + +#: apt-pkg/contrib/cmndline.cc:351 +#, c-format +msgid "Invalid operation %s" +msgstr "Gweithred annilys %s" + +#: apt-pkg/contrib/cdromutl.cc:55 +#, c-format +msgid "Unable to stat the mount point %s" +msgstr "Ni ellir gwneud stat() o'r pwynt clymu %s" + +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:418 apt-pkg/clean.cc:44 +#, c-format +msgid "Unable to change to %s" +msgstr "Ni ellir newid i %s" + +#: apt-pkg/contrib/cdromutl.cc:190 +msgid "Failed to stat the cdrom" +msgstr "Methwyd gwneud stat() o'r CD-ROM" + +#: apt-pkg/contrib/fileutl.cc:80 +#, c-format +msgid "Not using locking for read only lock file %s" +msgstr "Ddim yn cloi'r ffeil clo darllen-yn-unig %s" + +#: apt-pkg/contrib/fileutl.cc:85 +#, c-format +msgid "Could not open lock file %s" +msgstr "Methwyd agor y ffeil clo %s" + +#: apt-pkg/contrib/fileutl.cc:103 +#, c-format +msgid "Not using locking for nfs mounted lock file %s" +msgstr "Ddim yn cloi'r ffeil clo ar NFS %s" + +#: apt-pkg/contrib/fileutl.cc:107 +#, c-format +msgid "Could not get lock %s" +msgstr "Methwyd cael y clo %s" + +#: apt-pkg/contrib/fileutl.cc:358 +#, c-format +msgid "Waited, for %s but it wasn't there" +msgstr "Arhoswyd am %s ond nid oedd e yna" + +#: apt-pkg/contrib/fileutl.cc:368 +#, c-format +msgid "Sub-process %s received a segmentation fault." +msgstr "Derbyniodd is-broses %s wall segmentu." + +#: apt-pkg/contrib/fileutl.cc:371 +#, c-format +msgid "Sub-process %s returned an error code (%u)" +msgstr "Dychwelodd is-broses %s gôd gwall (%u)" + +#: apt-pkg/contrib/fileutl.cc:373 +#, c-format +msgid "Sub-process %s exited unexpectedly" +msgstr "Gorffenodd is-broses %s yn annisgwyl" + +#: apt-pkg/contrib/fileutl.cc:417 +#, c-format +msgid "Could not open file %s" +msgstr "Methwyd agor ffeil %s" + +# FIXME +#: apt-pkg/contrib/fileutl.cc:473 +#, c-format +msgid "read, still have %lu to read but none left" +msgstr "o hyd %lu i ddarllen ond dim ar ôl" + +#: apt-pkg/contrib/fileutl.cc:491 +msgid "Write error" +msgstr "Gwall ysgrifennu" + +# FIXME +#: apt-pkg/contrib/fileutl.cc:503 +#, c-format +msgid "write, still have %lu to write but couldn't" +msgstr "o hyd %lu i ysgrifennu ond methwyd" + +#: apt-pkg/contrib/fileutl.cc:578 +msgid "Problem closing the file" +msgstr "Gwall wrth gau'r ffeil" + +#: apt-pkg/contrib/fileutl.cc:584 +msgid "Problem unlinking the file" +msgstr "Gwall wrth dadgysylltu'r ffeil" + +#: apt-pkg/contrib/fileutl.cc:595 +msgid "Problem syncing the file" +msgstr "Gwall wrth gyfamseru'r ffeil" + +#: apt-pkg/pkgcache.cc:126 +msgid "Empty package cache" +msgstr "Storfa pecyn gwag" + +#: apt-pkg/pkgcache.cc:132 +msgid "The package cache file is corrupted" +msgstr "Mae'r ffeil storfa pecyn yn llygredig" + +#: apt-pkg/pkgcache.cc:137 +msgid "The package cache file is an incompatible version" +msgstr "Mae'r ffeil storfa pecyn yn fersiwn anghyflawn" + +# FIXME: capitalisation? +#: apt-pkg/pkgcache.cc:142 +#, c-format +msgid "This APT does not support the Versioning System '%s'" +msgstr "Nid yw'r APT yma yn cefnogi'r system fersiwn '%s'" + +#: apt-pkg/pkgcache.cc:147 +msgid "The package cache was built for a different architecture" +msgstr "Adeiladwyd y storfa pecyn ar gyfer pernsaerniaeth gwahanol" + +#: apt-pkg/pkgcache.cc:218 +msgid "Depends" +msgstr "Dibynnu" + +#: apt-pkg/pkgcache.cc:218 +msgid "PreDepends" +msgstr "CynDdibynnu" + +#: apt-pkg/pkgcache.cc:218 +msgid "Suggests" +msgstr "Awgrymu" + +#: apt-pkg/pkgcache.cc:219 +msgid "Recommends" +msgstr "Argymell" + +#: apt-pkg/pkgcache.cc:219 +msgid "Conflicts" +msgstr "Gwrthdaro" + +#: apt-pkg/pkgcache.cc:219 +msgid "Replaces" +msgstr "Amnewid" + +#: apt-pkg/pkgcache.cc:220 +msgid "Obsoletes" +msgstr "Darfodi" + +#: apt-pkg/pkgcache.cc:231 +msgid "important" +msgstr "pwysig" + +#: apt-pkg/pkgcache.cc:231 +msgid "required" +msgstr "angenrheidiol" + +#: apt-pkg/pkgcache.cc:231 +msgid "standard" +msgstr "safonnol" + +#: apt-pkg/pkgcache.cc:232 +msgid "optional" +msgstr "opsiynnol" + +#: apt-pkg/pkgcache.cc:232 +msgid "extra" +msgstr "ychwanegol" + +#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 +msgid "Building Dependency Tree" +msgstr "Yn Aideladu Coeden Dibyniaeth" + +#: apt-pkg/depcache.cc:61 +msgid "Candidate Versions" +msgstr "Fersiynau Posib" + +#: apt-pkg/depcache.cc:90 +msgid "Dependency Generation" +msgstr "Cynhyrchaid Dibyniaeth" + +# FIXME: number? +#: apt-pkg/tagfile.cc:73 +#, c-format +msgid "Unable to parse package file %s (1)" +msgstr "Ni ellir gramadegu ffeil becynnau %s (1)" + +#: apt-pkg/tagfile.cc:160 +#, c-format +msgid "Unable to parse package file %s (2)" +msgstr "Ni ellir gramadegu ffeil becynnau %s (2)" + +#: apt-pkg/sourcelist.cc:87 +#, c-format +msgid "Malformed line %lu in source list %s (URI)" +msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (URI)" + +#: apt-pkg/sourcelist.cc:89 +#, c-format +msgid "Malformed line %lu in source list %s (dist)" +msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)" + +#: apt-pkg/sourcelist.cc:92 +#, c-format +msgid "Malformed line %lu in source list %s (URI parse)" +msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)" + +#: apt-pkg/sourcelist.cc:98 +#, c-format +msgid "Malformed line %lu in source list %s (Absolute dist)" +msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad llwyr)" + +#: apt-pkg/sourcelist.cc:105 +#, c-format +msgid "Malformed line %lu in source list %s (dist parse)" +msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)" + +#: apt-pkg/sourcelist.cc:156 +#, c-format +msgid "Opening %s" +msgstr "Yn agor %s" + +#: apt-pkg/sourcelist.cc:170 +#, c-format +msgid "Line %u too long in source list %s." +msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s." + +#: apt-pkg/sourcelist.cc:187 +#, c-format +msgid "Malformed line %u in source list %s (type)" +msgstr "Llinell camffurfiol %u yn y rhestr ffynhonell %s (math)" + +#: apt-pkg/sourcelist.cc:191 +#, c-format +msgid "Type '%s' is not known in on line %u in source list %s" +msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s" + +# FIXME: %s may have an arbirrary length +#: apt-pkg/packagemanager.cc:402 +#, c-format +msgid "" +"This installation run will require temporarily removing the essential " +"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " +"you really want to do it, activate the APT::Force-LoopBreak option." +msgstr "" +"Bydd y rhediad sefydlu hwn yn gorfodi tynnu'r pecyn angenrheidiol %s " +"oherwydd lŵp gwrthdaro/cynddibynu. Mae hyn yn aml yn wael, ond os ydych " +"wir eisiau ei wneud ef, gweithredwch yr opsiwn APT::Force-LoopBreak." + +#: apt-pkg/pkgrecords.cc:37 +#, c-format +msgid "Index file type '%s' is not supported" +msgstr "Ni chynhelir y math ffeil mynegai '%s'" + +#: apt-pkg/algorithms.cc:238 +#, c-format +msgid "" +"The package %s needs to be reinstalled, but I can't find an archive for it." +msgstr "" +"Mae angen ailsefydlu'r pecyn %s, ond dydw i ddim yn gallu canfod archif ar ei " +"gyfer." + +#: apt-pkg/algorithms.cc:1056 +msgid "" +"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " +"held packages." +msgstr "" +"Gwall: Cynhyrchodd pkgProblemResolver::Resolve doriadau. Fe all hyn fod " +"wedi ei achosi gan pecynnau wedi eu dal." + +#: apt-pkg/algorithms.cc:1058 +msgid "Unable to correct problems, you have held broken packages." +msgstr "Ni ellir cywiro'r problemau gan eich bod chi wedi dal pecynnau torredig." + +#: apt-pkg/acquire.cc:61 +#, c-format +msgid "Lists directory %spartial is missing." +msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll." + +#: apt-pkg/acquire.cc:65 +#, c-format +msgid "Archive directory %spartial is missing." +msgstr "Mae'r cyfeiriadur archif %spartial ar goll." + +#: apt-pkg/acquire-worker.cc:112 +#, c-format +msgid "The method driver %s could not be found." +msgstr "Methwyd canfod y gyrrydd dull %s." + +#: apt-pkg/acquire-worker.cc:161 +#, c-format +msgid "Method %s did not start correctly" +msgstr "Ni gychwynodd y dull %s yn gywir" + +#: apt-pkg/init.cc:119 +#, c-format +msgid "Packaging system '%s' is not supported" +msgstr "Ni chynhelir y system pecynnu '%s'" + +#: apt-pkg/init.cc:135 +msgid "Unable to determine a suitable system type" +msgstr "Ni ellir canfod math system addas" + +#: apt-pkg/clean.cc:61 +#, c-format +msgid "Unable to stat %s." +msgstr "Ni ellir gwneud stat() o %s." + +# FIXME: ...file +#: apt-pkg/srcrecords.cc:48 +msgid "You must put some 'source' URIs in your sources.list" +msgstr "Rhaid i chi rhoi rhai URI 'source' yn eich ffeil sources.list" + +#: apt-pkg/cachefile.cc:73 +msgid "The package lists or status file could not be parsed or opened." +msgstr "Methwyd agor neu ramadegu'r ffeil rhestrau neu statws." + +#: apt-pkg/cachefile.cc:77 +msgid "You may want to run apt-get update to correct these problems" +msgstr "Efallai hoffech rhedege apt-get update er mwyn cywiro'r problemau hyn." + +# FIXME: literal +#: apt-pkg/policy.cc:269 +msgid "Invalid record in the preferences file, no Package header" +msgstr "Cofnod annilys yn y ffeil hoffterau, dim pennawd 'Package'" + +# FIXME: tense +#: apt-pkg/policy.cc:291 +#, c-format +msgid "Did not understand pin type %s" +msgstr "Methwyd daeall y math pin %s" + +#: apt-pkg/policy.cc:299 +msgid "No priority (or zero) specified for pin" +msgstr "Dim blaenoriath (neu sero) wedi ei benodi ar gyfer pin" + +#: apt-pkg/pkgcachegen.cc:74 +msgid "Cache has an incompatible versioning system" +msgstr "Mae can y storfa system fersiwn anghyfaddas" + +#: apt-pkg/pkgcachegen.cc:117 +#, c-format +msgid "Error occured while processing %s (NewPackage)" +msgstr "Digwyddod gwall wrth brosesu %s (NewPackage)" + +#: apt-pkg/pkgcachegen.cc:129 +#, c-format +msgid "Error occured while processing %s (UsePackage1)" +msgstr "Digwyddod gwall wrth brosesu %s (UsePackage1)" + +#: apt-pkg/pkgcachegen.cc:150 +#, c-format +msgid "Error occured while processing %s (UsePackage2)" +msgstr "Digwyddod gwall wrth brosesu %s (UsePackage2)" + +#: apt-pkg/pkgcachegen.cc:154 +#, c-format +msgid "Error occured while processing %s (NewFileVer1)" +msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:184 +#, c-format +msgid "Error occured while processing %s (NewVersion1)" +msgstr "Digwyddod gwall wrth brosesu %s (NewVersion1)" + +#: apt-pkg/pkgcachegen.cc:188 +#, c-format +msgid "Error occured while processing %s (UsePackage3)" +msgstr "Digwyddod gwall wrth brosesu %s (UsePackage3)" + +#: apt-pkg/pkgcachegen.cc:192 +#, c-format +msgid "Error occured while processing %s (NewVersion2)" +msgstr "Digwyddod gwall wrth brosesu %s (NewVersion2)" + +#: apt-pkg/pkgcachegen.cc:207 +msgid "Wow, you exceeded the number of package names this APT is capable of." +msgstr "Jiw, rhagoroch chi'r nifer o enwau pecyn mae'r APT hwn yn gallu ei " +" drin." + +#: apt-pkg/pkgcachegen.cc:210 +msgid "Wow, you exceeded the number of versions this APT is capable of." +msgstr "Jiw, rhagoroch chi'r nifer o fersiynau mae'r APT hwn yn gallu ei drin." + +#: apt-pkg/pkgcachegen.cc:213 +msgid "Wow, you exceeded the number of dependencies this APT is capable of." +msgstr "Jiw, rhagoroch chi'r nifer o ddibyniaethau mae'r APT hwn yn gallu ei drin." + +#: apt-pkg/pkgcachegen.cc:241 +#, c-format +msgid "Error occured while processing %s (FindPkg)" +msgstr "Digwyddod gwall wrth brosesu %s (FindPkg)" + +#: apt-pkg/pkgcachegen.cc:254 +#, c-format +msgid "Error occured while processing %s (CollectFileProvides)" +msgstr "Digwyddod gwall wrth brosesu %s (CollectFileProvides)" + +#: apt-pkg/pkgcachegen.cc:260 +#, c-format +msgid "Package %s %s was not found while processing file dependencies" +msgstr "Ni chanfuwyd pecyn %s %s wrth brosesu dibyniaethau ffeil" + +#: apt-pkg/pkgcachegen.cc:574 +#, c-format +msgid "Couldn't stat source package list %s" +msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s" + +#: apt-pkg/pkgcachegen.cc:658 +msgid "Collecting File Provides" +msgstr "Yn Casglu Darpariaethau Ffeil" + +#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +msgid "IO Error saving source cache" +msgstr "Gwall M/A wrth gadw'r storfa ffynhonell" + +#: apt-pkg/acquire-item.cc:126 +#, c-format +msgid "rename failed, %s (%s -> %s)." +msgstr "methwyd ailenwi, %s (%s -> %s)." + +#: apt-pkg/acquire-item.cc:205 apt-pkg/acquire-item.cc:817 +msgid "MD5Sum mismatch" +msgstr "Camgyfatebiaeth swm MD5" + +# FIXME: case +#: apt-pkg/acquire-item.cc:654 +#, 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 "" +"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:689 +#, 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 "" +"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:720 +#, 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:807 +msgid "Size mismatch" +msgstr "Camgyfatebiaeth maint" + +#: apt-pkg/vendorlist.cc:66 +#, c-format +msgid "Vendor block %s contains no fingerprint" +msgstr "Nid yw'r bloc darparwr %s yn cynnwys ôl bys" + +#: methods/rsh.cc:264 +msgid "File Not Found" +msgstr "Ni Chanfuwyd Y Ffeil" + +#: methods/rsh.cc:330 +msgid "Connection closed prematurely" +msgstr "Caewyd y cysylltiad yn gynnar" diff --git a/po/da.po b/po/da.po index 094196d6d..feade5c60 100644 --- a/po/da.po +++ b/po/da.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-da\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-05 22:10+0100\n" +"POT-Creation-Date: 2005-03-29 07:17+0200\n" "PO-Revision-Date: 2005-02-10 20:50+0100\n" "Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n" "Language-Team: Danish <dansk@klid.dk>\n" @@ -327,6 +327,7 @@ msgid "Error processing contents %s" msgstr "Fejl under behandling af indhold %s" #: ftparchive/apt-ftparchive.cc:551 +#, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -365,7 +366,7 @@ msgid "" " --no-delink Enable delinking debug mode\n" " --contents Control contents file generation\n" " -c=? Read this configuration file\n" -" -o=? Set an arbitary configuration option" +" -o=? Set an arbitrary configuration option" msgstr "" "Brug: apt-ftparchive [tilvalg] kommando\n" "Kommandoer: packges binrsti [tvangsfil [sti]]\n" @@ -1543,7 +1544,7 @@ msgid "Internal error adding a diversion" msgstr "Intern fejl under tilfjelse af omrokering" #: apt-inst/deb/dpkgdb.cc:383 -msgid "The pkg cache must be initialize first" +msgid "The pkg cache must be initialized first" msgstr "pkg-mellemlageret skal initialiseres frst" #: apt-inst/deb/dpkgdb.cc:386 @@ -2371,37 +2372,37 @@ msgstr "Mellemlageret benytter en inkompatibel versionsstyring" #: apt-pkg/pkgcachegen.cc:117 #, c-format -msgid "Error occured while processing %s (NewPackage)" +msgid "Error occurred while processing %s (NewPackage)" msgstr "Der skete en fejl under behandlingen af %s (NewPackage)" #: apt-pkg/pkgcachegen.cc:129 #, c-format -msgid "Error occured while processing %s (UsePackage1)" +msgid "Error occurred while processing %s (UsePackage1)" msgstr "Der skete en fejl under behandlingen af %s (UsePackage1)" #: apt-pkg/pkgcachegen.cc:150 #, c-format -msgid "Error occured while processing %s (UsePackage2)" +msgid "Error occurred while processing %s (UsePackage2)" msgstr "Der skete en fejl under behandlingen af %s (UsePackage2)" #: apt-pkg/pkgcachegen.cc:154 #, c-format -msgid "Error occured while processing %s (NewFileVer1)" +msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Der skete en fejl under behandlingen af %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:184 #, c-format -msgid "Error occured while processing %s (NewVersion1)" +msgid "Error occurred while processing %s (NewVersion1)" msgstr "Der skete en fejl under behandlingen af %s (NewVersion1)" #: apt-pkg/pkgcachegen.cc:188 #, c-format -msgid "Error occured while processing %s (UsePackage3)" +msgid "Error occurred while processing %s (UsePackage3)" msgstr "Der skete en fejl under behandlingen af %s (UsePackage3)" #: apt-pkg/pkgcachegen.cc:192 #, c-format -msgid "Error occured while processing %s (NewVersion2)" +msgid "Error occurred while processing %s (NewVersion2)" msgstr "Der skete en fejl under behandlingen af %s (NewVersion2)" #: apt-pkg/pkgcachegen.cc:207 @@ -2420,12 +2421,12 @@ msgstr "" #: apt-pkg/pkgcachegen.cc:241 #, c-format -msgid "Error occured while processing %s (FindPkg)" +msgid "Error occurred while processing %s (FindPkg)" msgstr "Der skete en fejl under behandlingen af %s (FindPkg)" #: apt-pkg/pkgcachegen.cc:254 #, c-format -msgid "Error occured while processing %s (CollectFileProvides)" +msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Der skete en fejl under behandlingen af %s (CollectfileProvides)" #: apt-pkg/pkgcachegen.cc:260 diff --git a/po/de.po b/po/de.po index 420ee2c47..d95c9b87e 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-05 22:10+0100\n" +"POT-Creation-Date: 2005-03-29 07:17+0200\n" "PO-Revision-Date: 2004-08-04 15:58 +0200\n" "Last-Translator: Michael Piefel <piefel@debian.org>\n" "Language-Team: <de@li.org>\n" @@ -327,6 +327,7 @@ msgid "Error processing contents %s" msgstr "Fehler beim Verarbeiten der Inhaltsdatei %s" #: ftparchive/apt-ftparchive.cc:551 +#, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -365,7 +366,7 @@ msgid "" " --no-delink Enable delinking debug mode\n" " --contents Control contents file generation\n" " -c=? Read this configuration file\n" -" -o=? Set an arbitary configuration option" +" -o=? Set an arbitrary configuration option" msgstr "" "Aufruf: apt-ftparchive [optionen] befehl\n" "Befehle: packages binarypath [overridedatei [pfadpräfix]]\n" @@ -1570,7 +1571,7 @@ msgid "Internal error adding a diversion" msgstr "Interner Fehler beim Hinzufügen einer Umleitung" #: apt-inst/deb/dpkgdb.cc:383 -msgid "The pkg cache must be initialize first" +msgid "The pkg cache must be initialized first" msgstr "Der Paketcache muss erst initialisiert werden" #: apt-inst/deb/dpkgdb.cc:386 @@ -2410,37 +2411,37 @@ msgstr "Dieser Paketcache wurde für ein inkompatibles Versionssystem aufgebaut" #: apt-pkg/pkgcachegen.cc:117 #, c-format -msgid "Error occured while processing %s (NewPackage)" +msgid "Error occurred while processing %s (NewPackage)" msgstr "Ein Fehler trat beim Bearbeiten von %s auf (NewPackage)" #: apt-pkg/pkgcachegen.cc:129 #, c-format -msgid "Error occured while processing %s (UsePackage1)" +msgid "Error occurred while processing %s (UsePackage1)" msgstr "Ein Fehler trat beim Bearbeiten von %s auf (UsePackage1)" #: apt-pkg/pkgcachegen.cc:150 #, c-format -msgid "Error occured while processing %s (UsePackage2)" +msgid "Error occurred while processing %s (UsePackage2)" msgstr "Ein Fehler trat beim Bearbeiten von %s auf (UsePackage2)" #: apt-pkg/pkgcachegen.cc:154 #, c-format -msgid "Error occured while processing %s (NewFileVer1)" +msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Ein Fehler trat beim Bearbeiten von %s auf (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:184 #, c-format -msgid "Error occured while processing %s (NewVersion1)" +msgid "Error occurred while processing %s (NewVersion1)" msgstr "Ein Fehler trat beim Bearbeiten von %s auf (NewVersion1)" #: apt-pkg/pkgcachegen.cc:188 #, c-format -msgid "Error occured while processing %s (UsePackage3)" +msgid "Error occurred while processing %s (UsePackage3)" msgstr "Ein Fehler trat beim Bearbeiten von %s auf (UsePackage3)" #: apt-pkg/pkgcachegen.cc:192 #, c-format -msgid "Error occured while processing %s (NewVersion2)" +msgid "Error occurred while processing %s (NewVersion2)" msgstr "Ein Fehler trat beim Bearbeiten von %s auf (NewVersion2)" #: apt-pkg/pkgcachegen.cc:207 @@ -2462,12 +2463,12 @@ msgstr "" #: apt-pkg/pkgcachegen.cc:241 #, c-format -msgid "Error occured while processing %s (FindPkg)" +msgid "Error occurred while processing %s (FindPkg)" msgstr "Fehler trat beim Bearbeiten von %s auf (FindPkg)" #: apt-pkg/pkgcachegen.cc:254 #, c-format -msgid "Error occured while processing %s (CollectFileProvides)" +msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Fehler trat beim Bearbeiten von %s auf (CollectFileProvides)" #: apt-pkg/pkgcachegen.cc:260 diff --git a/po/el.po b/po/el.po index 24f1eade5..f331c279d 100644 --- a/po/el.po +++ b/po/el.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_el\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-05 22:10+0100\n" +"POT-Creation-Date: 2005-03-29 07:17+0200\n" "PO-Revision-Date: 2005-02-20 15:01EEST\n" "Last-Translator: Greek Translation Team <debian-l10n-greek@lists.debian." "org>\n" @@ -336,6 +336,7 @@ msgid "Error processing contents %s" msgstr "Σφάλμα επεξεργασίας περιεχομένων του %s" #: ftparchive/apt-ftparchive.cc:551 +#, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -374,7 +375,7 @@ msgid "" " --no-delink Enable delinking debug mode\n" " --contents Control contents file generation\n" " -c=? Read this configuration file\n" -" -o=? Set an arbitary configuration option" +" -o=? Set an arbitrary configuration option" msgstr "" "Χρήση: apt-ftparchive [επιλογές] εντολή\n" "Εντολές: packages binarypath [overridefile [pathprefix]]\n" @@ -1568,7 +1569,7 @@ msgid "Internal error adding a diversion" msgstr "Εσωτερικό Σφάλμα στην προσθήκη μιας παράκαμψης" #: apt-inst/deb/dpkgdb.cc:383 -msgid "The pkg cache must be initialize first" +msgid "The pkg cache must be initialized first" msgstr "Η cache πακέτων πρέπει να αρχικοποιηθεί πρώτα" #: apt-inst/deb/dpkgdb.cc:386 @@ -2404,37 +2405,37 @@ msgstr "Η cache έχει ασύμβατο σύστημα απόδοσης έκ #: apt-pkg/pkgcachegen.cc:117 #, c-format -msgid "Error occured while processing %s (NewPackage)" +msgid "Error occurred while processing %s (NewPackage)" msgstr "Σφάλμα κατά την επεξεργασία του %s (NewPackage)" #: apt-pkg/pkgcachegen.cc:129 #, c-format -msgid "Error occured while processing %s (UsePackage1)" +msgid "Error occurred while processing %s (UsePackage1)" msgstr "Σφάλμα κατά την επεξεργασία του %s (UsePackage1)" #: apt-pkg/pkgcachegen.cc:150 #, c-format -msgid "Error occured while processing %s (UsePackage2)" +msgid "Error occurred while processing %s (UsePackage2)" msgstr "Σφάλμα κατά την επεξεργασία του %s (UsePackage2)" #: apt-pkg/pkgcachegen.cc:154 #, c-format -msgid "Error occured while processing %s (NewFileVer1)" +msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Σφάλμα κατά την επεξεργασία του %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:184 #, c-format -msgid "Error occured while processing %s (NewVersion1)" +msgid "Error occurred while processing %s (NewVersion1)" msgstr "Σφάλμα κατά την επεξεργασία του %s (NewVersion1)" #: apt-pkg/pkgcachegen.cc:188 #, c-format -msgid "Error occured while processing %s (UsePackage3)" +msgid "Error occurred while processing %s (UsePackage3)" msgstr "Σφάλμα κατά την επεξεργασία του %s (UsePackage3)" #: apt-pkg/pkgcachegen.cc:192 #, c-format -msgid "Error occured while processing %s (NewVersion2)" +msgid "Error occurred while processing %s (NewVersion2)" msgstr "Σφάλμα κατά την επεξεργασία του %s (NewVersion2)" #: apt-pkg/pkgcachegen.cc:207 @@ -2454,12 +2455,12 @@ msgstr "" #: apt-pkg/pkgcachegen.cc:241 #, c-format -msgid "Error occured while processing %s (FindPkg)" +msgid "Error occurred while processing %s (FindPkg)" msgstr "Σφάλμα κατά την επεξεργασία του %s (FindPkg)" #: apt-pkg/pkgcachegen.cc:254 #, c-format -msgid "Error occured while processing %s (CollectFileProvides)" +msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Σφάλμα κατά την επεξεργασία του %s (CollectFileProvides)" #: apt-pkg/pkgcachegen.cc:260 diff --git a/po/en_GB.po b/po/en_GB.po index da3129082..e374f13d2 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-05 12:06+0100\n" +"POT-Creation-Date: 2005-03-29 07:17+0200\n" "PO-Revision-Date: 2002-11-10 20:56+0100\n" "Last-Translator: Michael Piefel <piefel@debian.org>\n" "Language-Team: en_GB <en@li.org>\n" @@ -27,23 +27,23 @@ msgid "Unable to locate package %s" msgstr "" #: cmdline/apt-cache.cc:232 -msgid "Total Package Names : " +msgid "Total package names : " msgstr "" #: cmdline/apt-cache.cc:272 -msgid " Normal Packages: " +msgid " Normal packages: " msgstr "" #: cmdline/apt-cache.cc:273 -msgid " Pure Virtual Packages: " +msgid " Pure virtual packages: " msgstr "" #: cmdline/apt-cache.cc:274 -msgid " Single Virtual Packages: " +msgid " Single virtual packages: " msgstr "" #: cmdline/apt-cache.cc:275 -msgid " Mixed Virtual Packages: " +msgid " Mixed virtual packages: " msgstr "" #: cmdline/apt-cache.cc:276 @@ -51,35 +51,35 @@ msgid " Missing: " msgstr "" #: cmdline/apt-cache.cc:278 -msgid "Total Distinct Versions: " +msgid "Total distinct versions: " msgstr "" #: cmdline/apt-cache.cc:280 -msgid "Total Dependencies: " +msgid "Total dependencies: " msgstr "" #: cmdline/apt-cache.cc:283 -msgid "Total Ver/File relations: " +msgid "Total ver/file relations: " msgstr "" #: cmdline/apt-cache.cc:285 -msgid "Total Provides Mappings: " +msgid "Total Provides mappings: " msgstr "" #: cmdline/apt-cache.cc:297 -msgid "Total Globbed Strings: " +msgid "Total globbed strings: " msgstr "" #: cmdline/apt-cache.cc:311 -msgid "Total Dependency Version space: " +msgid "Total dependency version space: " msgstr "" #: cmdline/apt-cache.cc:316 -msgid "Total Slack space: " +msgid "Total slack space: " msgstr "" #: cmdline/apt-cache.cc:324 -msgid "Total Space Accounted for: " +msgid "Total space accounted for: " msgstr "" #: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 @@ -96,7 +96,7 @@ msgid "No packages found" msgstr "" #: cmdline/apt-cache.cc:1462 -msgid "Package Files:" +msgid "Package files:" msgstr "" #: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 @@ -110,7 +110,7 @@ msgstr "" #. Show any packages have explicit pins #: cmdline/apt-cache.cc:1482 -msgid "Pinned Packages:" +msgid "Pinned packages:" msgstr "" #: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 @@ -132,12 +132,12 @@ msgid " Candidate: " msgstr "" #: cmdline/apt-cache.cc:1532 -msgid " Package Pin: " +msgid " Package pin: " msgstr "" #. Show the priority tables #: cmdline/apt-cache.cc:1541 -msgid " Version Table:" +msgid " Version table:" msgstr "" #: cmdline/apt-cache.cc:1556 @@ -248,7 +248,7 @@ msgstr "Option ‘%s’ is too long" #: ftparchive/apt-ftparchive.cc:202 ftparchive/apt-ftparchive.cc:252 #: ftparchive/apt-ftparchive.cc:266 ftparchive/apt-ftparchive.cc:288 #, c-format -msgid "Error Processing directory %s" +msgid "Error processing directory %s" msgstr "" #: ftparchive/apt-ftparchive.cc:250 @@ -262,7 +262,7 @@ msgstr "" #: ftparchive/apt-ftparchive.cc:397 #, c-format -msgid "Error Processing Contents %s" +msgid "Error processing contents %s" msgstr "" #: ftparchive/apt-ftparchive.cc:551 @@ -305,7 +305,7 @@ msgid "" " --no-delink Enable delinking debug mode\n" " --contents Control contents file generation\n" " -c=? Read this configuration file\n" -" -o=? Set an arbitary configuration option" +" -o=? Set an arbitrary configuration option" msgstr "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -465,7 +465,7 @@ msgstr "" #: ftparchive/contents.cc:317 #, c-format -msgid "Internal Error, could not locate member %s" +msgid "Internal error, could not locate member %s" msgstr "" #: ftparchive/contents.cc:353 ftparchive/contents.cc:384 @@ -498,8 +498,8 @@ msgid "Failed to read the override file %s" msgstr "" #: ftparchive/multicompress.cc:75 -#, c-format -msgid "Unknown Compresison Algorithm '%s'" +#, fuzzy, c-format +msgid "Unknown compression algorithm '%s'" msgstr "Unknown Compression Algorithm ‘%s’" #: ftparchive/multicompress.cc:105 @@ -520,12 +520,12 @@ msgid "Failed to fork" msgstr "" #: ftparchive/multicompress.cc:215 -msgid "Compress Child" +msgid "Compress child" msgstr "" #: ftparchive/multicompress.cc:238 #, c-format -msgid "Internal Error, Failed to create %s" +msgid "Internal error, failed to create %s" msgstr "" #: ftparchive/multicompress.cc:289 @@ -694,7 +694,7 @@ msgid "WARNING: The following packages cannot be authenticated!" msgstr "" #: cmdline/apt-get.cc:698 -msgid "Install these packages without verification? [y/N] " +msgid "Install these packages without verification [y/N]? " msgstr "" #: cmdline/apt-get.cc:700 @@ -706,7 +706,7 @@ msgid "There are problems and -y was used without --force-yes" msgstr "" #: cmdline/apt-get.cc:762 -msgid "Packages need to be removed but Remove is disabled." +msgid "Packages need to be removed but remove is disabled." msgstr "" #: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802 @@ -767,7 +767,7 @@ msgid "Abort." msgstr "" #: cmdline/apt-get.cc:886 -msgid "Do you want to continue? [Y/n] " +msgid "Do you want to continue [Y/n]? " msgstr "" #: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959 @@ -798,7 +798,7 @@ msgid "Unable to correct missing packages." msgstr "" #: cmdline/apt-get.cc:993 -msgid "Aborting Install." +msgid "Aborting install." msgstr "" #: cmdline/apt-get.cc:1026 @@ -886,7 +886,7 @@ msgid "" msgstr "" #: cmdline/apt-get.cc:1372 -msgid "Internal Error, AllUpgrade broke stuff" +msgid "Internal error, AllUpgrade broke stuff" msgstr "" #: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498 @@ -947,7 +947,7 @@ msgid "Recommended packages:" msgstr "" #: cmdline/apt-get.cc:1664 -msgid "Calculating Upgrade... " +msgid "Calculating upgrade... " msgstr "" #: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99 @@ -984,7 +984,7 @@ msgstr "" #: cmdline/apt-get.cc:1933 #, c-format -msgid "Fetch Source %s\n" +msgid "Fetch source %s\n" msgstr "" #: cmdline/apt-get.cc:1964 @@ -1058,7 +1058,7 @@ msgid "Failed to process build dependencies" msgstr "" #: cmdline/apt-get.cc:2318 -msgid "Supported Modules:" +msgid "Supported modules:" msgstr "" #: cmdline/apt-get.cc:2359 @@ -1130,9 +1130,9 @@ msgid " [Working]" msgstr "" #: cmdline/acqprogress.cc:271 -#, c-format +#, fuzzy, c-format msgid "" -"Media Change: Please insert the disc labeled\n" +"Media change: please insert the disc labeled\n" " '%s'\n" "in the drive '%s' and press enter\n" msgstr "" @@ -1185,7 +1185,7 @@ msgid "" msgstr "" #: dselect/update:30 -msgid "Merging Available information" +msgid "Merging available information" msgstr "" #: apt-inst/contrib/extracttar.cc:117 @@ -1201,7 +1201,7 @@ msgid "Corrupted archive" msgstr "" #: apt-inst/contrib/extracttar.cc:195 -msgid "Tar Checksum failed, archive corrupted" +msgid "Tar checksum failed, archive corrupted" msgstr "" #: apt-inst/contrib/extracttar.cc:298 @@ -1242,7 +1242,7 @@ msgid "Failed to allocate diversion" msgstr "" #: apt-inst/filelist.cc:468 -msgid "Internal Error in AddDiversion" +msgid "Internal error in AddDiversion" msgstr "" #: apt-inst/filelist.cc:481 @@ -1351,7 +1351,7 @@ msgstr "" #: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 #: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 #: apt-pkg/pkgcachegen.cc:840 -msgid "Reading Package Lists" +msgid "Reading package lists" msgstr "" #: apt-inst/deb/dpkgdb.cc:180 @@ -1361,11 +1361,11 @@ msgstr "" #: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 #: apt-inst/deb/dpkgdb.cc:448 -msgid "Internal Error getting a Package Name" +msgid "Internal error getting a package name" msgstr "" #: apt-inst/deb/dpkgdb.cc:205 -msgid "Reading File Listing" +msgid "Reading file listing" msgstr "" #: apt-inst/deb/dpkgdb.cc:216 @@ -1385,7 +1385,7 @@ msgid "Failed reading the list file %sinfo/%s" msgstr "" #: apt-inst/deb/dpkgdb.cc:266 -msgid "Internal Error getting a Node" +msgid "Internal error getting a node" msgstr "" #: apt-inst/deb/dpkgdb.cc:309 @@ -1404,20 +1404,20 @@ msgid "Invalid line in the diversion file: %s" msgstr "" #: apt-inst/deb/dpkgdb.cc:362 -msgid "Internal Error adding a diversion" +msgid "Internal error adding a diversion" msgstr "" #: apt-inst/deb/dpkgdb.cc:383 -msgid "The pkg cache must be initialize first" +msgid "The pkg cache must be initialized first" msgstr "" #: apt-inst/deb/dpkgdb.cc:386 -msgid "Reading File List" +msgid "Reading file list" msgstr "" #: apt-inst/deb/dpkgdb.cc:443 #, c-format -msgid "Failed to find a Package: Header, offset %lu" +msgid "Failed to find a Package: header, offset %lu" msgstr "" #: apt-inst/deb/dpkgdb.cc:465 @@ -1446,7 +1446,7 @@ msgid "Couldn't change to %s" msgstr "" #: apt-inst/deb/debfile.cc:138 -msgid "Internal Error, could not locate member" +msgid "Internal error, could not locate member" msgstr "" #: apt-inst/deb/debfile.cc:171 @@ -1454,7 +1454,7 @@ msgid "Failed to locate a valid control file" msgstr "" #: apt-inst/deb/debfile.cc:256 -msgid "Unparsible control file" +msgid "Unparsable control file" msgstr "" #: methods/cdrom.cc:113 @@ -1464,12 +1464,12 @@ msgstr "" #: methods/cdrom.cc:122 msgid "" -"Please use apt-cdrom to make this CD recognized by APT. apt-get update " -"cannot be used to add new CDs" +"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " +"cannot be used to add new CD-ROMs" msgstr "" #: methods/cdrom.cc:130 methods/cdrom.cc:168 -msgid "Wrong CD" +msgid "Wrong CD-ROM" msgstr "" #: methods/cdrom.cc:163 @@ -1477,7 +1477,7 @@ msgstr "" msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "" -#: methods/cdrom.cc:177 methods/file.cc:77 +#: methods/cdrom.cc:177 methods/file.cc:77 methods/rsh.cc:264 msgid "File not found" msgstr "" @@ -1508,7 +1508,7 @@ msgstr "" #: methods/ftp.cc:204 methods/ftp.cc:232 #, c-format -msgid "Server refused our connection and said: %s" +msgid "The server refused the connection and said: %s" msgstr "" #: methods/ftp.cc:210 @@ -1557,8 +1557,8 @@ msgstr "" msgid "Protocol corruption" msgstr "" -#: methods/ftp.cc:446 methods/rsh.cc:232 -msgid "Write Error" +#: methods/ftp.cc:446 methods/rsh.cc:232 apt-pkg/contrib/fileutl.cc:492 +msgid "Write error" msgstr "" #: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729 @@ -1719,19 +1719,19 @@ msgid "Bad header line" msgstr "" #: methods/http.cc:517 methods/http.cc:524 -msgid "The http server sent an invalid reply header" +msgid "The HTTP server sent an invalid reply header" msgstr "" #: methods/http.cc:553 -msgid "The http server sent an invalid Content-Length header" +msgid "The HTTP server sent an invalid Content-Length header" msgstr "" #: methods/http.cc:568 -msgid "The http server sent an invalid Content-Range header" +msgid "The HTTP server sent an invalid Content-Range header" msgstr "" #: methods/http.cc:570 -msgid "This http server has broken range support" +msgid "This HTTP server has broken range support" msgstr "" #: methods/http.cc:594 @@ -1759,7 +1759,7 @@ msgid "Error writing to the file" msgstr "" #: methods/http.cc:832 -msgid "Error reading from server Remote end closed connection" +msgid "Error reading from server. Remote end closed connection" msgstr "" #: methods/http.cc:834 @@ -1767,7 +1767,7 @@ msgid "Error reading from server" msgstr "" #: methods/http.cc:1065 -msgid "Bad header Data" +msgid "Bad header data" msgstr "" #: methods/http.cc:1082 @@ -1778,10 +1778,6 @@ msgstr "" msgid "Internal error" msgstr "" -#: methods/rsh.cc:264 -msgid "File Not Found" -msgstr "" - #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "" @@ -1821,9 +1817,9 @@ msgid "Syntax error %s:%u: Block starts with no name." msgstr "" #: apt-pkg/contrib/configuration.cc:586 -#, c-format -msgid "Syntax error %s:%u: Malformed Tag" -msgstr "" +#, fuzzy, c-format +msgid "Syntax error %s:%u: Malformed tag" +msgstr "Syntax error %s:%u: Unsupported directive ‘%s’" #: apt-pkg/contrib/configuration.cc:603 #, c-format @@ -1946,8 +1942,8 @@ msgid "Could not get lock %s" msgstr "" #: apt-pkg/contrib/fileutl.cc:359 -#, c-format -msgid "Waited, for %s but it wasn't there" +#, fuzzy, c-format +msgid "Waited for %s but it wasn't there" msgstr "Waited for %s but it wasn't there" #: apt-pkg/contrib/fileutl.cc:369 @@ -1975,10 +1971,6 @@ msgstr "" msgid "read, still have %lu to read but none left" msgstr "" -#: apt-pkg/contrib/fileutl.cc:492 -msgid "Write error" -msgstr "" - #: apt-pkg/contrib/fileutl.cc:504 #, c-format msgid "write, still have %lu to write but couldn't" @@ -2009,8 +2001,8 @@ msgid "The package cache file is an incompatible version" msgstr "" #: apt-pkg/pkgcache.cc:142 -#, c-format -msgid "This APT does not support the Versioning System '%s'" +#, fuzzy, c-format +msgid "This APT does not support the versioning system '%s'" msgstr "This APT does not support the Versioning System ‘%s’" #: apt-pkg/pkgcache.cc:147 @@ -2066,15 +2058,15 @@ msgid "extra" msgstr "" #: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 -msgid "Building Dependency Tree" +msgid "Building dependency tree" msgstr "" #: apt-pkg/depcache.cc:61 -msgid "Candidate Versions" +msgid "Candidate versions" msgstr "" #: apt-pkg/depcache.cc:90 -msgid "Dependency Generation" +msgid "Dependency generation" msgstr "" #: apt-pkg/tagfile.cc:73 @@ -2104,7 +2096,7 @@ msgstr "" #: apt-pkg/sourcelist.cc:98 #, c-format -msgid "Malformed line %lu in source list %s (Absolute dist)" +msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" #: apt-pkg/sourcelist.cc:105 @@ -2231,37 +2223,37 @@ msgstr "" #: apt-pkg/pkgcachegen.cc:117 #, c-format -msgid "Error occured while processing %s (NewPackage)" +msgid "Error occurred while processing %s (NewPackage)" msgstr "" #: apt-pkg/pkgcachegen.cc:129 #, c-format -msgid "Error occured while processing %s (UsePackage1)" +msgid "Error occurred while processing %s (UsePackage1)" msgstr "" #: apt-pkg/pkgcachegen.cc:150 #, c-format -msgid "Error occured while processing %s (UsePackage2)" +msgid "Error occurred while processing %s (UsePackage2)" msgstr "" #: apt-pkg/pkgcachegen.cc:154 #, c-format -msgid "Error occured while processing %s (NewFileVer1)" +msgid "Error occurred while processing %s (NewFileVer1)" msgstr "" #: apt-pkg/pkgcachegen.cc:184 #, c-format -msgid "Error occured while processing %s (NewVersion1)" +msgid "Error occurred while processing %s (NewVersion1)" msgstr "" #: apt-pkg/pkgcachegen.cc:188 #, c-format -msgid "Error occured while processing %s (UsePackage3)" +msgid "Error occurred while processing %s (UsePackage3)" msgstr "" #: apt-pkg/pkgcachegen.cc:192 #, c-format -msgid "Error occured while processing %s (NewVersion2)" +msgid "Error occurred while processing %s (NewVersion2)" msgstr "" #: apt-pkg/pkgcachegen.cc:207 @@ -2278,12 +2270,12 @@ msgstr "" #: apt-pkg/pkgcachegen.cc:241 #, c-format -msgid "Error occured while processing %s (FindPkg)" +msgid "Error occurred while processing %s (FindPkg)" msgstr "" #: apt-pkg/pkgcachegen.cc:254 #, c-format -msgid "Error occured while processing %s (CollectFileProvides)" +msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "" #: apt-pkg/pkgcachegen.cc:260 @@ -2355,7 +2347,7 @@ msgstr "" #: apt-pkg/cdrom.cc:538 #, c-format -msgid "Stored Label: %s \n" +msgid "Stored label: %s \n" msgstr "" #: apt-pkg/cdrom.cc:558 @@ -2377,7 +2369,7 @@ msgid "Mounting CD-ROM...\n" msgstr "" #: apt-pkg/cdrom.cc:606 -msgid "Scanning Disc for index files..\n" +msgid "Scanning disc for index files..\n" msgstr "" #: apt-pkg/cdrom.cc:644 @@ -2392,7 +2384,7 @@ msgstr "" #: apt-pkg/cdrom.cc:717 #, c-format msgid "" -"This Disc is called: \n" +"This disc is called: \n" "'%s'\n" msgstr "" @@ -2405,7 +2397,7 @@ msgid "Writing new source list\n" msgstr "" #: apt-pkg/cdrom.cc:754 -msgid "Source List entries for this Disc are:\n" +msgid "Source list entries for this disc are:\n" msgstr "" #: apt-pkg/cdrom.cc:788 @@ -2424,12 +2416,12 @@ msgstr "" #: apt-pkg/indexcopy.cc:266 #, c-format -msgid "Wrote %i records with %i mismachted files\n" +msgid "Wrote %i records with %i mismatched files\n" msgstr "" #: apt-pkg/indexcopy.cc:269 #, c-format -msgid "Wrote %i records with %i missing files and %i mismachted files\n" +msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" #~ msgid "Unknown vendor ID '%s' in line %u of source list %s" diff --git a/po/es.po b/po/es.po index 4ff1e45e2..297aa64a3 100644 --- a/po/es.po +++ b/po/es.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.24\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-05 22:10+0100\n" +"POT-Creation-Date: 2005-03-29 07:17+0200\n" "PO-Revision-Date: 2005-02-08 20:36+0100\n" "Last-Translator: Rubn Porras Campo <nahoo@inicia.es>\n" "Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n" @@ -329,6 +329,7 @@ msgid "Error processing contents %s" msgstr "Error procesando contenidos %s" #: ftparchive/apt-ftparchive.cc:551 +#, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -367,7 +368,7 @@ msgid "" " --no-delink Enable delinking debug mode\n" " --contents Control contents file generation\n" " -c=? Read this configuration file\n" -" -o=? Set an arbitary configuration option" +" -o=? Set an arbitrary configuration option" msgstr "" "Uso: apt-ftparchive [opciones] orden\n" "Comandos: packages trayectoria-binaria [archivo-sobrepaso\n" @@ -1559,7 +1560,7 @@ msgid "Internal error adding a diversion" msgstr "Error interno agregando una desviacin" #: apt-inst/deb/dpkgdb.cc:383 -msgid "The pkg cache must be initialize first" +msgid "The pkg cache must be initialized first" msgstr "El cach del paquete debe de inicializarse primero" #: apt-inst/deb/dpkgdb.cc:386 @@ -2395,37 +2396,37 @@ msgstr "La cach #: apt-pkg/pkgcachegen.cc:117 #, c-format -msgid "Error occured while processing %s (NewPackage)" +msgid "Error occurred while processing %s (NewPackage)" msgstr "Ocurri un error mientras se procesaba %s (NewPackage)" #: apt-pkg/pkgcachegen.cc:129 #, c-format -msgid "Error occured while processing %s (UsePackage1)" +msgid "Error occurred while processing %s (UsePackage1)" msgstr "Ocurri un error mientras se procesaba %s (UsePackage1)" #: apt-pkg/pkgcachegen.cc:150 #, c-format -msgid "Error occured while processing %s (UsePackage2)" +msgid "Error occurred while processing %s (UsePackage2)" msgstr "Ocurri un error mientras se procesaba %s (UsePackage2)" #: apt-pkg/pkgcachegen.cc:154 #, c-format -msgid "Error occured while processing %s (NewFileVer1)" +msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Ocurri un error mientras se procesaba %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:184 #, c-format -msgid "Error occured while processing %s (NewVersion1)" +msgid "Error occurred while processing %s (NewVersion1)" msgstr "Ocurri un error mientras se procesaba %s (NewVersion1)" #: apt-pkg/pkgcachegen.cc:188 #, c-format -msgid "Error occured while processing %s (UsePackage3)" +msgid "Error occurred while processing %s (UsePackage3)" msgstr "Ocurri un error mientras se procesaba %s (UsePackage3)" #: apt-pkg/pkgcachegen.cc:192 #, c-format -msgid "Error occured while processing %s (NewVersion2)" +msgid "Error occurred while processing %s (NewVersion2)" msgstr "Ocurri un error mientras se procesaba %s (NewVersion2)" #: apt-pkg/pkgcachegen.cc:207 @@ -2445,12 +2446,12 @@ msgstr "" #: apt-pkg/pkgcachegen.cc:241 #, c-format -msgid "Error occured while processing %s (FindPkg)" +msgid "Error occurred while processing %s (FindPkg)" msgstr "Ocurri un error mientras procesaba %s (FindPkg)" #: apt-pkg/pkgcachegen.cc:254 #, c-format -msgid "Error occured while processing %s (CollectFileProvides)" +msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Ocurri un error mientras procesaba %s (CollectFileProvides)" #: apt-pkg/pkgcachegen.cc:260 diff --git a/po/eu.po b/po/eu.po index 306a00cf3..fec23bfe5 100644 --- a/po/eu.po +++ b/po/eu.po @@ -1,33 +1,33 @@ -# translation of apt-eu.po to Librezale.org -# Vasco translation of apt_po. +# translation of apt-eu.po to Basque # This file is put in the public domain. -# Mikel Olasagasti <hey_neken@mundurat.net>, 2004. -# Piarres Beobide Egaña <pi@beobide.net>, 2004, 2005. +# Hizkuntza Politikarako Sailburuordetza <hizkpol@ej-gv.es>, 2005. # msgid "" msgstr "" "Project-Id-Version: apt-eu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-05 22:10+0100\n" -"PO-Revision-Date: 2005-02-08 19:24+0100\n" -"Last-Translator: Piarres Beobide <pi@beobide.net>\n" -"Language-Team: Librezale.org <librezale@librezale.org>\n" +"POT-Creation-Date: 2005-03-29 07:17+0200\n" +"PO-Revision-Date: 2005-04-20 20:05+0200\n" +"Last-Translator: Hizkuntza Politikarako Sailburuordetza <hizkpol@ej-gv.es>\n" +"Language-Team: Basque <itzulpena@euskalgnu.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.9.1\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"\n" #: cmdline/apt-cache.cc:135 #, c-format msgid "Package %s version %s has an unmet dep:\n" -msgstr "%s paketearen %s bertsioak betegabeko dependetzia bat du:\n" +msgstr "%s paketeak (%s bertsioa) mendekotasun-arazo bat du:\n" #: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 #: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 #: cmdline/apt-cache.cc:1508 #, c-format msgid "Unable to locate package %s" -msgstr "Ezin da %s paketea aurkitu" +msgstr "Ezin da %s paketea lokalizatu" #: cmdline/apt-cache.cc:232 msgid "Total package names : " @@ -51,7 +51,7 @@ msgstr " Nahastutako pakete birtualak: " #: cmdline/apt-cache.cc:276 msgid " Missing: " -msgstr " Faltan:" +msgstr " Falta direnak: " #: cmdline/apt-cache.cc:278 msgid "Total distinct versions: " @@ -88,11 +88,11 @@ msgstr "Guztira erregitratutako lekua: " #: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 #, c-format msgid "Package file %s is out of sync." -msgstr "%s pakete fitxategia sinkroniaz kanpora dago." +msgstr "%s pakete-fitxategia ez dago sinkronizatuta." #: cmdline/apt-cache.cc:1231 msgid "You must give exactly one pattern" -msgstr "Zehatz mehaz patroi bat eman behar duzu" +msgstr "Zehazki eredu bat eman behar duzu." #: cmdline/apt-cache.cc:1385 msgid "No packages found" @@ -104,7 +104,9 @@ msgstr "Pakete Fitxatefiak:" #: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 msgid "Cache is out of sync, can't x-ref a package file" -msgstr "Cachea sync-etik kanpora, ezin x-ref-atu pakete fitxategi bat" +msgstr "" +"Cachea ez dago sinkronizatuta, ezin zaio erreferentziarik (x-ref) egin " +"pakete-fitxategi bati" #: cmdline/apt-cache.cc:1470 #, c-format @@ -123,7 +125,7 @@ msgstr "(ez da aurkitu)" #. Installed version #: cmdline/apt-cache.cc:1515 msgid " Installed: " -msgstr "Instalatu:" +msgstr " Instalatuta: " #: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 msgid "(none)" @@ -153,7 +155,7 @@ msgstr " %4i %s\n" #: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" -msgstr "%s %s %s %s-rentzat %s %s-ean konpilaturik\n" +msgstr "%s %s (%s %s) konpilatua: %s %s\n" #: cmdline/apt-cache.cc:1658 msgid "" @@ -194,45 +196,43 @@ msgid "" "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" msgstr "" "Erabilera: apt-cache [aukerak] komandoa\n" -" apt-cache [aukerak] add 1fitxategia [2fitxategia ...]\n" -" apt-cache [aukerak] showpkg 1paketea [2paketea ...]\n" -" apt-cache [aukerak] showsrc 1paketea [2paketea ...]\n" -"\n" -"Apt-cache APT-ren katxeatutako fitxategi binariarrak eraldatu eta\n" -"bertako informazioa kontsulatzeko maila baxuko lanabes bat da.\n" +" apt-cache [aukerak] add fitxategia1 [fitxategia2 ...]\n" +" apt-cache [aukerak] showpkg pak1 [pak2 ...]\n" +" apt-cache [aukerak] showsrc pak1 [pak2 ...]\n" "\n" +"APTren cache-fitxategi bitarrak manipulatzeko eta kontsultatzeko erabiltzen\n" +"den behe-mailako tresna bat da, apt-cache.\n" "Komandoak:\n" -" add - Gehitu pakete fitxategi bat iturburu katxera\n" -" gencaches - Eraiki pakete eta iturburu katxe fitxategiak\n" -" showpkg - Bakanako pakete bati buruz argibide orokorrak erakutsi\n" -" showsrc - Iturburu erregistroak erakutsi\n" -" stats - Zenbait estatistika erakutsi\n" -" dump - Ikusi fitxategi osoa\n" -" dumpavail - Inprimatu eskuragarri fitxategia irteera estandarrean\n" -" unmet - Erakutsi betegabeko dependentziak\n" -" search - Pakete zerrendan espresio erregular bat bilatu\n" -" show - Erakutsi pakete baten erregitro irakurgarria\n" -" depends - Erakutsi pakete baten dependentzi argibideak\n" -" rdepends - Erakutsi pakete baten dependentzi argibideak atzetik aurrera\n" -" pkgnames - Zerrendatu fitxategi guztien izenak\n" -" dotty - Sortu fitxategi grafikak GraphVis-rentzat\n" -" xvcg - Sortu fitxategi grafikak xvcg-rentzat\n" -" policy - Erakutsi politika ezarpenak\n" +" add - Pakete-fitxategi bat gehitzen du iturburuko cachean\n" +" gencaches - Bi cacheak sortzen ditu: paketeena eta iturburuena\n" +" showpkg - Pakete baten informazio orokorra erakusten du\n" +" showsrc - Iturburu-erregistroak erakusten ditu\n" +" stats - Oinarrizko estatistika batzuk erakusten ditu\n" +" dump - Fitxategi osoa erakusten du formatu laburrean\n" +" dumpavail - Fitxategi erabilgarri bat irteera estandarrean inprimatu\n" +" unmet - Bete gabeko mendekotasunak erakusten ditu\n" +" search - Adierazpen erregularrak bilatzen ditu pakete-zerrendan \n" +" show - Paketearen erregistro irakurgarri bat erakusten du\n" +" depends - Pakete baten mendekotasunak erakusten ditu\n" +" rdepends - Pakete baten mendekotasun alderantzikatuak erakusten ditu\n" +" pkgnames - Pakete guztien izenak zerrendatzen ditu\n" +" dotty - GraphVis-ekin erabiltzeko pakete-grafikoak sortzen ditu\n" +" xvcg - xvcg-ekin erabiltzeko pakete-grafikoak sortzen ditu\n" +" policy - Gidalerroen ezarpenak erakusten ditu\n" "\n" "Aukerak:\n" -" -h Laguntza testu hau.\n" -" -p=? Pakete katxea.\n" -" -s=? Iturburu katxea.\n" -" -q Ezgaitu aurrerapen erakuslea.\n" -" -i unmet komandoaren dependentzi garratzitsuak bakarrik bistarazi.\n" -" -c=? Erabili konfigurazio fitxategi hau\n" -" -o=? Konfigurazio aukera bat ezarri, asib -o dir::cache=/tmp\n" -"Ikusi apt-cache(8) and apt.conf(5) manual orrialdeak argibide " -"gehiagorentzat.\n" +" -h Laguntza-testu hau.\n" +" -p=? Paketearen cachea.\n" +" -s=? Iturburuaren cachea.\n" +" -q Desgaitu progresio-adierazlea.\n" +" -i Mendekotasun nagusiak soilik erakutsi.\n" +" -c=? Irakurri konfigurazio-fitxategi hau\n" +" -o=? Ezarri konfigurazio-aukera arbitrario bat. Adib.: -o dir::cache=/tmp\n" +"Informazio gehiago nahi izanez gero: ikus apt-cache(8) eta apt.conf(5).\n" #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" -msgstr "Argumentuak ez daude bikoteetan" +msgstr "Parekatu gabeko argumentuak" #: cmdline/apt-config.cc:76 msgid "" @@ -251,21 +251,21 @@ msgid "" msgstr "" "Erabilera: apt-config [aukerak] komandoa\n" "\n" -"apt-config APT-ren konfigurazioa bistaratzeko lanabesa da.\n" +"apt-config APT konfigurazio-fitxategia irakurtzeko tresna soil bat da\n" "\n" "Komandoak:\n" -" shell - shell modua\n" -" dump - konfigurazioa bistarazi\n" +" shell - Shell modua\n" +" dump - Konfigurazioa erakusten du\n" "\n" -"Opciones:\n" -" -h Laguntza testu hau.\n" -" -c=? Konfigurazio fitxategi hau erabili\n" -" -o=? Konfigurazio aukera bat ezarri, adib: -o dir::ache=/tmp\n" +"Aukerak:\n" +" -h Laguntza-testu hau.\n" +" -c=? Irakurri konfigurazio-fitxategi hau\n" +" -o=? Ezarri konfigurazio-aukera arbitrario bat. Adib.: -o dir::cache=/tmp\n" #: cmdline/apt-extracttemplates.cc:98 #, c-format msgid "%s not a valid DEB package." -msgstr "%s ez da baliozko DEB paketea" +msgstr "%s ez da baliozko DEB pakete bat." #: cmdline/apt-extracttemplates.cc:232 msgid "" @@ -280,29 +280,29 @@ msgid "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Eralbilera: apt-extracttemplates 1fitxategia [2fitx ...]\n" +"Erabilera: apt-extracttemplates fitxategia1 [fitxategia2 ...]\n" "\n" -"apt-extracttemplates debian paketeetatik konfigurazio eta txantilloi\n" -"informazioa ateratzeko tresna da\n" +"apt-extracttemplates debian-eko paketeen konfigurazioaren eta txantiloien\n" +"informazioa ateratzeko tresna bat da\n" "\n" "Aukerak:\n" -" -h Laguntza testu hau\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" +" -h Laguntza-testu hau\n" +" -t Ezarri aldi baterako direktorioa\n" +" -c=? Irakurri konfigurazio-fitxategi hau\n" +" -o=? Ezarri konfigurazio-aukera arbitrario bat. Adib.: -o dir::cache=/tmp\n" #: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 #, c-format msgid "Unable to write to %s" -msgstr "Ezin da %s-n idatzi" +msgstr "%s : ezin da idatzi" #: cmdline/apt-extracttemplates.cc:310 msgid "Cannot get debconf version. Is debconf installed?" -msgstr "Ezin lortu debconf-en bertsioa. Debconf instalatua dago?" +msgstr "Ezin da debconf bertsioa eskuratu. Debconf instalatuta dago?" #: ftparchive/apt-ftparchive.cc:163 ftparchive/apt-ftparchive.cc:337 msgid "Package extension list is too long" -msgstr "Pakete gehigarri zerrenda luzeegia da" +msgstr "Pakete-luzapenen zerrenda luzeegia da" #: ftparchive/apt-ftparchive.cc:165 ftparchive/apt-ftparchive.cc:179 #: ftparchive/apt-ftparchive.cc:202 ftparchive/apt-ftparchive.cc:252 @@ -313,11 +313,11 @@ msgstr "Errorea direktorioa prozesatzean %s" #: ftparchive/apt-ftparchive.cc:250 msgid "Source extension list is too long" -msgstr "Iturburu gehigarri zerrenda luzeegia da" +msgstr "Iturburu-luzapenen zerrenda luzeegia da" #: ftparchive/apt-ftparchive.cc:367 msgid "Error writing header to contents file" -msgstr "Errorea eduki fitxategiei goiburuak idaztean" +msgstr "Errorea eduki-fitxategiaren goiburua idaztean" #: ftparchive/apt-ftparchive.cc:397 #, c-format @@ -363,93 +363,92 @@ msgid "" " --no-delink Enable delinking debug mode\n" " --contents Control contents file generation\n" " -c=? Read this configuration file\n" -" -o=? Set an arbitary configuration option" +" -o=? Set an arbitrary configuration option" msgstr "" -"Erabilera: apt-ftparchive [aukerak] komandoa\n" -"Komandoak: packages bide binariarra [gainidazteko_fitx [pathaurrizkia]]\n" -" sources iturburu_bidea [gainidazteko_fitx [pathaurrizkia]]\n" -" contents bidea\n" -" release bidea\n" -" generate config [taldeak]\n" -" clean config\n" -"\n" -"apt-ftparchive-k Debian fitxategien indizeak sortzen ditu.\n" -"Zenbait sorpen estilo onartzen ditu guztiz automatizatuetatik\n" -" dpkg-scanpackages eta dpkg-scansources aldaketak arte.\n" +"Erabilera: apt-ftparchive [aukerak] komandoa\n" +"Komandoak: 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-k Debian fitxategi zuhaitzetatiko indizeak sortzen ditu.\n" -"Pakete fitxategiak pakete bakoitzaren kontrol eremu guztiak, MD5 batuketa\n" -"eta fitxategi tamaina. Aurrenagusitza fitxategi bat onartzen da\n" -" Lehentasun eta Sekzio balioak aldatzeko\n" +"apt-ftparchive Debian artxiboen indizeak sortzeko erabiltzen da. Sortzeko \n" +"estilo asko onartzen ditu, erabat automatizatuak nahiz ordezte funtzionalak\n" +"'dpkg-scanpackages' eta 'dpkg-scansources'erako\n" +"Package izeneko fitxategiak sortzen ditu .deb fitxategien zuhaitz batetik.\n" +"Package fitxategiak pakete bakoitzaren kontrol-eremu guztiak izaten ditu,\n" +"MD5 hash balioa eta fitxategi-tamaina barne. Override fitxategia erabiltzen\n" +"da lehentasunearen eta sekzioaren balioak behartzeko.\n" "\n" -"Era berean apt-ftparchive-k iturburu fitxategiak prestatzen ditu ..dscs\n" -"zuhaitzentzat. --source-- aukera erabili daiteke iturburu aurrenagusitza\n" -"iturburu bat ezartzeko\n" -"\n" -"'packages' eta 'sources' komandoak zuhaitzaren erroan abiarazi behar\n" -" dira. BinaryPath-ek bilaketa errekurtsiboraren errora zuzendu behar da\n" -"eta aurrenagusitza fitxategia aurrenagusitze banderak izan behar ditu\n" -"Debian fitxategietan oinarritutako adibide bat:\n" +"Era berean, iturburu-fitxategiak ere sortzen ditu .dsc fitxategien\n" +"zuhaitzetik. --source-override aukera erabil daiteke src override \n" +"fitxategi bat zehazteko.\n" +"'packages' eta 'sources' komandoa zuhaitzaren erroan exekutatu behar dira.\n" +"BinaryPath-ek bilaketa errekurtsiboaren oinarria seinalatu behar du, eta\n" +"override fitxategiak override banderak izan behar ditu. Pathprefix \n" +"fitxategi-izenen eremuei eransten zaie (halakorik badago). Hona hemen\n" +"Debian artxiboko erabilera-adibide bat:\n" " apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" " dists/potato/main/binary-i386/Packages\n" "\n" "Aukerak:\n" -" -h LAguntza testu hau\n" -" --md5 MD5 kontrolaren sormena\n" -" -s=? Aurredominio iturburu fitxategia\n" +" -h Laguntza-testu hau\n" +" --md5 Kontrolatu MD5 sortzea\n" +" -s=? Iturburuaren override fitxategia\n" " -q Isilik\n" -" -d=? Aukerako databasea katxe batetatik aukeratu\n" -" --no-delink Delink arazpen modua gaitzen du\n" -" --contents Kontrol edukien fitxategi sortzea \n" -" -c=? Konfigurazio fitxategi hau erabili\n" -" -o=? Konfigurazio aukera bat ezarri" +" -d=? Hautatu aukerako cachearen datu-basea\n" +" --no-delink Gaitu delink arazketa-modua\n" +" --contents Kontrolatu eduki-fitxategia sortzea\n" +" -c=? Irakurri konfigurazio-fitxategi hau\n" +" -o=? Ezarri konfigurazio-aukera arbitrario bat" #: ftparchive/apt-ftparchive.cc:757 msgid "No selections matched" -msgstr "Ez dago pareko aukeraketarik" +msgstr "Ez dago bat datorren hautapenik" #: ftparchive/apt-ftparchive.cc:830 #, c-format msgid "Some files are missing in the package file group `%s'" -msgstr "Fitxategi batzu faltda dira `%s' pakete fitxategi taldean. " +msgstr "Fitxategi batzuk falta dira `%s' pakete-fitxategien taldean" #: ftparchive/cachedb.cc:45 #, c-format msgid "DB was corrupted, file renamed to %s.old" -msgstr "DB ustela zegoen, fitxategia %s.old era izena aldatu zaio" +msgstr "Datu-basea hondatuta dago; fitxategiari %s.old izena jarri zaio" #: ftparchive/cachedb.cc:63 #, c-format msgid "DB is old, attempting to upgrade %s" -msgstr "DB zaharra da, %s-rae eguneratzen saiatzen" +msgstr "Datu-basea zaharra da; %s bertsio-berritzen saiatzen ari da" #: ftparchive/cachedb.cc:73 #, c-format msgid "Unable to open DB file %s: %s" -msgstr "Ezin da DB2 %s fitxategia ireki: %s" +msgstr "Ezin da ireki %s datu-base fitxategia: %s" #: ftparchive/cachedb.cc:114 #, c-format msgid "File date has changed %s" -msgstr "Fitxategiaren data aldatu egin da %s" +msgstr "Fitxategi-data aldatu egin da: %s" #: ftparchive/cachedb.cc:155 msgid "Archive has no control record" -msgstr "Artxiboak ez du kontrol markarik" +msgstr "Artxiboak ez du kontrol-erregistrorik" #: ftparchive/cachedb.cc:267 msgid "Unable to get a cursor" -msgstr "Ezin izan da kutrsorea eskuratu" +msgstr "Ezin da kurtsorerik eskuratu" #: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" -msgstr "W: Ezin da %s karpeta ireki\n" +msgstr "A: Ezin da %s direktorioa irakurri\n" #: ftparchive/writer.cc:84 #, c-format msgid "W: Unable to stat %s\n" -msgstr "O: Ezin da %s irakurri\n" +msgstr "A: Ezin da %s atzitu\n" #: ftparchive/writer.cc:126 msgid "E: " @@ -457,25 +456,25 @@ msgstr "E: " #: ftparchive/writer.cc:128 msgid "W: " -msgstr "W: " +msgstr "A: " #: ftparchive/writer.cc:135 msgid "E: Errors apply to file " -msgstr "E: Erroreak fitxategiari dagozkio" +msgstr "E: Erroreak fitxategiari dagozkio " #: ftparchive/writer.cc:152 ftparchive/writer.cc:182 #, c-format msgid "Failed to resolve %s" -msgstr "Huts %s ebazterakoan" +msgstr "Huts egin du %s ebaztean" #: ftparchive/writer.cc:164 msgid "Tree walking failed" -msgstr "Huts zuhaitza pasatzerakoan" +msgstr "Huts egin dute zuhaitz-urratsek" #: ftparchive/writer.cc:189 #, c-format msgid "Failed to open %s" -msgstr "Huts %s irekitzerakoan" +msgstr "Huts egin du %s irekitzean" #: ftparchive/writer.cc:246 #, c-format @@ -485,42 +484,42 @@ msgstr " DeLink %s [%s]\n" #: ftparchive/writer.cc:254 #, c-format msgid "Failed to readlink %s" -msgstr "Ezin izan da %s esteka irakurri" +msgstr "Huts egin du %s esteka irakurtzean" #: ftparchive/writer.cc:258 #, c-format msgid "Failed to unlink %s" -msgstr "Huts %s esteka ezabatzerakoan" +msgstr "Huts egin du %s desestekatzean" #: ftparchive/writer.cc:265 #, c-format msgid "*** Failed to link %s to %s" -msgstr "*** Huts %s - %s esteka egiterakoan" +msgstr "*** Ezin izan da %s %s(r)ekin estekatu" #: ftparchive/writer.cc:275 #, c-format msgid " DeLink limit of %sB hit.\n" -msgstr " DeLink %sB muigara ailatu da.\n" +msgstr " DeLink-en mugara (%sB) heldu da.\n" #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 #: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 #, c-format msgid "Failed to stat %s" -msgstr "Huts egin da %s identifikatzen" +msgstr "Huts egin du %s(e)tik datuak lortzean" #: ftparchive/writer.cc:378 msgid "Archive had no package field" -msgstr "Artxiboak ez du pakete eremua" +msgstr "Artxiboak ez du pakete-eremurik" #: ftparchive/writer.cc:386 ftparchive/writer.cc:595 #, c-format msgid " %s has no override entry\n" -msgstr " %s ez di gainidazteko erregistrotik\n" +msgstr " %s: ez du override sarrerarik\n" #: ftparchive/writer.cc:429 ftparchive/writer.cc:677 #, c-format msgid " %s maintainer is %s not %s\n" -msgstr " %s-ren mantentzailea %s da ez %s\n" +msgstr " %s mantentzailea %s da, eta ez %s\n" #: ftparchive/contents.cc:317 #, c-format @@ -529,7 +528,7 @@ msgstr "Barne Errorea, ezin da %s atala kokatu" #: ftparchive/contents.cc:353 ftparchive/contents.cc:384 msgid "realloc - Failed to allocate memory" -msgstr "realloc - Huts egin da memoria esleitzean" +msgstr "realloc - Huts egin du memoria esleitzean" #: ftparchive/override.cc:38 ftparchive/override.cc:146 #, c-format @@ -539,22 +538,22 @@ msgstr "Ezin da %s ireki" #: ftparchive/override.cc:64 ftparchive/override.cc:170 #, c-format msgid "Malformed override %s line %lu #1" -msgstr "Gaizki eratutako gainidazketa %s lerroa %lu #1" +msgstr "Gaizki osatutako override %s, lerroa: %lu #1" #: ftparchive/override.cc:78 ftparchive/override.cc:182 #, c-format msgid "Malformed override %s line %lu #2" -msgstr "Gaizki eratutako gainidazketa %s lerroa %lu #2" +msgstr "Gaizki osatutako override %s, lerroa: %lu #2" #: ftparchive/override.cc:92 ftparchive/override.cc:195 #, c-format msgid "Malformed override %s line %lu #3" -msgstr "Gaizki eratutako gainidazketa %s lerroa %lu #3" +msgstr "Gaizki osatutako override %s, lerroa: %lu #3" #: ftparchive/override.cc:131 ftparchive/override.cc:205 #, c-format msgid "Failed to read the override file %s" -msgstr "Huts %s gainidazketa fitxategia irakurtzerakoan" +msgstr "Huts egin du %s override fitxategia irakurtzean" #: ftparchive/multicompress.cc:75 #, c-format @@ -564,19 +563,19 @@ msgstr "'%s' Kompresio Algoritmo Ezezaguna" #: ftparchive/multicompress.cc:105 #, c-format msgid "Compressed output %s needs a compression set" -msgstr "Konprimatutako %s irteerak konpresio joko bat behar du" +msgstr "%s irteera konprimituak konpresio-tresna bat behar du" #: ftparchive/multicompress.cc:172 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" -msgstr "Huts azpiprozesuari IPC hodia sortzerakoan" +msgstr "Huts egin du azpiprozesuarentzako IPC kanalizazio bat sortzean" #: ftparchive/multicompress.cc:198 msgid "Failed to create FILE*" -msgstr "Huts egin da FILE* sortzen" +msgstr "Huts egin du FILE* sortzean" #: ftparchive/multicompress.cc:201 msgid "Failed to fork" -msgstr "HYuts bikoizterakoan" +msgstr "Huts egin du sardetzean" #: ftparchive/multicompress.cc:215 msgid "Compress child" @@ -589,51 +588,51 @@ msgstr "Barne Errorea, Huts %s sortzerakoan" #: ftparchive/multicompress.cc:289 msgid "Failed to create subprocess IPC" -msgstr "Huts IPC azpiprozesua sortzerakoan" +msgstr "Huts egin du IPC azpiprozesua sortzean" #: ftparchive/multicompress.cc:324 msgid "Failed to exec compressor " -msgstr "Huts egin da konprimatzailea exekutatzen " +msgstr "Huts egin du konpresorea exekutatzean " #: ftparchive/multicompress.cc:363 msgid "decompressor" -msgstr "dekonpresorea" +msgstr "deskonpresorea" #: ftparchive/multicompress.cc:406 msgid "IO to subprocess/file failed" -msgstr "Huts S/I azpiprozesu/fitxategia-n" +msgstr "Huts egin du azpiprozesu/fitxategiko S/Iak" #: ftparchive/multicompress.cc:458 msgid "Failed to read while computing MD5" -msgstr "Ezin izan da irakurri MD5 komputatzen zen bitartean" +msgstr "Huts egin du MD5 konputatzean" #: ftparchive/multicompress.cc:475 #, c-format msgid "Problem unlinking %s" -msgstr "Arazoa %s esteka ezabatzerakoan" +msgstr "Arazoa %s desestekatzean" #: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 #, c-format msgid "Failed to rename %s to %s" -msgstr "Huts %s %s-ra berrizendatzerakoan" +msgstr "Huts egin du %s izenaren ordez %s ipintzean" #: cmdline/apt-get.cc:118 msgid "Y" -msgstr "B" +msgstr "Y" #: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475 #, c-format msgid "Regex compilation error - %s" -msgstr "Espresio Erregular konpilazio errorea - %s" +msgstr "Adierazpen erregularren konpilazio-errorea - %s" #: cmdline/apt-get.cc:235 msgid "The following packages have unmet dependencies:" -msgstr "Hurrengo paketeek betegabeko dependentziak dituzte:" +msgstr "Ondorengo paketeetan bete gabeko mendekotasunak daude:" #: cmdline/apt-get.cc:325 #, c-format msgid "but %s is installed" -msgstr "baina %s instalatua dago" +msgstr "baina %s instalatuta dago" #: cmdline/apt-get.cc:327 #, c-format @@ -646,109 +645,109 @@ msgstr "baina ez da instalagarria" #: cmdline/apt-get.cc:336 msgid "but it is a virtual package" -msgstr "baina pakete birtual bat da" +msgstr "baina pakete birtuala da" #: cmdline/apt-get.cc:339 msgid "but it is not installed" -msgstr "baina ez dago instalatua" +msgstr "baina ez dago instalatuta" #: cmdline/apt-get.cc:339 msgid "but it is not going to be installed" -msgstr "baina ez da instalatua izango" +msgstr "baina ez da instalatuko" #: cmdline/apt-get.cc:344 msgid " or" -msgstr "edo" +msgstr " edo" #: cmdline/apt-get.cc:373 msgid "The following NEW packages will be installed:" -msgstr "Hurrengo pakete BERRIAK instalatuko dira:" +msgstr "Ondorengo pakete BERRIAK instalatuko dira:" #: cmdline/apt-get.cc:399 msgid "The following packages will be REMOVED:" -msgstr "Hurrego paketeak EZABATUKO dira:" +msgstr "Ondorengo paketeak KENDUKO dira:" #: cmdline/apt-get.cc:421 msgid "The following packages have been kept back:" -msgstr "Hurrengo paketeak ez dira eguneratuko:" +msgstr "Ondorengo paketeak mantendu egin dira:" #: cmdline/apt-get.cc:442 msgid "The following packages will be upgraded:" -msgstr "Hurrengo paketeak eguneratuak izango dira:" +msgstr "Ondorengo paketeak BERTSIO-BERRITUKO dira:" #: cmdline/apt-get.cc:463 msgid "The following packages will be DOWNGRADED:" -msgstr "Hurrengo paketeak ATZERATUAK izango dira:" +msgstr "Ondorengo paketeak AURREKO BERTSIORA itzuliko dira:" #: cmdline/apt-get.cc:483 msgid "The following held packages will be changed:" -msgstr "Hurrengo pakete hizoztuak aldatuko dira:" +msgstr "Ondorengo pakete atxikiak aldatu egingo dira:" #: cmdline/apt-get.cc:536 #, c-format msgid "%s (due to %s) " -msgstr "%s (%s-rengatik) " +msgstr "%s (arrazoia: %s) " #: cmdline/apt-get.cc:544 msgid "" "WARNING: The following essential packages will be removed\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" -"KONTUZ: Hurrengo beharrezko paketeak ezabatuak izango dira\n" -"Zuk EZ zenuke hau egin behar zer egitera zoazen ziur ez badakizu!" +"KONTUZ: Ondorengo funtsezko paketeak kendu egingo dira\n" +"EZ ezazu horelakorik egin, ez badakizu ondo zertan ari zaren!" #: cmdline/apt-get.cc:575 #, c-format msgid "%lu upgraded, %lu newly installed, " -msgstr "%lu eguneratzeko, %lu berri instalatzeko, " +msgstr "%lu bertsio-berrituta, %lu berriki instalatuta, " #: cmdline/apt-get.cc:579 #, c-format msgid "%lu reinstalled, " -msgstr "%lu berrinstalatzeko, " +msgstr "%lu berrinstalatuta, " #: cmdline/apt-get.cc:581 #, c-format msgid "%lu downgraded, " -msgstr "%lu atzeratzeko, " +msgstr "%lu aurreko bertsiora itzulita, " #: cmdline/apt-get.cc:583 #, c-format msgid "%lu to remove and %lu not upgraded.\n" -msgstr "%lu ezabatzeko eta %lu eguneratu gabe.\n" +msgstr "%lu kentzeko, eta %lu bertsio-berritu gabe.\n" #: cmdline/apt-get.cc:587 #, c-format msgid "%lu not fully installed or removed.\n" -msgstr "%lu ez guztiz instalatu edo ezabaturik.\n" +msgstr "%lu ez erabat instalatuta edo kenduta.\n" #: cmdline/apt-get.cc:647 msgid "Correcting dependencies..." -msgstr "Dependentziak zuzentzen..." +msgstr "Mendekotasunak zuzentzen..." #: cmdline/apt-get.cc:650 msgid " failed." -msgstr " huts egin da." +msgstr " : huts egin du." #: cmdline/apt-get.cc:653 msgid "Unable to correct dependencies" -msgstr "Ezin dira dependetziak zuzendu" +msgstr "Ezin dira mendekotasunak zuzendu" #: cmdline/apt-get.cc:656 msgid "Unable to minimize the upgrade set" -msgstr "Ezin da eguneraketa mutzoa txikiagotu" +msgstr "Ezin da bertsio-berritzeko multzoa minimizatu" #: cmdline/apt-get.cc:658 msgid " Done" -msgstr " Egina" +msgstr " Eginda" #: cmdline/apt-get.cc:662 msgid "You might want to run `apt-get -f install' to correct these." -msgstr "Zuk `apt-get -f install' exekutatu beharko zenuke hau zuzentzeko." +msgstr "Beharbada `apt-get -f install' exekutatu nahiko duzu zuzentzeko." #: cmdline/apt-get.cc:665 msgid "Unmet dependencies. Try using -f." -msgstr "Betegabeko dependetziak. Saiatu -f erabiliaz." +msgstr "Bete gabeko mendekotasunak. Probatu -f erabiliz." #: cmdline/apt-get.cc:687 msgid "WARNING: The following packages cannot be authenticated!" @@ -764,7 +763,7 @@ msgstr "Zenbait pakete ezin dira egiaztatu" #: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855 msgid "There are problems and -y was used without --force-yes" -msgstr "Arazoak daude eta --y --force-yes gabe erabili da" +msgstr "Arazoak daude, eta -y erabili da --force-yes gabe" #: cmdline/apt-get.cc:762 msgid "Packages need to be removed but remove is disabled." @@ -772,45 +771,45 @@ msgstr "Paketeak ezabatu beharra dute bain Ezabatzea ezgaiturik dago." #: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802 msgid "Unable to lock the download directory" -msgstr "Ezin da deskarga karpeta blokeatu" +msgstr "Ezin da deskarga-direktorioa blokeatu" #: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." -msgstr "Iturburu zerrenda ezin da irakurri." +msgstr "Ezin izan da iturburu-zerrenda irakurri." #: cmdline/apt-get.cc:818 #, c-format msgid "Need to get %sB/%sB of archives.\n" -msgstr "%sB/%sB fitxategi eskuratu behar dira.\n" +msgstr "Artxiboetako %sB/%sB eskuratu behar dira.\n" #: cmdline/apt-get.cc:821 #, c-format msgid "Need to get %sB of archives.\n" -msgstr "%sB fitxategi eskuratu behar dira.\n" +msgstr "Artxiboetako %sB eskuratu behar dira.\n" #: cmdline/apt-get.cc:826 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" -msgstr "Despaketatu ondoren diskotik %sB leku libre erabiliko da.\n" +msgstr "Deskonprimitu ondoren, %sB gehiago erabiliko dira diskoan.\n" #: cmdline/apt-get.cc:829 #, c-format msgid "After unpacking %sB disk space will be freed.\n" -msgstr "Despaketatu ondoren diskoan %sB leku hustuko da.\n" +msgstr "Deskonprimitu ondoren, %sB libratuko dira diskoan.\n" #: cmdline/apt-get.cc:846 #, c-format msgid "You don't have enough free space in %s." -msgstr "Ez duzu behar aina leku %s-n" +msgstr "Ez daukazu nahikoa leku libre %s(e)n." #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881 msgid "Trivial Only specified but this is not a trivial operation." -msgstr "Tirvial Only ezarri duzu baina hau ez da ekintza xume bat." +msgstr "'Trivial Only' zehaztu da, baina hau ez da eragiketa tribial bat." #: cmdline/apt-get.cc:863 msgid "Yes, do as I say!" -msgstr "Bai, egin nik esan bezala!" +msgstr "Bai, egin esandakoa!" #: cmdline/apt-get.cc:865 #, c-format @@ -819,8 +818,8 @@ msgid "" "To continue type in the phrase '%s'\n" " ?] " msgstr "" -"Ziurrenik oso kaltegarri izango den zerbait egitera zoaz\n" -"Jarraitu nahi ezkero idatzi '%s'\n" +"Egin nahi duzunak kalte larriak eragin ditzake\n" +"Jarratzeko, idatzi '%s' esaldia\n" " ?] " #: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890 @@ -834,31 +833,31 @@ msgstr "Aurrera jarraitu nahi al duzu [B/e]? " #: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959 #, c-format msgid "Failed to fetch %s %s\n" -msgstr "Huts egin da %s eskuratzen %s\n" +msgstr "Ezin da lortu %s %s\n" #: cmdline/apt-get.cc:976 msgid "Some files failed to download" -msgstr "Huts zenbait fitxategi deskargatzerakoan" +msgstr "Fitxategi batzuk ezin izan dira deskargatu" #: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968 msgid "Download complete and in download only mode" -msgstr "Dekarga osoturik eta bakarrik deskarga moduan" +msgstr "Deskarga amaituta eta deskarga soileko moduan" #: cmdline/apt-get.cc:983 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" -"Ezin dira fitxategi batzu eskuratu, apt-get update abiarazi edo saiatu --" -"fix- missing erabiliaz?" +"Ezin izan dira artxibo batzuk lortu; beharbada apt-get update exekutatu, edo " +"--fix-missing aukerarekin saiatu?" #: cmdline/apt-get.cc:987 msgid "--fix-missing and media swapping is not currently supported" -msgstr "--fix-missing eta medio aldaketa ez dira onartzen orain." +msgstr "--fix-missing eta euskarri-aldaketa ez dira onartzen oraingoz" #: cmdline/apt-get.cc:992 msgid "Unable to correct missing packages." -msgstr "Ezin dira falta diren paketeak konpondu." +msgstr "Falta diren paketeak ezin dira zuzendu." #: cmdline/apt-get.cc:993 msgid "Aborting install." @@ -867,31 +866,30 @@ msgstr "Abortatu instalazioa." #: cmdline/apt-get.cc:1026 #, c-format msgid "Note, selecting %s instead of %s\n" -msgstr "Oharra, %s aukeratzen %s-ren ordez\n" +msgstr "Oharra, %s hautatzen %s(r)en ordez\n" #: cmdline/apt-get.cc:1036 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" -msgstr "" -"%s Albo batetara uzten, instalaturik dago eta eguneraketa ez dago gaiturik\n" +msgstr "%s saltatzen. Instalatuta dago, eta ez dago bertsio-berritzerik.\n" #: cmdline/apt-get.cc:1054 #, c-format msgid "Package %s is not installed, so not removed\n" -msgstr "%s paketea ez dagoinstalaturik, beraz ez da ezabatuko\n" +msgstr "%s paketea ez dago instalatuta, eta, beraz, ez da kenduko\n" #: cmdline/apt-get.cc:1065 #, c-format msgid "Package %s is a virtual package provided by:\n" -msgstr "%s Paketea pakete birtual bat da eta beste honek dakar:\n" +msgstr "%s pakete birtual bat da, honek hornitua:\n" #: cmdline/apt-get.cc:1077 msgid " [Installed]" -msgstr " [Instalatua]" +msgstr " [Instalatuta]" #: cmdline/apt-get.cc:1082 msgid "You should explicitly select one to install." -msgstr "Instalatzekozehazki bat ezarri behar duzu." +msgstr "Zehazki bat hautatu behar duzu instalatzeko." #: cmdline/apt-get.cc:1087 #, c-format @@ -900,60 +898,59 @@ msgid "" "This may mean that the package is missing, has been obsoleted, or\n" "is only available from another source\n" msgstr "" -"%s paketea ez da eskuragarria, baina beste pakete batenbatek \n" -" honi erreferentzia egiten du. Honek paketea falta dela, zaharkiturik \n" -" dagoela edo beste jatorri batetatik bakarrik eskuratu daitekeela\n" -"esan nahi du\n" +"%s paketea ez dago erabilgarri, baina beste pakete batek erreferentzia \n" +"egiten dio. Beharbada paketea faltako da, edo zaharkituta egongo da, edo \n" +"beste iturburu batean bakarrik egongo da erabilgarri\n" #: cmdline/apt-get.cc:1106 msgid "However the following packages replace it:" -msgstr "Hala ere, hurrengo paketeek berre lekua beteko dute:" +msgstr "Baina ondorengo paketeek ordezten dute:" #: cmdline/apt-get.cc:1109 #, c-format msgid "Package %s has no installation candidate" -msgstr "%s paketea ez da instalagarria" +msgstr "%s paketeak ez du instalatzeko hautagairik" #: cmdline/apt-get.cc:1129 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" -msgstr "Ez da posible %s berrinstalatzea, ezin da deskargatu.\n" +msgstr "%s berriro instalatzea ez da posible; ezin da deskargatu.\n" #: cmdline/apt-get.cc:1137 #, c-format msgid "%s is already the newest version.\n" -msgstr "%s dagoeneko bertsio berrienean dago.\n" +msgstr "%s bertsiorik berriena da jada.\n" #: cmdline/apt-get.cc:1164 #, c-format msgid "Release '%s' for '%s' was not found" -msgstr "'%s' Bertsioa ez da aurkitu '%s'-rentzat" +msgstr "'%2$s'(r)en '%1$s' banaketa ez da aurkitu" #: cmdline/apt-get.cc:1166 #, c-format msgid "Version '%s' for '%s' was not found" -msgstr "Ez da aurkitu '%s' bertsioa '%s'rentzat" +msgstr "'%2$s'(r)en '%1$s' bertsioa ez da aurkitu" #: cmdline/apt-get.cc:1172 #, c-format msgid "Selected version %s (%s) for %s\n" -msgstr "Aukeratutako %s bertsioa (%s) %srentzat\n" +msgstr "Hautatutako bertsioa: %s (%s) -- %s\n" #: cmdline/apt-get.cc:1282 msgid "The update command takes no arguments" -msgstr "update komandoak ez du argumenturik onartzen" +msgstr "Eguneratzeko komandoak ez du argumenturik hartzen" #: cmdline/apt-get.cc:1295 msgid "Unable to lock the list directory" -msgstr "Ezin da zerrenda karpeta blokeatu" +msgstr "Ezin da zerrenda-direktorioa blokeatu" #: cmdline/apt-get.cc:1353 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." msgstr "" -"Zenbait indize fitxategi deskargatzerakoan huts egin dute, horiek alde " -"batetara utziko dira edo beste zaharrago batzuek erabiliko dira." +"Indize-fitxategi batzuk ezin izan dira deskargatu; ez ikusi egin zaie, edo " +"zaharrak erabili dira haien ordez." #: cmdline/apt-get.cc:1372 msgid "Internal error, AllUpgrade broke stuff" @@ -967,19 +964,19 @@ msgstr "Ezin izan da %s paketea aurkitu" #: cmdline/apt-get.cc:1485 #, c-format msgid "Note, selecting %s for regex '%s'\n" -msgstr "Oharra: %s aukeratzen '%s' espresio erregularrantzat\n" +msgstr "Oharra: %s hautatzen '%s' adierazpen erregularrarentzat\n" #: cmdline/apt-get.cc:1515 msgid "You might want to run `apt-get -f install' to correct these:" -msgstr "Zuk `apt-get -f install' exekutatu beharko zenuke hau(ek) zuzentzeko:" +msgstr "Beharbada `apt-get -f install' exekutatu nahiko duzu hauek zuzentzeko:" #: cmdline/apt-get.cc:1518 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -"Betegabeko dependentziak. SAiatu 'apt-get -f install' komandoa pakete izen " -"gaber erabiltzen." +"Bete gabeko mendekotasunak. Probatu 'apt-get -f install' paketerik gabe (edo " +"zehaztu konponbide bat)." #: cmdline/apt-get.cc:1530 msgid "" @@ -988,10 +985,10 @@ msgid "" "distribution that some required packages have not yet been created\n" "or been moved out of Incoming." msgstr "" -"Zenbait pakete ezin dira instalatu. Hau zuk eskatutako egoera ezinezkoa\n" -"delako, oraindik sortu ez diren pakete batzuek behar dituen banaketa\n" -"ezegonkorra erabiltzen ari zarelako edo paketak baketatik kendu izan\n" -"direlako izan daiteke." +"Pakete batzuk ezin izan dira instalatu. Beharbada ezinezko egoera \n" +"bat eskatu duzu, edo, banaketa ezegonkorra erabiltzen ari bazara,\n" +"beharrezko pakete batzuk ez ziren sortuko oraindik, edo \n" +"Sarrerakoetan (Incoming) egoten jarraituko dute." #: cmdline/apt-get.cc:1538 msgid "" @@ -999,25 +996,24 @@ msgid "" "the package is simply not installable and a bug report against\n" "that package should be filed." msgstr "" -"Ekintza bat bakarrik egin duzunez, oso posiblea da paketea ezin " -"instalagarria \n" -"izatea eta arazo informe bat bidali beharkozenuke pàkete horren kontra" +"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:1543 msgid "The following information may help to resolve the situation:" -msgstr "Hurrengoargibide hauek arazoa konpontzen lagundu dezakete:" +msgstr "Informazio honek arazoa konpontzen lagun dezake:" #: cmdline/apt-get.cc:1546 msgid "Broken packages" -msgstr "Apurtutako paketeak" +msgstr "Hautsitako paketeak" #: cmdline/apt-get.cc:1572 msgid "The following extra packages will be installed:" -msgstr "Huirrengo pakete extra hauek instalatuko dira:" +msgstr "Ondorengo pakete gehigarriak instalatuko dira:" #: cmdline/apt-get.cc:1643 msgid "Suggested packages:" -msgstr "Iradokitutako paketeak:" +msgstr "Iradokitako paketeak:" #: cmdline/apt-get.cc:1644 msgid "Recommended packages:" @@ -1029,35 +1025,35 @@ msgstr "Berriketak kalkulatzen... " #: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99 msgid "Failed" -msgstr "Huts egin da" +msgstr "Huts egin du" #: cmdline/apt-get.cc:1672 msgid "Done" -msgstr " Egina" +msgstr "Eginda" #: cmdline/apt-get.cc:1845 msgid "Must specify at least one package to fetch source for" -msgstr "Iturburua eskuratzeko beintzat pakete bat ezarri behar duzu" +msgstr "Gutxienez pakete bat zehaztu behar duzu iturburua lortzeko" #: cmdline/apt-get.cc:1872 cmdline/apt-get.cc:2079 #, c-format msgid "Unable to find a source package for %s" -msgstr "Ezin da %s-ren iturburu paketea aurkitu" +msgstr "Ezin da iturburu-paketerik aurkitu %s(r)entzat" #: cmdline/apt-get.cc:1919 #, c-format msgid "You don't have enough free space in %s" -msgstr "Ez duzu behar aina leku %s-n" +msgstr "Ez daukazu nahikoa leku libre %s(e)n." #: cmdline/apt-get.cc:1924 #, c-format msgid "Need to get %sB/%sB of source archives.\n" -msgstr "%sB/%sB iturburu fitxategi eskuratu behar dira.\n" +msgstr "Iturburu-artxiboetako %sB/%sB eskuratu behar dira.\n" #: cmdline/apt-get.cc:1927 #, c-format msgid "Need to get %sB of source archives.\n" -msgstr "%sB iturburu fitxategi eskuratu behar dira.\n" +msgstr "Iturburu-artxiboetako %sB eskuratu behar dira.\n" #: cmdline/apt-get.cc:1933 #, c-format @@ -1066,49 +1062,50 @@ msgstr "Eskuratu %s iturubura\n" #: cmdline/apt-get.cc:1964 msgid "Failed to fetch some archives." -msgstr "Huts fitxategi batzu eskuratzerakoan." +msgstr "Huts egin du zenbat artxibo lortzean." #: cmdline/apt-get.cc:1992 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -"Alde batetara uzten dagoeneko %s-n despaketatutako iturburuen despaketatzea\n" +"%s(e)n dagoeneko deskonprimitutako iturburua deskonprimitzea saltatzen\n" #: cmdline/apt-get.cc:2004 #, c-format msgid "Unpack command '%s' failed.\n" -msgstr "Deskapketatze '%s' komandoak huts egin du.\n" +msgstr "Deskonprimitzeko '%s' komandoak huts egin du.\n" #: cmdline/apt-get.cc:2021 #, c-format msgid "Build command '%s' failed.\n" -msgstr "'%s' eraikitze komanduak huts egin du.\n" +msgstr "Eraikitzeko '%s' komandoak huts egin du.\n" #: cmdline/apt-get.cc:2040 msgid "Child process failed" -msgstr "Ume prozezuak huts egin du" +msgstr "Prozesu umeak huts egin du" #: cmdline/apt-get.cc:2056 msgid "Must specify at least one package to check builddeps for" msgstr "" -"Eraiketa dependentziak arakatzeko beintzat pakete bat ezarri behar duzu" +"Gutxienez pakete bat zehaztu behar duzu eraikitze-mendekotasunak egiaztatzeko" #: cmdline/apt-get.cc:2084 #, c-format msgid "Unable to get build-dependency information for %s" -msgstr "Ezin izan da %s eraiketa dependentzia argibiderik eskuratu" +msgstr "Ezin izan da %s(r)en eraikitze-mendekotasunen informazioa eskuratu" #: cmdline/apt-get.cc:2104 #, c-format msgid "%s has no build depends.\n" -msgstr "%s ez du eraiketa dependentziarik.\n" +msgstr "%s: ez du eraikitze-mendekotasunik.\n" #: cmdline/apt-get.cc:2156 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" -msgstr "%s dependentzia (%s-rena) ezub da bete %s paketea ezin bai da aurkitu" +msgstr "" +"%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu" #: cmdline/apt-get.cc:2208 #, c-format @@ -1116,29 +1113,29 @@ msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" -"%s dependentzia (%s-rena) ezin da bete, ez bait dago %s paketearen bertsio " -"beharrak beteko dituen paketerik" +"%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:2243 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -"Ezin izan da %s dependentzia bete %s-rentzat: %s instalatutako paketea " -"berriegia da" +"Huts egin du %2$s(r)en %1$s mendekotasuna betetzean: instalatutako %3$s " +"paketea berriegia da" #: cmdline/apt-get.cc:2268 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" -msgstr "Ezin da %s dependentzi bete %s-rentzat: %s" +msgstr "Huts egin du %2$s(r)en %1$s mendekotasuna betetzean: %3$s" #: cmdline/apt-get.cc:2282 #, c-format msgid "Build-dependencies for %s could not be satisfied." -msgstr "Ez da lortu %s rentzat dependentziak sortzea" +msgstr "%s(r)en eraikitze-mendekotasunak ezin izan dira bete." #: cmdline/apt-get.cc:2286 msgid "Failed to process build dependencies" -msgstr "Huts eraikitze dependentziak prozesatzerakoan" +msgstr "Huts egin du eraikitze-mendekotasunak prozesatzean" #: cmdline/apt-get.cc:2318 msgid "Supported modules:" @@ -1186,60 +1183,55 @@ msgid "" " This APT has Super Cow Powers.\n" msgstr "" "Erabilera: apt-get [aukerak] komandoa\n" -" apt-get [aukerak] install|remove 1pak [2pak ...]\n" -" apt-get [aukerak] source 1pak [2pak ...]\n" +" apt-get [aukerak] install|remove pkg1 [pkg2 ...]\n" +" apt-get [aukerak] source pkg1 [pkg2 ...]\n" "\n" -"apt-get paketeak deskargatu eta instalatzeko komando lerroko interfaze soil " -"bat da. Gehien erabiltzen diren komandoak update\n" -"eta install dira.\n" +"apt-get paketeak deskargatu eta instalatzeko komando-lerroko interfaze soil\n" +"bat da. Gehien erabiltzen diren komandoak eguneratzekoa eta instalatzekoa \n" +"dira: update eta install.\n" "\n" "Komandoak:\n" -" update - Pakete berrien zerrendak deskargatu\n" -" upgrade - Eguneraketa bat egin\n" -" install - Pakete berriak instalatzen ditu (paketea libc6 da eta ez libc6." -"deb)\n" -" remove - Paketak ezabatzeko\n" -" source - Iturburu fitxategiak deskargatzern ditu\n" -" build-dep - Iturburu paketeak eraikitzeko dependentziak konfiguratzen " -"ditu\n" -"fuente\n" -" dist-upgrade - Banaketa eguneratzen du. Begiratu apt-get(8)\n" -" dselect-upgrade - dselect-ek eginiko aukerak jarraitzen ditu\n" -" clean - Deskargaturiko fitxategiak ezabatzen ditu\n" -" autoclean - Deskargaturiko fitxategi zaharrak ezabatzen ditu\n" -" check - Betegabeko dependetziak ez egotea begiratzen du\n" +" update - Eskuratu pakete-zerrenda berriak\n" +" upgrade - Egin bertsio-berritzea\n" +" install - Instalatu pakete berriak (paketea libc6 da, eta ez libc6.deb)\n" +" remove - Kendu paketeak\n" +" source - Deskargatu iturburu-artxiboak\n" +" build-dep - Konfiguratu iturburu-paketeen eraikitze-dependentziak\n" +" dist-upgrade - Banaketaren bertsio-berritzea: ikus apt-get(8)\n" +" dselect-upgrade - Jarraitu dselect hautapenak\n" +" clean - Ezabatu deskargatutako artxibo-fitxategiak\n" +" autoclean - Ezabatu deskargatutako artxibo-fitxategi zaharrak\n" +" check - Egiaztatu ez dagoela hautsitako mendekotasunik\n" "\n" "Aukerak:\n" -" -h Laguntza testu hau.\n" -" -q Irteera erregistragarria - aurrerapen barra gabe\n" -" -qq Irteera gabe errorerik ez balego\n" -" -d Deskarga bakarrik - EZ ditu fitxategiak instalatu edo despaketatzen\n" -" -s Ez egin. Simulazio bat egiten du\n" -" -y Bai erantzuten du galdera guztietan\n" -" -f Nahiz integritate egiaztapenak huts egin aurrera jarraitzen saiatzen " -"du\n" -" -m Nahi fitxategiak ezin kokatu aurrera jarraitzen du\n" -" -u PAkete eguneratuen zerrenda ere erakusten du\n" -" -b Eskuratu ondoren iturburu paketea eraikitzen du\n" -" -V Bertsio zenbaki zehaztuak erakusten ditu\n" -" -c=? Konfigurazio fitxategi hau erabili\n" -" -o=? Konfigurazio aukera bat ezartzen du, adib. \n" -" -o dir::cache=/tmp\n" -"apt-get(8), sources.list(5) eta apt.conf(5) manual orrialdeak\n" -"begiratu argibide eta aukera gehiago ikusteko.\n" -" APT honek Super Behi Potereak ditu\n" +" -h Laguntza-testu hau.\n" +" -q Egunkarian erregistratzeko irteera - progresio-adierazlerik gabe\n" +" -qq Irteerarik ez, erroreentzat izan ezik\n" +" -d Deskargatu bakarrik - EZ instalatu edo deskonprimitu artxiboak\n" +" -s Ekintzarik ez. Simulazio bat egiten du\n" +" -y Galdera guztiei Bai erantzun, galdetu gabe\n" +" -f Saiatu jarraitzen, osotasun-egiaztapenak huts egiten badu\n" +" -m Saiatu jarraitzen, artxiboak ezin badira lokalizatu\n" +" -u Erakutsi bertsio-berritutako paketeen zerrenda ere\n" +" -b Sortu iturburu-paketea lortu ondoren\n" +" -V Erakutsi bertsio-zenbaki xeheak\n" +" -c=? Irakurri konfigurazio-fitxategi hau\n" +" -o=? Ezarri konfigurazio-aukera arbitrario bat. Adib.:-o dir::cache=/tmp\n" +"Informazio eta aukera gehiago nahi izanez gero, ikus apt-get(8), \n" +"sources.list(5) eta apt.conf(5) orrialdeak eskuliburuan.\n" +" APT honek Super Behiaren Ahalmenak ditu.\n" #: cmdline/acqprogress.cc:55 msgid "Hit " -msgstr "Joa " +msgstr "Atzituta " #: cmdline/acqprogress.cc:79 msgid "Get:" -msgstr "Jaso:" +msgstr "Hartu:" #: cmdline/acqprogress.cc:110 msgid "Ign " -msgstr "Utzi " +msgstr "Ez ikusi " #: cmdline/acqprogress.cc:114 msgid "Err " @@ -1248,7 +1240,7 @@ msgstr "Err " #: cmdline/acqprogress.cc:135 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "%sB eskuraturik %s-tan (%sB/s)\n" +msgstr "Lortuta: %sB (%s) (%sB/s)\n" #: cmdline/acqprogress.cc:225 #, c-format @@ -1268,7 +1260,7 @@ msgstr "" #: cmdline/apt-sortpkgs.cc:86 msgid "Unknown package record!" -msgstr "¡Pakete erregistro ezezaguna!" +msgstr "Pakete-erregistro ezezaguna!" #: cmdline/apt-sortpkgs.cc:150 msgid "" @@ -1283,46 +1275,44 @@ msgid "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Erabilera: apt-sortpkgs [aukerak] file1 [file2 ...]\n" +"Erabilera: apt-sortpkgs [aukerak] fitxategia1 [fitxategia2...]\n" "\n" -"apt-sortpkgs pakete fitxategiak sailkatzeko lanabes soil bat da.\n" -"-s aukera fitxategi mota adieraztekoerabiltzen da.\n" +"apt-sortpkgs pakete-fitxategiak ordenatzeko tresna soil bat da. Zein\n" +"motatako fitxategia den adierazteko -s aukera erabiltzen da.\n" "\n" "Aukerak:\n" -" -h Laguntza fitxategi hau.\n" -" -s Iturburu fitxategi sailkapena erabiltzen du\n" -" -c=? Konfigurazio fitxategihau erabili\n" -" -o=? Konfigurazio aukera bat ezartzen du. adib. -o dir::\n" -"cache=/tmp\n" +" -h Laguntza-testu hau\n" +" -s Erabili iturburu-fitxategien ordenatzea\n" +" -c=? Irakurri konfigurazio-fitxategi hau\n" +" -o=? Ezarri konfigurazio-aukera arbitrario bat. Adib: -o dir::cache=/tmp\n" #: dselect/install:32 msgid "Bad default setting!" -msgstr "Lehenetsitako ezarpena gaizki dago!" +msgstr "Okerreko ezarpen lehenetsia!" #: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 #: dselect/install:104 dselect/update:45 msgid "Press enter to continue." -msgstr "Sakatu enter aurrera jarraitzeko" +msgstr "Jarraitzeko, sakatu Sartu." #: dselect/install:100 msgid "Some errors occurred while unpacking. I'm going to configure the" -msgstr "Zenbait errore gertatu dira despaketatzean.Ni konfiguratzera noa" +msgstr "Errore batzuk gertatu dira deskonprimitzean. Konfiguratu egingo ditut" #: dselect/install:101 msgid "packages that were installed. This may result in duplicate errors" -msgstr "instalaturik dauden paketeak. Honek bikoizketa erroreak sor ditzake" +msgstr "instalatutako paketeak. Horrek errore bikoiztuak eragin ditzake" #: dselect/install:102 msgid "or errors caused by missing dependencies. This is OK, only the errors" -msgstr "" -"edo dependentzia faltagatik sortutako erroreak. Hau Ondo dago, bakarrik" +msgstr "edo falta diren mendekotasunen erroreak. Hori ondo dago; mezu honen" #: dselect/install:103 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" -"hemendik aurrerako mezuak dira garrantzitsuak. Mesedez zuzendu horiek eta [I]" -"nstall berrabiarazi" +"aurreko erroreak dira garrantzitsuak. Konpondu eta exekutatu [I]nstall " +"berriro" #: dselect/update:30 msgid "Merging available information" @@ -1330,15 +1320,15 @@ msgstr "Eskuragarrien datuak biltzen" #: apt-inst/contrib/extracttar.cc:117 msgid "Failed to create pipes" -msgstr "Huts egin da hodiak sortzen" +msgstr "Huts egin du kanalizazioak sortzean" #: apt-inst/contrib/extracttar.cc:143 msgid "Failed to exec gzip " -msgstr "Huts egin da gzip exekutatzean " +msgstr "Huts egin du gzip exekutatzean " #: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 msgid "Corrupted archive" -msgstr "Artxibo ustela" +msgstr "Hondatutako artxiboa" #: apt-inst/contrib/extracttar.cc:195 msgid "Tar checksum failed, archive corrupted" @@ -1347,39 +1337,39 @@ msgstr "Tar egiaztapenak huts egin, hondatutakofitxategia" #: apt-inst/contrib/extracttar.cc:298 #, c-format msgid "Unknown TAR header type %u, member %s" -msgstr "%u TAR buru mota ezezaguna, %s atala" +msgstr "%u TAR goiburu-mota ezezaguna, %s kidea" #: apt-inst/contrib/arfile.cc:73 msgid "Invalid archive signature" -msgstr "Fitxategi sinadura baliogabea" +msgstr "Artxibo-sinadura baliogabea" #: apt-inst/contrib/arfile.cc:81 msgid "Error reading archive member header" -msgstr "Errorea fitxategi kidearen goiburua irakurtzean" +msgstr "Errorea artxiboko kidearen goiburua irakurtzean" #: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 msgid "Invalid archive member header" -msgstr "Baliogabeko fitxategi atal burua" +msgstr "Artxiboko kidearen goiburua baliogabea da" #: apt-inst/contrib/arfile.cc:131 msgid "Archive is too short" -msgstr "Artxiboa txikiegia da" +msgstr "Artxiboa laburregia da" #: apt-inst/contrib/arfile.cc:135 msgid "Failed to read the archive headers" -msgstr "Huts fitxategi buruak irakurtzerakoan" +msgstr "Huts egin artxibo-goiburuak irakurtzean" #: apt-inst/filelist.cc:384 msgid "DropNode called on still linked node" -msgstr "DropNode orain ez estekatutako modu batetan deitua" +msgstr "DropNode-ri dei egin zaio oraindik estekatutako nodoan" #: apt-inst/filelist.cc:416 msgid "Failed to locate the hash element!" -msgstr "Hust hash elementu kokatzerakoan!" +msgstr "Huts egin du hash-elementua lokalizatzean!" #: apt-inst/filelist.cc:463 msgid "Failed to allocate diversion" -msgstr "Ez izan da desbideratze bat ezarri" +msgstr "Huts egin du desbideratzea lokalizatzean" #: apt-inst/filelist.cc:468 msgid "Internal error in AddDiversion" @@ -1388,74 +1378,74 @@ msgstr "AddDiversion-n barne errorea" #: apt-inst/filelist.cc:481 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" -msgstr "Desbideratzea berridazten saiatzen, %s -> %s eta %s/%s" +msgstr "Desbideratze bat gainidazten saiatzen: %s -> %s eta %s/%s" #: apt-inst/filelist.cc:510 #, c-format msgid "Double add of diversion %s -> %s" -msgstr "Desbideraketa bikoitz gehiketa %s -> %s" +msgstr "Desbideratzearen gehitze bikoitza: %s -> %s" #: apt-inst/filelist.cc:553 #, c-format msgid "Duplicate conf file %s/%s" -msgstr "Bikoiztutako configurazio fitxategia %s/%s" +msgstr "Konfigurazio-fitxategi bikoiztua: %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 #, c-format msgid "Failed write file %s" -msgstr "Huts egin da %s fitxategia idazten" +msgstr "Ezin izan da %s fitxategian idatzi" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 #, c-format msgid "Failed to close file %s" -msgstr "Huts egin da %s fitxategia itxitzen" +msgstr "Ezin izan da %s fitxategia itxi" #: apt-inst/extract.cc:96 apt-inst/extract.cc:167 #, c-format msgid "The path %s is too long" -msgstr "%s bidea luzeegia da." +msgstr "%s bide-izena luzeegia da" #: apt-inst/extract.cc:127 #, c-format msgid "Unpacking %s more than once" -msgstr "%s bein baino gehiagotan despaketatzen" +msgstr "%s behin baino gehiagotan deskonprimitzen" #: apt-inst/extract.cc:137 #, c-format msgid "The directory %s is diverted" -msgstr "%s karpeta desbideratua dago" +msgstr "%s direktorioa desbideratuta dago" #: apt-inst/extract.cc:147 #, c-format msgid "The package is trying to write to the diversion target %s/%s" -msgstr "Paketea %s/%s desbideratutako jomuga idazten saiatzen ari da" +msgstr "Paketea desbideratze-helburuan %s/%s idazten saiatzen ari da" #: apt-inst/extract.cc:157 apt-inst/extract.cc:300 msgid "The diversion path is too long" -msgstr "Debideraketa bidea luzeegia da" +msgstr "Desbideratzearen bide-izena luzeegia da" #: apt-inst/extract.cc:243 #, c-format msgid "The directory %s is being replaced by a non-directory" -msgstr "%s kapeta ez-karpeta bategatik aldatua izaten ari da" +msgstr "%s direktorioa ez-direktorio batekin ordezten ari da" #: apt-inst/extract.cc:283 msgid "Failed to locate node in its hash bucket" -msgstr "Ezin izan da nodoa bere lotura potean kokatu" +msgstr "Huts egin du nodoa bere hash-ontzian lokalizatzean" #: apt-inst/extract.cc:287 msgid "The path is too long" -msgstr "Bidea luzeegia da" +msgstr "Bide-izena luzeegia da" #: apt-inst/extract.cc:417 #, c-format msgid "Overwrite package match with no version for %s" -msgstr "Sobreescribiendo concordancia del paquete sin versión para %s" +msgstr "Gainidatzi pakete-konkordantzia %s(r)en bertsiorik gabe" #: apt-inst/extract.cc:434 #, c-format msgid "File %s/%s overwrites the one in the package %s" -msgstr "%s/%s fitxategiak paketeko %s fitxategia gainidazten du" +msgstr "%s/%s fitxategiak %s paketekoa gainidazten du" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709 #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38 @@ -1466,12 +1456,12 @@ msgstr "Ezin da %s irakurri" #: apt-inst/extract.cc:494 #, c-format msgid "Unable to stat %s" -msgstr "Ezin da %s irakurri" +msgstr "Ezin da daturik lortu %s(e)tik" #: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 #, c-format msgid "Failed to remove %s" -msgstr "Huts %s ezabatzerakoan" +msgstr "Huts egin du %s kentzean" #: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 #, c-format @@ -1481,11 +1471,11 @@ msgstr "Ezin da %s sortu" #: apt-inst/deb/dpkgdb.cc:118 #, c-format msgid "Failed to stat %sinfo" -msgstr "Huts egin da %sinfo identifikatzen" +msgstr "Huts egin du %sinfo-tik datuak lortzean" #: apt-inst/deb/dpkgdb.cc:123 msgid "The info and temp directories need to be on the same filesystem" -msgstr "info eta temp karpetak fitxategi sistema berdinean egon behar dira" +msgstr "info eta temp direktorioek fitxategi-sistema berean egon behar dute" #. Build the status cache #: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 @@ -1497,7 +1487,7 @@ msgstr "Pakete Zerrenda irakurtzen" #: apt-inst/deb/dpkgdb.cc:180 #, c-format msgid "Failed to change to the admin dir %sinfo" -msgstr "Huts %sinfo kudeaketa karpeta aldatzerakoan" +msgstr "Huts egin du %sinfo administrazio-direktoriora aldatzean" #: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 #: apt-inst/deb/dpkgdb.cc:448 @@ -1515,13 +1505,14 @@ msgid "" "then make it empty and immediately re-install the same version of the " "package!" msgstr "" -"Ezin da '%sinfo/%s' zerrenda fitxategia ireki. Ezin baduzu fitxategi hau " -"berezarri huts bat sor ezazu eta paketearen bertsio berdina instala ezazu!" +"Huts egin du '%sinfo/%s' zerrenda-fitxategia irekitzean. Fitxategi hori ezin " +"baduzu leheneratu, hustu ezazu, eta berrinstalatu berehala paketearen " +"bertsio bera!" #: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 #, c-format msgid "Failed reading the list file %sinfo/%s" -msgstr "Huts egin da %sinfo/%s fitxategi zerrenda irakurtzen" +msgstr "Huts egin du %sinfo/%s zerrenda-fitxategia irakurtzean" #: apt-inst/deb/dpkgdb.cc:266 msgid "Internal error getting a node" @@ -1530,25 +1521,25 @@ msgstr "Barne errorea nodo bat eskuratzerakoan" #: apt-inst/deb/dpkgdb.cc:309 #, c-format msgid "Failed to open the diversions file %sdiversions" -msgstr "Huts %sdiversions desbideratze fitxategia irekitzerakoan" +msgstr "Huts egin du desbideratzeen %sdiversions fitxategia irekitzean" #: apt-inst/deb/dpkgdb.cc:324 msgid "The diversion file is corrupted" -msgstr "Desbideratze fitxategia hondaturik dago" +msgstr "Desbideratze-fitxategia hondatuta dago" #: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 #: apt-inst/deb/dpkgdb.cc:341 #, c-format msgid "Invalid line in the diversion file: %s" -msgstr "Lerro baliogabea desbideratze fitxategian: %s" +msgstr "Lerro baliogabea desbideratze-fitxategian: %s" #: apt-inst/deb/dpkgdb.cc:362 msgid "Internal error adding a diversion" msgstr "Barne errorea desbideratze bat gehitzean" #: apt-inst/deb/dpkgdb.cc:383 -msgid "The pkg cache must be initialize first" -msgstr "pkg katxea abiarazi egin behar da lehenik" +msgid "The pkg cache must be initialized first" +msgstr "Paketearen cachea hasieratu behar da lehendabizi" #: apt-inst/deb/dpkgdb.cc:386 msgid "Reading file list" @@ -1562,17 +1553,17 @@ msgstr "Ezin izan da pakete bat aurkitu: Burua, mugitu %lu" #: apt-inst/deb/dpkgdb.cc:465 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" -msgstr "Egoera fitxategian ConfFile-a sekzioa gaizki dago. Offset %lu" +msgstr "Okerreko ConfFile sekzioa egoera-fitxategian. Desplazamendua %lu" #: apt-inst/deb/dpkgdb.cc:470 #, c-format msgid "Error parsing MD5. Offset %lu" -msgstr "Errorea MD5 parseatzean. Offset %lu" +msgstr "Errorea MD5 analizatzean. Desplazamendua %lu" #: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" -msgstr "Hau ez da balioz DEB fitxategi bat, %s atala falta du" +msgstr "Ez da baliozko DEB artxiboa; '%s' kidea falta da" #: apt-inst/deb/debfile.cc:52 #, c-format @@ -1583,7 +1574,7 @@ msgstr "" #: apt-inst/deb/debfile.cc:112 #, c-format msgid "Couldn't change to %s" -msgstr "Ezin aldatu %sra" +msgstr "Ezin izan da %s(e)ra aldatu" #: apt-inst/deb/debfile.cc:138 msgid "Internal error, could not locate member" @@ -1591,7 +1582,7 @@ msgstr "Barne Errorea, ezin da atala kokatu" #: apt-inst/deb/debfile.cc:171 msgid "Failed to locate a valid control file" -msgstr "Huts baliozko kontrol fitxategi bat kokatzerakoan" +msgstr "Ezin izan da baliozko kontrol-fitxategi bat lokalizatu" #: apt-inst/deb/debfile.cc:256 msgid "Unparsable control file" @@ -1600,7 +1591,7 @@ msgstr "Kontrol fitxategi ezin analizagarria" #: methods/cdrom.cc:113 #, c-format msgid "Unable to read the cdrom database %s" -msgstr "Ezin cdrom-eko %s databasea irakurri" +msgstr "Ezin da cdrom-eko %s datu-basea irakurri" #: methods/cdrom.cc:122 msgid "" @@ -1617,7 +1608,7 @@ msgstr "CD okerra" #: methods/cdrom.cc:163 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." -msgstr "Ezin da %s-ko CDROM-a desmuntatu, erabiltzen egon liteke." +msgstr "Ezin izan da CDROMa %s(e)n muntatu; beharbada erabiltzen ariko da." #: methods/cdrom.cc:177 methods/file.cc:77 methods/rsh.cc:264 msgid "File not found" @@ -1625,28 +1616,28 @@ msgstr "Ez da fitxategia aurkitu" #: methods/copy.cc:42 methods/gzip.cc:133 methods/gzip.cc:142 msgid "Failed to stat" -msgstr "Huts egin da identifikatzen" +msgstr "Huts egin du atzitzean" #: methods/copy.cc:79 methods/gzip.cc:139 msgid "Failed to set modification time" -msgstr "Aldaketa data ezartzerakoan huts egin du" +msgstr "Huts egin du aldaketa-ordua ezartzean" #: methods/file.cc:42 msgid "Invalid URI, local URIS must not start with //" -msgstr "URI baliogabea, URI lokalak ezin dira \"//\"-z hasi" +msgstr "URI baliogabea. URI lokalek ezin dute // eduki hasieran" #. Login must be before getpeername otherwise dante won't work. #: methods/ftp.cc:162 msgid "Logging in" -msgstr "Saioa hazten" +msgstr "Sartzen" #: methods/ftp.cc:168 msgid "Unable to determine the peer name" -msgstr "Ezin da bikote izena atzeman" +msgstr "Ezin izan da peer edo parekoaren izena zehaztu" #: methods/ftp.cc:173 msgid "Unable to determine the local name" -msgstr "Ezin da izen lokala erabaki" +msgstr "Ezin izan da izen lokala zehaztu" #: methods/ftp.cc:204 methods/ftp.cc:232 #, c-format @@ -1656,34 +1647,36 @@ msgstr "Zerbitzariak gure konexioa ukatu eta hau esan du: %s" #: methods/ftp.cc:210 #, c-format msgid "USER failed, server said: %s" -msgstr "ERABILTZAILEAK huts egin du, zerbitzariak hau dio: %s" +msgstr "USERek huts egin du, eta zerbitzariak hau esan du: %s" #: methods/ftp.cc:217 #, c-format msgid "PASS failed, server said: %s" -msgstr "PASAHITZAK huts egin du, zerbitzariak hau dio: %s" +msgstr "PASSek huts egin du, eta zerbitzariak hau esan du: %s" #: methods/ftp.cc:237 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." msgstr "" -"Proxy zerbitzari bat espezifikatu da baina login script-ik gabe, Acquire::" -"ftp::ProxyLogin hutsik dago." +"Proxy zerbitzari bat zehaztu da, baina sarrerako script-ik ez. Acquire::ftp::" +"ProxyLogin hutsik dago." #: methods/ftp.cc:265 #, c-format msgid "Login script command '%s' failed, server said: %s" -msgstr "Saio hasiera '%s' skrptak huts egin du, zerbitzaria hau dio: %s" +msgstr "" +"Sarrerako script-eko '%s' komandoak huts egin du, eta zerbitzariak hau esan " +"du: %s" #: methods/ftp.cc:291 #, c-format msgid "TYPE failed, server said: %s" -msgstr "MOTA akatsa, zerbitzariaren oharra: %s" +msgstr "TYPEk huts egin du, eta zerbitzariak hau esan du: %s" #: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226 msgid "Connection timeout" -msgstr "Konexioa denboraz kanpo" +msgstr "Konexioaren denbora-muga" #: methods/ftp.cc:335 msgid "Server closed the connection" @@ -1691,47 +1684,48 @@ msgstr "Zerbitzariak konexioa itxi du" #: methods/ftp.cc:338 methods/rsh.cc:190 apt-pkg/contrib/fileutl.cc:453 msgid "Read error" -msgstr "Irakurketa errorea" +msgstr "Irakurketa-errorea" #: methods/ftp.cc:345 methods/rsh.cc:197 msgid "A response overflowed the buffer." -msgstr "Erantzun batek bufferra gaineztatu du." +msgstr "Erantzun batek bufferrari gainez eragin dio." #: methods/ftp.cc:362 methods/ftp.cc:374 msgid "Protocol corruption" -msgstr "Protokolo hondatzea" +msgstr "Protokolo-hondatzea" #: methods/ftp.cc:446 methods/rsh.cc:232 apt-pkg/contrib/fileutl.cc:492 msgid "Write error" -msgstr "Idazketa errorea" +msgstr "Idazketa-errorea" #: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729 msgid "Could not create a socket" -msgstr "Ezin sortu socket bat" +msgstr "Ezin izan da socket-a sortu" #: methods/ftp.cc:698 msgid "Could not connect data socket, connection timed out" -msgstr "Ezin konektatu datu socketera, konexioa denboraz kanpo" +msgstr "" +"Ezin izan da datu-socketa konektatu; konexioak denbora-muga gainditu du" #: methods/ftp.cc:704 msgid "Could not connect passive socket." -msgstr "Ezin konektatu socket pasibora." +msgstr "Ezin izan da socket pasibora konektatu." #: methods/ftp.cc:722 msgid "getaddrinfo was unable to get a listening socket" -msgstr "getaddrinfo-k ezin du socket entzule bat lortu" +msgstr "getaddrinfo-k ezin izan du socket entzule bat eskuratu" #: methods/ftp.cc:736 msgid "Could not bind a socket" -msgstr "Ezin lotu socket batera" +msgstr "Ezin izan da socket bat lotu" #: methods/ftp.cc:740 msgid "Could not listen on the socket" -msgstr "Ezin entzun socketean" +msgstr "Ezin izan da socket-ean entzun" #: methods/ftp.cc:747 msgid "Could not determine the socket's name" -msgstr "Ezin determinatu socketaren izena" +msgstr "Ezin izan da socket-aren izena zehaztu" #: methods/ftp.cc:779 msgid "Unable to send PORT command" @@ -1740,16 +1734,16 @@ msgstr "Ezin da PORT komandoa bidali" #: methods/ftp.cc:789 #, c-format msgid "Unknown address family %u (AF_*)" -msgstr "Helbide famili ezezaguna %u (AF_*)" +msgstr "Helbide-familia baliogabea: %u (AF_*)" #: methods/ftp.cc:798 #, c-format msgid "EPRT failed, server said: %s" -msgstr "EPRT-k huts egin du, zerbitzariak hau esan du: %s" +msgstr "EPRTek huts egin du, eta zerbitzariak hau esan du: %s" #: methods/ftp.cc:818 msgid "Data socket connect timed out" -msgstr "Datu socket konexioa denboraz kanpo" +msgstr "Datu-socket konexioak denbora-muga gainditu du" #: methods/ftp.cc:825 msgid "Unable to accept connection" @@ -1757,26 +1751,26 @@ msgstr "Ezin da konexioa onartu" #: methods/ftp.cc:864 methods/http.cc:916 methods/rsh.cc:303 msgid "Problem hashing file" -msgstr "Arazoak fitxategia osatzerakoan" +msgstr "Arazoa fitxategiaren hash egitean" #: methods/ftp.cc:877 #, c-format msgid "Unable to fetch file, server said '%s'" -msgstr "Ezin da fitxategia eskuratu, Zerbitzariak hau dio: '%s'" +msgstr "Ezin da fitxategia lortu; zerbitzariak hau esan du: '%s'" #: methods/ftp.cc:892 methods/rsh.cc:322 msgid "Data socket timed out" -msgstr "Datu socketa denboraz kanpo" +msgstr "Datu-socketak denbora-muga gainditu du" #: methods/ftp.cc:922 #, c-format msgid "Data transfer failed, server said '%s'" -msgstr "Datu transferentziak huts egin du, zerbitzariak hau dio '%s'" +msgstr "Datu-transferentziak huts egin du, eta zerbitzariak hau esan du: '%s'" #. Get the files information #: methods/ftp.cc:997 msgid "Query" -msgstr "Kontsultatu" +msgstr "Kontsulta" #: methods/ftp.cc:1106 msgid "Unable to invoke " @@ -1785,7 +1779,7 @@ msgstr "Ezin da deitu " #: methods/connect.cc:64 #, c-format msgid "Connecting to %s (%s)" -msgstr "%sra konektatzen (%s)" +msgstr "Konektatzen -> %s.(%s)" #: methods/connect.cc:71 #, c-format @@ -1795,72 +1789,73 @@ 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 "Ezin sortu socket bat %srentzat (f=%u t=%u p=%u)" +msgstr "Ezin izan da socket-ik sortu honentzat: %s (f=%u t=%u p=%u)" #: methods/connect.cc:86 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." -msgstr "Ezin hasi konexioa %sra: %s (%s)." +msgstr "Ezin izan da konexioa hasi -> %s:%s (%s)." #: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" -msgstr "Ezin konektatu %sra:%s (%s), konexioa denboraz kanpo." +msgstr "" +"Ezin izan da konektatu -> %s:%s (%s). Konexioak denbora-muga gainditu du" #: methods/connect.cc:104 #, c-format msgid "Could not connect to %s:%s (%s)." -msgstr "Ezin konektatu %sra:%s (%s)." +msgstr "Ezin izan da konektatu -> %s:%s (%s)" #. We say this mainly because the pause here is for the #. ssh connection that is still going #: methods/connect.cc:132 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" -msgstr "%sra konektatzen" +msgstr "Konektatzen -> %s..." #: methods/connect.cc:163 #, c-format msgid "Could not resolve '%s'" -msgstr "Ezin ebatzi '%s'" +msgstr "Ezin izan da '%s' ebatzi" #: methods/connect.cc:167 #, c-format msgid "Temporary failure resolving '%s'" -msgstr "Aldiroko errorea '%s' ebazterakoan" +msgstr "Aldi baterako akatsa '%s' ebaztean" #: methods/connect.cc:169 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" -msgstr "Zerbait arraroa gertatu da '%s:%s' ebazterakoan (%i)" +msgstr "Zerbait arraroa pasatu da '%s:%s' (%i) ebaztean" #: methods/connect.cc:216 #, c-format msgid "Unable to connect to %s %s:" -msgstr "Ezin da %s %s-ra konektatu:" +msgstr "Ezin da konektatu -> %s %s:" #: methods/gzip.cc:57 #, c-format msgid "Couldn't open pipe for %s" -msgstr "Ezin izan da ireki %srentzat hodia" +msgstr "Ezin izan da %s(r)en kanalizazioa ireki" #: methods/gzip.cc:102 #, c-format msgid "Read error from %s process" -msgstr "Irakurketa errorea %s prozesutik" +msgstr "Irakurri errorea %s prozesutik" #: methods/http.cc:344 msgid "Waiting for headers" -msgstr "Goiburuei itxaroten" +msgstr "Goiburuen zain" #: methods/http.cc:490 #, c-format msgid "Got a single header line over %u chars" -msgstr "Buru lerro bat bakarrik eskuratu du %u karaketetik gora" +msgstr "Goiburu-lerro bakarra eskuratu da %u karaktereen gainean" #: methods/http.cc:498 msgid "Bad header line" -msgstr "Goiburu lerroa gaizki dago" +msgstr "Okerreko goiburu-lerroa" #: methods/http.cc:517 methods/http.cc:524 msgid "The HTTP server sent an invalid reply header" @@ -1880,27 +1875,27 @@ msgstr "http zerbitzariak barruti onarpena apurturik du" #: methods/http.cc:594 msgid "Unknown date format" -msgstr "Data formatu ezezaguna" +msgstr "Datu-formatu ezezaguna" #: methods/http.cc:737 msgid "Select failed" -msgstr "Aukeraketak huts egin du" +msgstr "Hautapenak huts egin du" #: methods/http.cc:742 msgid "Connection timed out" -msgstr "Konexioa denboraz kanpo geratu da" +msgstr "Konexioaren denbora-muga gainditu da" #: methods/http.cc:765 msgid "Error writing to output file" -msgstr "Errorea irteera fitxategian idazten" +msgstr "Errorea irteerako fitxategian idaztean" #: methods/http.cc:793 msgid "Error writing to file" -msgstr "Errorea fitxategian idazten" +msgstr "Errorea fitxategian idaztean" #: methods/http.cc:818 msgid "Error writing to the file" -msgstr "Errorea fitxategira idazterakoan" +msgstr "Errorea fitxategian idaztean" #: methods/http.cc:832 msgid "Error reading from server. Remote end closed connection" @@ -1908,7 +1903,7 @@ msgstr "Errorea zerbitzaritik irakurtzen Urrunetik amaitutako konexio itxiera" #: methods/http.cc:834 msgid "Error reading from server" -msgstr "Errorea zerbitzaritik irakurtzen" +msgstr "Errorea zerbitzaritik irakurtzean" #: methods/http.cc:1065 msgid "Bad header data" @@ -1920,45 +1915,45 @@ msgstr "Konexioak huts egin du" #: methods/http.cc:1173 msgid "Internal error" -msgstr "Barne errorea" +msgstr "Barne-errorea" #: methods/rsh.cc:330 msgid "Connection closed prematurely" -msgstr "Konexioa behar baina lehenago itxi da" +msgstr "Konexioa behar baino lehenago itxi da" #: apt-pkg/contrib/mmap.cc:82 msgid "Can't mmap an empty file" -msgstr "Ezin da mmap-eatu fitxategi huts bat" +msgstr "Ezin da fitxategi huts baten mmap egin" #: apt-pkg/contrib/mmap.cc:87 #, c-format msgid "Couldn't make mmap of %lu bytes" -msgstr "Ezin izan da %lu byten mmap-a egin" +msgstr "Ezin izan da %lu byteren mmap egin" #: apt-pkg/contrib/strutl.cc:941 #, c-format msgid "Selection %s not found" -msgstr "%s aukeraketa ez da aurkitu" +msgstr "%s hautapena ez da aurkitu" #: apt-pkg/contrib/configuration.cc:395 #, c-format msgid "Unrecognized type abbreviation: '%c'" -msgstr "Labupen mota ezezaguna: '%c'" +msgstr "Mota ezezaguneko laburtzapena: '%c'" #: apt-pkg/contrib/configuration.cc:453 #, c-format msgid "Opening configuration file %s" -msgstr "%s konfigurazio fitxategia irekitzen" +msgstr "%s konfigurazio-fitxategia irekitzen" #: apt-pkg/contrib/configuration.cc:471 #, c-format msgid "Line %d too long (max %d)" -msgstr "%d lerro luzeegia (geh. %d)" +msgstr "%d lerroa luzeegia da (gehienez %d)" #: apt-pkg/contrib/configuration.cc:567 #, c-format msgid "Syntax error %s:%u: Block starts with no name." -msgstr "Sintasi errorea %s:%u: Blokea izen gabe hasten da." +msgstr "Sintaxi-errorea, %s:%u: Blokearen hasieran ez dago izenik." #: apt-pkg/contrib/configuration.cc:586 #, c-format @@ -1968,32 +1963,32 @@ msgstr "Sintasi errorea %s:%u: Gaizki eratutako" #: apt-pkg/contrib/configuration.cc:603 #, c-format msgid "Syntax error %s:%u: Extra junk after value" -msgstr "Sintasi errorea %s:%u: Soberako zaborra balioaren atzetik" +msgstr "Sintaxi-errorea, %s:%u: Zabor gehigarria balioaren ondoren" #: apt-pkg/contrib/configuration.cc:643 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" -msgstr "Sintasi errorea %s:%u: Direktiban maila altuenean ipini daitezke" +msgstr "Sintaxi-errorea, %s:%u: Direktibak goi-mailan bakarrik egin daitezke" #: apt-pkg/contrib/configuration.cc:650 #, c-format msgid "Syntax error %s:%u: Too many nested includes" -msgstr "Sintasi errorea %s:%u: " +msgstr "Sintaxi-errorea, %s:%u: habiaratutako elementu gehiegi" #: apt-pkg/contrib/configuration.cc:654 apt-pkg/contrib/configuration.cc:659 #, c-format msgid "Syntax error %s:%u: Included from here" -msgstr "Sintasi errorea %s:%u: Hemendik gehiturik" +msgstr "Sintaxi-errorea, %s:%u: hemendik barne hartuta" #: apt-pkg/contrib/configuration.cc:663 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" -msgstr "Sintasi errorea %s:%u: '%s' direktiba ez da onartzen" +msgstr "Sintaxi-errorea, %s:%u: onartu gabeko '%s' direktiba" #: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" -msgstr "Sintasi errorea %s:%u: Gehiegizko zaboora fitxategi amaieran" +msgstr "Sintaxi-errorea, %s:%u: Zabor gehigarria fitxategi-amaieran" #: apt-pkg/contrib/progress.cc:154 #, c-format @@ -2008,18 +2003,18 @@ msgstr "%c%s... Eginda" #: apt-pkg/contrib/cmndline.cc:80 #, c-format msgid "Command line option '%c' [from %s] is not known." -msgstr "'%c' komando-lerro aukera [%s-tik] ez da ezagutzen." +msgstr "Ez da ezagutzen komando-lerroko '%c' aukera [%s]." #: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 #: apt-pkg/contrib/cmndline.cc:122 #, c-format msgid "Command line option %s is not understood" -msgstr "'%s' komando-lerro aukera ez da ulertzen" +msgstr "Ez da ulertzen komando-lerroko %s aukera" #: apt-pkg/contrib/cmndline.cc:127 #, c-format msgid "Command line option %s is not boolean" -msgstr "'%s' komando-lerro aukera ez da booleanoa" +msgstr "Komando-lerroko %s aukera ez da boolearra." #: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 #, c-format @@ -2030,12 +2025,12 @@ msgstr "%s aukerak argumentu bat behar du." #, c-format msgid "Option %s: Configuration item specification must have an =<val>." msgstr "" -"%s aukera: Konfigurazio elementu baten ezarpena =<val> bat eduki behar du." +"%s aukera: konfigurazio-elementuaren zehaztapenak =<val> eduki behar du." #: apt-pkg/contrib/cmndline.cc:237 #, c-format msgid "Option %s requires an integer argument, not '%s'" -msgstr "%s aukerak argumentu oso bat behar du, ez '%s'" +msgstr "%s aukerak osoko argumentu bat behar du, eta ez '%s'" #: apt-pkg/contrib/cmndline.cc:268 #, c-format @@ -2045,48 +2040,49 @@ msgstr "'%s' aukera luzeegia da" #: apt-pkg/contrib/cmndline.cc:301 #, c-format msgid "Sense %s is not understood, try true or false." -msgstr "%s zentzua ez da ulertzen, saiatu egia edo faltsuarekin." +msgstr "%s zentzua ez da ulertzen; probatu egiazkoa edo faltsua." #: apt-pkg/contrib/cmndline.cc:351 #, c-format msgid "Invalid operation %s" -msgstr "Baliogabeko ekintza %s" +msgstr "Eragiketa baliogabea: %s" #: apt-pkg/contrib/cdromutl.cc:55 #, c-format msgid "Unable to stat the mount point %s" -msgstr "Ezin izan %s muntatze puntuaz argibiderik eskuratu" +msgstr "Ezin da atzitu %s muntatze-puntua" #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:422 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" -msgstr "Ezin da %s-ra aldatu" +msgstr "Ezin da %s(e)ra aldatu" #: apt-pkg/contrib/cdromutl.cc:190 msgid "Failed to stat the cdrom" -msgstr "Huts egin da cdrom-a identifikatzen" +msgstr "Huts egin du CDROMa atzitzean" #: apt-pkg/contrib/fileutl.cc:80 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" -"Ez da blokeorik erabiliko irakuketarako bakarrik dagoen %s blokeo " -"fitxategirako" +"Ez da blokeorik erabiltzen ari irakurtzeko soilik den %s blokeo-" +"fitxategiarentzat" #: apt-pkg/contrib/fileutl.cc:85 #, c-format msgid "Could not open lock file %s" -msgstr "Ezin da %s sarrail fitxategia ireki" +msgstr "Ezin izan da %s blokeo-fitxategia ireki" #: apt-pkg/contrib/fileutl.cc:103 #, c-format msgid "Not using locking for nfs mounted lock file %s" -msgstr "Ez da blokeorik erabiltzen nfs muntatze %s blokeo fitxategiarentzat" +msgstr "" +"Ez da blokeorik erabiltzen ari nfs %s muntatutako blokeo-fitxategiarentzat" #: apt-pkg/contrib/fileutl.cc:107 #, c-format msgid "Could not get lock %s" -msgstr "Ezin lortu %s" +msgstr "Ezin izan da %s blokeoa hartu" #: apt-pkg/contrib/fileutl.cc:359 #, c-format @@ -2096,56 +2092,56 @@ msgstr "%s espero zen baina ez zegoen han" #: apt-pkg/contrib/fileutl.cc:369 #, c-format msgid "Sub-process %s received a segmentation fault." -msgstr "%s azpiprozesuak segementazio huts bat jaso du." +msgstr "%s azpiprozesuak segmentazio-hutsegitea jaso du." #: apt-pkg/contrib/fileutl.cc:372 #, c-format msgid "Sub-process %s returned an error code (%u)" -msgstr "%s azpiprozesuak errore kode bat eman du (%u)" +msgstr "%s azpiprozesuak errore-kode bat itzuli du (%u)" #: apt-pkg/contrib/fileutl.cc:374 #, c-format msgid "Sub-process %s exited unexpectedly" -msgstr "%s azpiprozesua espero ez zen modu batetan itxi da" +msgstr "%s azpiprozesua ustekabean amaitu da" #: apt-pkg/contrib/fileutl.cc:418 #, c-format msgid "Could not open file %s" -msgstr "Ezin ireki %s fitxategia" +msgstr "%s fitxategia ezin izan da ireki" #: apt-pkg/contrib/fileutl.cc:474 #, c-format msgid "read, still have %lu to read but none left" -msgstr "irakurri, %lu geratzen dira irakurtzeko baina ez dago ezer" +msgstr "irakurrita; oraindik %lu irakurtzeke, baina ez da ezer geratzen" #: apt-pkg/contrib/fileutl.cc:504 #, c-format msgid "write, still have %lu to write but couldn't" -msgstr "idatzirik, oraindik %lu idatzi behar dira baina ezi da egin" +msgstr "idatzita; oraindik %lu idazteke, baina ezin da" #: apt-pkg/contrib/fileutl.cc:579 msgid "Problem closing the file" -msgstr "Arazoa fitxategia itxitzerakoan" +msgstr "Arazoa fitxategia ixtean" #: apt-pkg/contrib/fileutl.cc:585 msgid "Problem unlinking the file" -msgstr "Arazoa fitxategi esteka ezabatzerakoan" +msgstr "Arazoa fitxategia desestekatzean" #: apt-pkg/contrib/fileutl.cc:596 msgid "Problem syncing the file" -msgstr "Arazoa fitxategia sinkronizatzerakoan" +msgstr "Arazoa fitxategia sinkronizatzean" #: apt-pkg/pkgcache.cc:126 msgid "Empty package cache" -msgstr "Pakete katxe hutsa" +msgstr "Paketeen cachea hutsik" #: apt-pkg/pkgcache.cc:132 msgid "The package cache file is corrupted" -msgstr "Paketearen katxe fitxategia hondaturik dago" +msgstr "Paketeen cache-fitxategia hondatuta dago" #: apt-pkg/pkgcache.cc:137 msgid "The package cache file is an incompatible version" -msgstr "Paketearen katxe fitxategia bertsioa bateraezin batena da" +msgstr "Paketeen cache-fitxategiaren bertsioa ez da bateragarria" #: apt-pkg/pkgcache.cc:142 #, c-format @@ -2154,35 +2150,35 @@ msgstr "APT honek ez du '%s' bertsio sistema onartzen" #: apt-pkg/pkgcache.cc:147 msgid "The package cache was built for a different architecture" -msgstr "Paketearen katxea beste arkitektura batetarako dago garaturik" +msgstr "Paketeen cachea beste arkitektura batentzat sortuta dago" #: apt-pkg/pkgcache.cc:218 msgid "Depends" -msgstr "Dependentziak:" +msgstr "Mendekotasuna:" #: apt-pkg/pkgcache.cc:218 msgid "PreDepends" -msgstr "AurreDependetziak" +msgstr "Aurremendekotasuna:" #: apt-pkg/pkgcache.cc:218 msgid "Suggests" -msgstr "Iradokizunak" +msgstr "Iradokizuna:" #: apt-pkg/pkgcache.cc:219 msgid "Recommends" -msgstr "Gomendatuak" +msgstr "Gomendioa:" #: apt-pkg/pkgcache.cc:219 msgid "Conflicts" -msgstr "Gatazkak" +msgstr "Gatazka:" #: apt-pkg/pkgcache.cc:219 msgid "Replaces" -msgstr "Ordezkatzen du" +msgstr "Ordeztea:" #: apt-pkg/pkgcache.cc:220 msgid "Obsoletes" -msgstr "Zaharkitzen du" +msgstr "Zaharkitzea:" #: apt-pkg/pkgcache.cc:231 msgid "important" @@ -2198,11 +2194,11 @@ msgstr "estandarra" #: apt-pkg/pkgcache.cc:232 msgid "optional" -msgstr "aukerazkoa" +msgstr "aukerakoa" #: apt-pkg/pkgcache.cc:232 msgid "extra" -msgstr "extra" +msgstr "estra" #: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 msgid "Building dependency tree" @@ -2219,27 +2215,27 @@ msgstr "Dependentzi Sormena" #: apt-pkg/tagfile.cc:73 #, c-format msgid "Unable to parse package file %s (1)" -msgstr "Ezin da %s (1) pakete fitxategia analizatu" +msgstr "Ezin da %s pakete-fitxategia analizatu (1)" #: apt-pkg/tagfile.cc:160 #, c-format msgid "Unable to parse package file %s (2)" -msgstr "Ezin da %s (2) pakete fitxategia analizatu" +msgstr "Ezin da %s pakete-fitxategia analizatu (2)" #: apt-pkg/sourcelist.cc:87 #, c-format msgid "Malformed line %lu in source list %s (URI)" -msgstr "Gaizkieratutako %lu lerroa %s iturburu zerrendan (URI)" +msgstr "Gaizki osatutako %lu lerroa %s iturburu-zerrendan (URI)" #: apt-pkg/sourcelist.cc:89 #, c-format msgid "Malformed line %lu in source list %s (dist)" -msgstr "Gaizkieratutako %lu lerroa %s iturburu zerrendan (ban)" +msgstr "Gaizki osatutako %lu lerroa %s iturburu-zerrendan (dist)" #: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" -msgstr "Gaizkieratutako %lu lerroa %s iturburu zerrendan (URI analisia)" +msgstr "Gaizki osatutako %lu lerroa %s iturburu-zerrendan (URI analisia)" #: apt-pkg/sourcelist.cc:98 #, c-format @@ -2249,7 +2245,7 @@ msgstr "Gaizkieratutako %lu lerroa %s iturburu zerrendan (banaketa orokorra)" #: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" -msgstr "Gaizki eratutako %lu lerroa %s iturburu zerrenda (banaketa analisia)" +msgstr "Gaizki osatutako %lu lerroa %s iturburu-zerrendan (dist analisia)" #: apt-pkg/sourcelist.cc:156 #, c-format @@ -2259,22 +2255,22 @@ msgstr "%s irekitzen" #: apt-pkg/sourcelist.cc:170 #, c-format msgid "Line %u too long in source list %s." -msgstr "%u lerro luzeegia %s iturburu zerrendan." +msgstr "%2$s iturburu-zerrendako %1$u lerroa luzeegia da." #: apt-pkg/sourcelist.cc:187 #, c-format msgid "Malformed line %u in source list %s (type)" -msgstr "Gaizki eratutako %u lerroa %s iturburu zerrendan (mota)" +msgstr "Gaizki osatutako %u lerroa %s iturburu-zerrendan (type)" #: apt-pkg/sourcelist.cc:191 #, c-format msgid "Type '%s' is not known on line %u in source list %s" -msgstr "'%s' mota ezezaguna %u lerroan %s iturburu zerrendan. " +msgstr "'%1$s' mota ez da ezagutzen %3$s iturburu-zerrendako %2$u lerroan" #: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %u in source list %s (vendor id)" -msgstr "Gaizki eratutako %u lerroa %s iturburu zerrendan (saltzaile id)" +msgstr "Gaizki osatutako %u lerroa %s iturburu-zerrendan (hornitzaile id-a)" #: apt-pkg/packagemanager.cc:402 #, c-format @@ -2283,214 +2279,211 @@ 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 "" -"Instalazio honek bein beineko beharrezko %s pakete konflikto edo " -"aurredependetziak direla eta ezabatzea eskatzen du. Hau ez zenuke egin " -"beharko, benetan egin nahi izan ezkero gaitu APT::Force-LoopBreak aukera.." +"Instalazio hau exekutatzeko, funtsezko %s paketea aldi baterako kendu behar " +"da, Gatazka/Aurre-mendekotasun begizta baten ondorioz. Normalean arriskutsua " +"izaten da, baina hala ere egin nahi baduzu, aktibatu APT::Force-LoopBreak " +"aukera." #: apt-pkg/pkgrecords.cc:37 #, c-format msgid "Index file type '%s' is not supported" -msgstr "'%s' fitxategi indize mota ez da onartzen" +msgstr "'%s' motako indize-fitxategirik ez da onartzen" #: apt-pkg/algorithms.cc:241 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" -"%s paketea berrinstalatu egin behar da baina ez da fitxategirik aurkitzen " -"egiteko." +"%s paketea berriro instalatu behar da, baina ezin dut artxiborik aurkitu." #: apt-pkg/algorithms.cc:1059 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" -"Errorea, pkgProblemResolver::Resolve-k hausturak sortu ditu, hau pakete " -"hizoztuen erruz izan liteke." +"Errorea: pkgProblemResolver::Resolve. Etenak sortu ditu, beharbada " +"atxikitako paketeek eraginda." #: apt-pkg/algorithms.cc:1061 msgid "Unable to correct problems, you have held broken packages." -msgstr "" -"Ezin izan dira arazoak zuzendu, zuk apurtutako paketeak hizoztu\n" -"dituzu" +msgstr "Ezin dira arazoak konpondu; hautsitako paketeak atxiki dituzu." #: apt-pkg/acquire.cc:61 #, c-format msgid "Lists directory %spartial is missing." -msgstr "%spartial zerrenda karpeta ez dago." +msgstr "%spartial zerrenda-direktorioa falta da." #: apt-pkg/acquire.cc:65 #, c-format msgid "Archive directory %spartial is missing." -msgstr "%spartial fitxategi karpeta falta da." +msgstr "%spartial artxibo-direktorioa falta da." #: apt-pkg/acquire-worker.cc:112 #, c-format msgid "The method driver %s could not be found." -msgstr "Ezin izan da %s metodoa aurkitu." +msgstr "Ezin izan da %s metodo-kontrolatzailea aurkitu." #: apt-pkg/acquire-worker.cc:161 #, c-format msgid "Method %s did not start correctly" -msgstr "%s metodoa ez behar bezala abiarazi" +msgstr "%s metodoa ez da behar bezala abiarazi" #: apt-pkg/init.cc:119 #, c-format msgid "Packaging system '%s' is not supported" -msgstr "'%s' pakete sistema ez da onartzen" +msgstr "'%s' pakete-sistema ez da onartzen" #: apt-pkg/init.cc:135 msgid "Unable to determine a suitable packaging system type" -msgstr "Ezin izan da beharrezko pakete sistema atzeman." +msgstr "Ezin da pakete-sistemaren mota egokirik zehaztu" #: apt-pkg/clean.cc:61 #, c-format msgid "Unable to stat %s." -msgstr "Ezin izan da %s irakurri." +msgstr "Ezin da %s atzitu." #: apt-pkg/srcrecords.cc:48 msgid "You must put some 'source' URIs in your sources.list" -msgstr "Iturburu URI batzuk ipini behar dituzu zure sources.list fitxategian" +msgstr "'Iturburu' URI batzuk jarri behar dituzu sources.list-en" #: apt-pkg/cachefile.cc:73 msgid "The package lists or status file could not be parsed or opened." -msgstr "Pakete zerrenda edo egoera fitxategia ezin da ireki edo analizatu.." +msgstr "Pakete-zerrendak edo egoera-fitxategia ezin dira analizatu edo ireki." #: apt-pkg/cachefile.cc:77 msgid "You may want to run apt-get update to correct these problems" -msgstr "Zuk apt-get update abiarazi beharko zenuke arazo hauek zuzentzeko.." +msgstr "Beharbada 'apt-get update' exekutatu nahiko duzu arazoak konpontzeko" #: apt-pkg/policy.cc:269 msgid "Invalid record in the preferences file, no Package header" -msgstr "Erregistro baliogabea lehenespen fitxategian, ez dago pakete bururik" +msgstr "Erregistro baliogabea hobespenen fitxategian, pakete-goibururik ez" #: apt-pkg/policy.cc:291 #, c-format msgid "Did not understand pin type %s" -msgstr "Ez da %s pin mota ulertzen" +msgstr "Ez da ulertu %s orratz-mota (pin)" #: apt-pkg/policy.cc:299 msgid "No priority (or zero) specified for pin" -msgstr "Ez dago lehentasunik ezarririk (edo 0 da) pin-ean" +msgstr "Ez da lehentasunik zehaztu orratzarentzat (pin) (edo zero da)" #: apt-pkg/pkgcachegen.cc:74 msgid "Cache has an incompatible versioning system" -msgstr "Cacheak bertsio sistema bateraezina du" +msgstr "Cachearen bertsio-sistema ez da bateragarria" #: apt-pkg/pkgcachegen.cc:117 #, c-format -msgid "Error occured while processing %s (NewPackage)" -msgstr "Errorea gertatu da %s prozesatzerakoan (NewPackage)" +msgid "Error occurred while processing %s (NewPackage)" +msgstr "Errorea gertatu da %s prozesatzean (NewPackage)" #: apt-pkg/pkgcachegen.cc:129 #, c-format -msgid "Error occured while processing %s (UsePackage1)" -msgstr "Errorea gertatu da %s prozesatzerakoan (UsePackage1)" +msgid "Error occurred while processing %s (UsePackage1)" +msgstr "Errorea gertatu da %s prozesatzean (UsePackage1)" #: apt-pkg/pkgcachegen.cc:150 #, c-format -msgid "Error occured while processing %s (UsePackage2)" -msgstr "Errorea gertatu da %s prozesatzerakoan (UsePackage2)" +msgid "Error occurred while processing %s (UsePackage2)" +msgstr "Errorea gertatu da %s prozesatzean (UsePackage2)" #: apt-pkg/pkgcachegen.cc:154 #, c-format -msgid "Error occured while processing %s (NewFileVer1)" -msgstr "Errorea gertatu da %s prozesatzerakoan (NewFileVer1)" +msgid "Error occurred while processing %s (NewFileVer1)" +msgstr "Errorea gertatu da %s prozesatzean (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:184 #, c-format -msgid "Error occured while processing %s (NewVersion1)" -msgstr "Errorea gertatu da %s prozesatzerakoan (NewVersion1)" +msgid "Error occurred while processing %s (NewVersion1)" +msgstr "Errorea gertatu da %s prozesatzean (NewVersion1)" #: apt-pkg/pkgcachegen.cc:188 #, c-format -msgid "Error occured while processing %s (UsePackage3)" -msgstr "Errorea gertatu da %s prozesatzerakoan (UsePackage3)" +msgid "Error occurred while processing %s (UsePackage3)" +msgstr "Errorea gertatu da %s prozesatzean (UsePackage3)" #: apt-pkg/pkgcachegen.cc:192 #, c-format -msgid "Error occured while processing %s (NewVersion2)" -msgstr "Errorea gertatu da %s prozesatzerakoan (NewVersion2)" +msgid "Error occurred while processing %s (NewVersion2)" +msgstr "Errorea gertatu da %s prozesatzean (NewVersion2)" #: apt-pkg/pkgcachegen.cc:207 msgid "Wow, you exceeded the number of package names this APT is capable of." -msgstr "Arraioa, zuk APT-k kudeatu ditzaken pakete zenbakia gainditu duzu.." +msgstr "APT honek maneia dezakeen pakete-izenen kopurua gainditu duzu." #: apt-pkg/pkgcachegen.cc:210 msgid "Wow, you exceeded the number of versions this APT is capable of." -msgstr "Arraioa, zuk APT-k kudeatu ditzaken bertsio zenbakia gainditu duzu." +msgstr "APT honek maneia dezakeen bertsio-kopurua gainditu duzu." #: apt-pkg/pkgcachegen.cc:213 msgid "Wow, you exceeded the number of dependencies this APT is capable of." -msgstr "" -"Arraioa, zuk APT-k kudeatu ditzaken dependentzia zenbakia gainditu duzu." +msgstr "APT honek maneia dezakeen mendekotasun-kopurua gainditu duzu." #: apt-pkg/pkgcachegen.cc:241 #, c-format -msgid "Error occured while processing %s (FindPkg)" -msgstr "Errorea gertatu da %s prozesatzerakoan (FindPkg)" +msgid "Error occurred while processing %s (FindPkg)" +msgstr "Errorea gertatu da %s prozesatzean (FindPkg)" #: apt-pkg/pkgcachegen.cc:254 #, c-format -msgid "Error occured while processing %s (CollectFileProvides)" -msgstr "Errorea gertatu da %s prozesatzen (CollectFileProvides)" +msgid "Error occurred while processing %s (CollectFileProvides)" +msgstr "Errorea gertatu da %s prozesatzean (CollectFileProvides)" #: apt-pkg/pkgcachegen.cc:260 #, c-format msgid "Package %s %s was not found while processing file dependencies" -msgstr "%s %s paketea ez da aurkitu dependetzi fitxategia porzesatzerakoan" +msgstr "%s %s paketea ez da aurkitu fitxategi-mendekotasunak prozesatzean" #: apt-pkg/pkgcachegen.cc:574 #, c-format msgid "Couldn't stat source package list %s" -msgstr "Ezin da %s iturburu pakete zerrenda irakurri" +msgstr "Ezin da atzitu %s iturburu-paketeen zerrenda" #: apt-pkg/pkgcachegen.cc:658 msgid "Collecting File Provides" -msgstr "Dakartzaten fitxategiak eskuratzen" +msgstr "Fitxategi-erreferentziak biltzen" #: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 msgid "IO Error saving source cache" -msgstr "S/I errorea katxe iturburua gordetzerakoan" +msgstr "S/I errorea iturburu-cachea gordetzean" #: apt-pkg/acquire-item.cc:126 #, c-format msgid "rename failed, %s (%s -> %s)." -msgstr "berrizendaketak huts egin du, %s (%s -> %s)." +msgstr "huts egin du izen-aldaketak, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:894 +#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 msgid "MD5Sum mismatch" -msgstr "MD5Sum-ak ez datoz bat" +msgstr "MD5Sum ez dator bat" -#: apt-pkg/acquire-item.cc:708 +#: apt-pkg/acquire-item.cc:714 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -"Ezin izan da %s paketarentzat fitxategi bat aurkitu. Honek pakete hau eskuz " -"zuzendu behar duzula esan dezake (arkitektura baten falta dela eta)." +"Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu " +"beharko duzu paketea. (arkitektura falta delako)" -#: apt-pkg/acquire-item.cc:761 +#: apt-pkg/acquire-item.cc:767 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" -"Ezin izan da %s paketarentzat fitxategi bat aurkitu. Honek pakete hau eskuz " -"zuzendu behar duzula esan dezake." +"Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu " +"beharko duzu paketea." -#: apt-pkg/acquire-item.cc:797 +#: apt-pkg/acquire-item.cc:803 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -"Pakete indize fitxategiak hondaturik daude. Fitxategi izen gabe: %s pakete " -"eremua." +"Paketearen indize-fitxategiak hondatuta daude. 'Filename:' eremurik ez %s " +"paketearentzat." -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" -msgstr "Tamainak ez datoz bat" +msgstr "Tamaina ez dator bat" #: apt-pkg/vendorlist.cc:66 #, c-format @@ -2591,3 +2584,203 @@ msgstr "%i erregistro eta %i okerreko fitxategi grabaturik.\n" 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" + +#~ msgid "Total Package Names : " +#~ msgstr "Pakete-izenak guztira: " + +#~ msgid " Normal Packages: " +#~ msgstr " Pakete normalak: " + +#~ msgid " Pure Virtual Packages: " +#~ msgstr " Pakete birtual puruak: " + +#~ msgid " Single Virtual Packages: " +#~ msgstr " Pakete birtual soilak: " + +#~ msgid " Mixed Virtual Packages: " +#~ msgstr " Pakete birtual nahasiak: " + +#~ msgid "Total Distinct Versions: " +#~ msgstr "Bertsio desberdinak guztira: " + +#~ msgid "Total Dependencies: " +#~ msgstr "Mendekotasunak guztira: " + +#~ msgid "Total Ver/File relations: " +#~ msgstr "Bertsio/fitxategi erlazioak guztira: " + +#~ msgid "Total Provides Mappings: " +#~ msgstr "Hornidura-mapatzeak guztira: " + +#~ msgid "Total Globbed Strings: " +#~ msgstr "Globalizatutako kateak guztira: " + +#~ msgid "Total Dependency Version space: " +#~ msgstr "Mendekotasun-bertsioen lekua guztira: " + +#~ msgid "Total Slack space: " +#~ msgstr "Slack lekua guztira: " + +#~ msgid "Total Space Accounted for: " +#~ msgstr "Hartutako lekua guztira: " + +#~ msgid "Package Files:" +#~ msgstr "Pakete-fitxategiak:" + +#~ msgid "Pinned Packages:" +#~ msgstr "Orratzdun paketeak (pin):" + +#~ msgid " Package Pin: " +#~ msgstr " Pakete-orratza (pin): " + +#~ msgid " Version Table:" +#~ msgstr " Bertsio-taula:" + +#~ msgid "Error Processing directory %s" +#~ msgstr "Errorea %s direktorioa prozesatzean" + +#~ msgid "Error Processing Contents %s" +#~ msgstr "Errorea %s edukia prozesatzean" + +#~ msgid "Unknown Compresison Algorithm '%s'" +#~ msgstr "Konpresio-algoritmo ezezaguna: '%s'" + +#~ msgid "Compress Child" +#~ msgstr "Konprimitu umea" + +#~ msgid "Internal Error, Failed to create %s" +#~ msgstr "Barne-errorea. Ezin izan da %s sortu" + +#~ msgid "Packages need to be removed but Remove is disabled." +#~ msgstr "" +#~ "Paketeak kendu egin behar dira, baina Kentzeko aukera desgaituta dago." + +#~ msgid "Do you want to continue? [Y/n] " +#~ msgstr "Jarraitu nahi duzu? [B/e] " + +#~ msgid "Aborting Install." +#~ msgstr "Instalazioa abortatzen." + +#~ msgid "Internal Error, AllUpgrade broke stuff" +#~ msgstr "Barne-errorea, AllUpgrade-k zerbait hautsi du" + +#~ msgid "Calculating Upgrade... " +#~ msgstr "Bertsio-berritzea kalkulatzen... " + +#~ msgid "Fetch Source %s\n" +#~ msgstr "Lortu %s iturburua\n" + +#~ msgid "Supported Modules:" +#~ msgstr "Onartutako moduluak:" + +#~ msgid "" +#~ "Media Change: Please insert the disc labeled\n" +#~ " '%s'\n" +#~ "in the drive '%s' and press enter\n" +#~ msgstr "" +#~ "Euskarri-aldaketa: sartu '%s'\n" +#~ "diskoa '%s' unitatean, eta sakatu Sartu\n" + +#~ msgid "Merging Available information" +#~ msgstr "Informazio erabilgarria batzen" + +#~ msgid "Tar Checksum failed, archive corrupted" +#~ msgstr "Tar Checksum-ek huts egin du; artxiboa hondatuta dago" + +#~ msgid "Internal Error in AddDiversion" +#~ msgstr "Barne-errorea AddDiversion-en" + +#~ msgid "Reading Package Lists" +#~ msgstr "Pakete-zerrendak irakurtzen" + +#~ msgid "Internal Error getting a Package Name" +#~ msgstr "Barne-errorea pakete-izen bat eskuratzean" + +#~ msgid "Reading File Listing" +#~ msgstr "Fitxategi-zerrenda irakurtzen" + +#~ msgid "Internal Error getting a Node" +#~ msgstr "Barne-errorea nodo bat eskuratzean" + +#~ msgid "Internal Error adding a diversion" +#~ msgstr "Barne-errorea desbideratze bat gehitzean" + +#~ msgid "Reading File List" +#~ msgstr "Fitxategi-zerrenda irakurtzen" + +#~ msgid "Failed to find a Package: Header, offset %lu" +#~ msgstr "Ezin izan da aurkitu Paketea: Goiburua, desplazamendua %lu" + +#~ msgid "Internal Error, could not locate member %s" +#~ msgstr "Barne-errorea; ezin izan da %s kidea lokalizatu" + +#~ msgid "Internal Error, could not locate member" +#~ msgstr "Barne-errorea; ezin izan da kidea lokalizatu" + +#~ msgid "Unparsible control file" +#~ msgstr "Kontrol-fitxategi analizaezina" + +#~ msgid "" +#~ "Please use apt-cdrom to make this CD recognized by APT. apt-get update " +#~ "cannot be used to add new CDs" +#~ msgstr "" +#~ "Erabili apt-cdrom, CD hau APTk identifika dezan. apt-get eguneratzea ezin " +#~ "da erabili CD berriak gehitzeko" + +#~ msgid "Wrong CD" +#~ msgstr "CD okerra" + +#~ msgid "Server refused our connection and said: %s" +#~ msgstr "Zerbitzariak gure konexioa ezetsi du, eta hau esan du: %s" + +#~ msgid "Write Error" +#~ msgstr "Idazketa-errorea" + +#~ msgid "The http server sent an invalid reply header" +#~ msgstr "Http zerbitzariak erantzun-goiburu baliogabe bat bidali du" + +#~ msgid "The http server sent an invalid Content-Length header" +#~ msgstr "Http zerbitzariak Content-Length goiburu baliogabe bat bidali du" + +#~ msgid "The http server sent an invalid Content-Range header" +#~ msgstr "Http zerbitzariak Content-Range goiburu baliogabe bat bidali du" + +#~ msgid "This http server has broken range support" +#~ msgstr "Http zerbitzari honek barruti-onarpena hautsita dauka" + +#~ msgid "Error reading from server Remote end closed connection" +#~ msgstr "Errorea zerbitzaritik irakurtzean: Urruneko aldeak konexioa itxi du" + +#~ msgid "Bad header Data" +#~ msgstr "Okerreko goiburu-datuak" + +#~ msgid "Syntax error %s:%u: Malformed Tag" +#~ msgstr "Sintaxi-errorea, %s:%u: Etiketa gaizki osatuta" + +#~ msgid "Waited, for %s but it wasn't there" +#~ msgstr "%s(r)en zain egon da, baina ez zegoen hor" + +#~ msgid "This APT does not support the Versioning System '%s'" +#~ msgstr "APT honek ez du onartzen '%s' bertsio-sistema" + +#~ msgid "Building Dependency Tree" +#~ msgstr "Mendekotasunen zuhaitza eraikitzen" + +#~ msgid "Candidate Versions" +#~ msgstr "Hautagai dauden bertsioak" + +#~ msgid "Dependency Generation" +#~ msgstr "Mendekotasunak sortzea" + +#~ msgid "Malformed line %lu in source list %s (Absolute dist)" +#~ msgstr "Gaizki osatutako %lu lerroa %s iturburu-zerrendan (dist absolutua)" + +#~ msgid "Vendor block %s is invalid" +#~ msgstr "%s hornitzaile-blokea ez da baliozkoa" + +#~ msgid "Unknown vendor ID '%s' in line %u of source list %s" +#~ msgstr "" +#~ "'%1$s' hornitzaile-id ezezaguna %3$s iturburu-zerrendako %2$u lerroan" + +#~ msgid "File Not Found" +#~ msgstr "Ez da fitxategia aurkitu" diff --git a/po/fi.po b/po/fi.po index 8213f602f..3436485a9 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: 2005-03-05 22:10+0100\n" +"POT-Creation-Date: 2005-03-29 07:17+0200\n" "PO-Revision-Date: 2005-02-15 14:09+0200\n" "Last-Translator: Tapio Lehtonen <tale@debian.org>\n" "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n" @@ -324,6 +324,7 @@ msgid "Error processing contents %s" msgstr "Tapahtui virhe käsiteltäessä sisällysluetteloa %s" #: ftparchive/apt-ftparchive.cc:551 +#, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -362,7 +363,7 @@ msgid "" " --no-delink Enable delinking debug mode\n" " --contents Control contents file generation\n" " -c=? Read this configuration file\n" -" -o=? Set an arbitary configuration option" +" -o=? Set an arbitrary configuration option" msgstr "" "Käyttö: apt-ftparchive [valitsimet] komento\n" "Komennot: packages binääripolku [poikkeustdsto [polun alku]]\n" @@ -1540,7 +1541,7 @@ msgid "Internal error adding a diversion" msgstr "Tapahtui sisäinen virhe lisättäessä korvautusta" #: apt-inst/deb/dpkgdb.cc:383 -msgid "The pkg cache must be initialize first" +msgid "The pkg cache must be initialized first" msgstr "Pakettivarasto on ensin alustettava" #: apt-inst/deb/dpkgdb.cc:386 @@ -2365,37 +2366,37 @@ msgstr "Pakettivaraston versionhallintajärjestelmä ei ole yhteensopiva" #: apt-pkg/pkgcachegen.cc:117 #, c-format -msgid "Error occured while processing %s (NewPackage)" +msgid "Error occurred while processing %s (NewPackage)" msgstr "Tapahtui virhe käsiteltäessä %s (NewPackage)" #: apt-pkg/pkgcachegen.cc:129 #, c-format -msgid "Error occured while processing %s (UsePackage1)" +msgid "Error occurred while processing %s (UsePackage1)" msgstr "Tapahtui virhe käsiteltäessä %s (UsePackage1)" #: apt-pkg/pkgcachegen.cc:150 #, c-format -msgid "Error occured while processing %s (UsePackage2)" +msgid "Error occurred while processing %s (UsePackage2)" msgstr "Tapahtui virhe käsiteltäessä %s (UsePackage2)" #: apt-pkg/pkgcachegen.cc:154 #, c-format -msgid "Error occured while processing %s (NewFileVer1)" +msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Tapahtui virhe käsiteltäessä %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:184 #, c-format -msgid "Error occured while processing %s (NewVersion1)" +msgid "Error occurred while processing %s (NewVersion1)" msgstr "Tapahtui virhe käsiteltäessä %s (NewVersion1)" #: apt-pkg/pkgcachegen.cc:188 #, c-format -msgid "Error occured while processing %s (UsePackage3)" +msgid "Error occurred while processing %s (UsePackage3)" msgstr "Tapahtui virhe käsiteltäessä %s (UsePackage3)" #: apt-pkg/pkgcachegen.cc:192 #, c-format -msgid "Error occured while processing %s (NewVersion2)" +msgid "Error occurred while processing %s (NewVersion2)" msgstr "Tapahtui virhe käsiteltäessä %s (NewVersion2)" #: apt-pkg/pkgcachegen.cc:207 @@ -2413,12 +2414,12 @@ msgstr "Jummijammi, annoit enemmän riippuvuuksia kuin tämä APT osaa käsitell #: apt-pkg/pkgcachegen.cc:241 #, c-format -msgid "Error occured while processing %s (FindPkg)" +msgid "Error occurred while processing %s (FindPkg)" msgstr "Tapahtui virhe käsiteltäessä %s (FindPkg)" #: apt-pkg/pkgcachegen.cc:254 #, c-format -msgid "Error occured while processing %s (CollectFileProvides)" +msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Tapahtui virhe käsiteltäessä %s (CollectFileProvides)" #: apt-pkg/pkgcachegen.cc:260 diff --git a/po/fr.po b/po/fr.po index 55563bfef..8644bf55c 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-05 22:10+0100\n" -"PO-Revision-Date: 2005-02-20 19:38+0100\n" +"POT-Creation-Date: 2005-03-29 07:17+0200\n" +"PO-Revision-Date: 2005-03-29 09:40+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" @@ -302,8 +302,7 @@ msgstr "Impossible d' #: 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?" +msgstr "Impossible d'obtenir la version de debconf. Est-ce que debconf est install?" #: ftparchive/apt-ftparchive.cc:163 ftparchive/apt-ftparchive.cc:337 msgid "Package extension list is too long" @@ -368,7 +367,7 @@ msgid "" " --no-delink Enable delinking debug mode\n" " --contents Control contents file generation\n" " -c=? Read this configuration file\n" -" -o=? Set an arbitary configuration option" +" -o=? Set an arbitrary configuration option" msgstr "" "Usage: apt-ftparchive [options] commande\n" "Commandes: paquets binarypath [fichier d'override [chemin du " @@ -380,7 +379,7 @@ msgstr "" " clean config\n" "\n" "apt-ftparchive gnre des fichiers d'index pour les archives Debian. Il\n" -"supporte de nombreux types de gnration, d'une automatisation complte \n" +"gre de nombreux types de gnration, d'une automatisation complte \n" "des remplacements fonctionnels pour dpkg-scanpackages et dpkg-scansources\n" "\n" "apt-ftparchive gnre les fichiers de paquets partir d'un arbre de .debs.\n" @@ -390,7 +389,7 @@ msgstr "" "des sections\n" "\n" "De faon similaire, apt-ftparchive gnre des fichiers de source partir\n" -"d'un arbre de .dscs. L'option --source-override peut tre employe pour\n" +"d'un arbre de .dscs. L'option --source-override peut tre utilise pour\n" "spcifier un fichier src d'override\n" "\n" "Les commandes packages et sources devraient tre dmarres la\n" @@ -419,8 +418,7 @@ msgstr "Aucune s #: ftparchive/apt-ftparchive.cc:830 #, 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" +msgstr "Quelques fichiers sont manquants dans le groupe de fichiers de paquets %s" #: ftparchive/cachedb.cc:45 #, c-format @@ -778,8 +776,7 @@ msgstr "Il y a des probl #: cmdline/apt-get.cc:762 msgid "Packages need to be removed but remove is disabled." -msgstr "" -"Les paquets doivent tre enlevs mais la dsinstallation est dsactive." +msgstr "Les paquets doivent tre enlevs mais la dsinstallation est dsactive." #: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802 msgid "Unable to lock the download directory" @@ -803,8 +800,7 @@ msgstr "Il est n #: cmdline/apt-get.cc:826 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" -msgstr "" -"Aprs dpaquetage, %so d'espace disque supplmentaires seront utiliss.\n" +msgstr "Aprs dpaquetage, %so d'espace disque supplmentaires seront utiliss.\n" #: cmdline/apt-get.cc:829 #, c-format @@ -870,8 +866,7 @@ msgstr "" #: cmdline/apt-get.cc:987 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." +msgstr "l'option --fix-missing et l'change de support ne sont pas encore reconnus." #: cmdline/apt-get.cc:992 msgid "Unable to correct missing packages." @@ -933,8 +928,7 @@ msgstr "Aucun paquet ne correspond au paquet %s" #: cmdline/apt-get.cc:1129 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" -msgstr "" -"La rinstallation de %s est impossible, il ne peut pas tre tlcharg.\n" +msgstr "La rinstallation de %s est impossible, il ne peut pas tre tlcharg.\n" #: cmdline/apt-get.cc:1137 #, c-format @@ -988,8 +982,7 @@ msgstr "Note, s #: cmdline/apt-get.cc:1515 msgid "You might want to run `apt-get -f install' to correct these:" -msgstr "" -"Vous pouvez lancer apt-get -f install pour corriger ces problmes:" +msgstr "Vous pouvez lancer apt-get -f install pour corriger ces problmes:" #: cmdline/apt-get.cc:1518 msgid "" @@ -1153,8 +1146,7 @@ msgstr "Impossible de satisfaire les d #: cmdline/apt-get.cc:2282 #, c-format msgid "Build-dependencies for %s could not be satisfied." -msgstr "" -"Les dpendances de compilation pour %s ne peuvent pas tre satisfaites." +msgstr "Les dpendances de compilation pour %s ne peuvent pas tre satisfaites." #: cmdline/apt-get.cc:2286 msgid "Failed to process build dependencies" @@ -1337,8 +1329,7 @@ msgstr "" "seules les erreurs" #: dselect/install:103 -msgid "" -"above this message are important. Please fix them and run [I]nstall again" +msgid "above this message are important. Please fix them and run [I]nstall again" msgstr "" "prcdant ce message sont importantes. Veuillez les corriger et\n" "dmarrer l'[I]nstallation une nouvelle fois." @@ -1569,7 +1560,7 @@ msgid "Internal error adding a diversion" msgstr "Erreur interne en ajoutant une dviation" #: apt-inst/deb/dpkgdb.cc:383 -msgid "The pkg cache must be initialize first" +msgid "The pkg cache must be initialized first" msgstr "Le cache des paquets doit tre initialis en premier" #: apt-inst/deb/dpkgdb.cc:386 @@ -1599,8 +1590,7 @@ msgstr "Ce n'est pas une archive DEB valide, partie #: apt-inst/deb/debfile.cc:52 #, c-format msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" -msgstr "" -"Ce n'est pas une archive DEB valide, elle n'a pas de membre %s ou %s " +msgstr "Ce n'est pas une archive DEB valide, elle n'a pas de membre %s ou %s " #: apt-inst/deb/debfile.cc:112 #, c-format @@ -1698,8 +1688,7 @@ msgstr "" #: 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 rpondu: %s" +msgstr "La commande %s du script de connexion a chou, le serveur a rpondu: %s" #: methods/ftp.cc:291 #, c-format @@ -1736,8 +1725,7 @@ msgstr "Impossible de cr #: methods/ftp.cc:698 msgid "Could not connect data socket, connection timed out" -msgstr "" -"Impossible de se connecter sur le port de donnes, dlai de connexion dpass" +msgstr "Impossible de se connecter sur le port de donnes, dlai de connexion dpass" #: methods/ftp.cc:704 msgid "Could not connect passive socket." @@ -2271,14 +2259,12 @@ msgstr "Ligne %lu mal form #: apt-pkg/sourcelist.cc:98 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" -msgstr "" -"Ligne %lu mal forme dans la liste des sources %s (distribution absolue)" +msgstr "Ligne %lu mal forme dans la liste des sources %s (distribution absolue)" #: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" -msgstr "" -"Ligne %lu mal forme dans la liste des sources %s (analyse de distribution)" +msgstr "Ligne %lu mal forme dans la liste des sources %s (analyse de distribution)" #: apt-pkg/sourcelist.cc:156 #, c-format @@ -2298,14 +2284,12 @@ msgstr "Ligne %u mal form #: apt-pkg/sourcelist.cc:191 #, 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" +msgstr "Le type %s est inconnu sur la ligne %u dans la liste des sources %s" #: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %u in source list %s (vendor id)" -msgstr "" -"Ligne %u mal forme dans la liste des sources %s (identifiant du fournisseur)" +msgstr "Ligne %u mal forme dans la liste des sources %s (identifiant du fournisseur)" #: apt-pkg/packagemanager.cc:402 #, c-format @@ -2326,8 +2310,7 @@ msgstr "Le type de fichier d'index #: apt-pkg/algorithms.cc:241 #, c-format -msgid "" -"The package %s needs to be reinstalled, but I can't find an archive for it." +msgid "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" "Le paquet %s doit tre rinstall, mais je ne parviens pas trouver son " "archive." @@ -2382,8 +2365,7 @@ msgstr "Impossible de localiser %s." #: apt-pkg/srcrecords.cc:48 msgid "You must put some 'source' URIs in your sources.list" -msgstr "" -"Vous devez insrer quelques adresses sources dans votre sources.list" +msgstr "Vous devez insrer quelques adresses sources dans votre sources.list" #: apt-pkg/cachefile.cc:73 msgid "The package lists or status file could not be parsed or opened." @@ -2416,37 +2398,37 @@ msgstr "Le cache poss #: apt-pkg/pkgcachegen.cc:117 #, c-format -msgid "Error occured while processing %s (NewPackage)" +msgid "Error occurred while processing %s (NewPackage)" msgstr "Erreur apparue lors du traitement de %s (NewPackage)" #: apt-pkg/pkgcachegen.cc:129 #, c-format -msgid "Error occured while processing %s (UsePackage1)" +msgid "Error occurred while processing %s (UsePackage1)" msgstr "Erreur apparue lors du traitement de %s (UsePackage1)" #: apt-pkg/pkgcachegen.cc:150 #, c-format -msgid "Error occured while processing %s (UsePackage2)" +msgid "Error occurred while processing %s (UsePackage2)" msgstr "Erreur apparue lors du traitement de %s (UsePackage2)" #: apt-pkg/pkgcachegen.cc:154 #, c-format -msgid "Error occured while processing %s (NewFileVer1)" +msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Erreur apparue lors du traitement de %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:184 #, c-format -msgid "Error occured while processing %s (NewVersion1)" +msgid "Error occurred while processing %s (NewVersion1)" msgstr "Erreur apparue lors du traitement de %s (NewVersion1)" #: apt-pkg/pkgcachegen.cc:188 #, c-format -msgid "Error occured while processing %s (UsePackage3)" +msgid "Error occurred while processing %s (UsePackage3)" msgstr "Erreur apparue lors du traitement de %s (UsePackage3)" #: apt-pkg/pkgcachegen.cc:192 #, c-format -msgid "Error occured while processing %s (NewVersion2)" +msgid "Error occurred while processing %s (NewVersion2)" msgstr "Erreur apparue lors du traitement de %s (NewVersion2)" #: apt-pkg/pkgcachegen.cc:207 @@ -2469,12 +2451,12 @@ msgstr "" #: apt-pkg/pkgcachegen.cc:241 #, c-format -msgid "Error occured while processing %s (FindPkg)" +msgid "Error occurred while processing %s (FindPkg)" msgstr "Erreur apparue lors du traitement de %s (FindPkg)" #: apt-pkg/pkgcachegen.cc:254 #, c-format -msgid "Error occured while processing %s (CollectFileProvides)" +msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Erreur apparue lors du traitement de %s (CollectFileProvides)" #: apt-pkg/pkgcachegen.cc:260 @@ -2495,8 +2477,7 @@ msgstr "Assemblage des fichiers list #: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 msgid "IO Error saving source cache" -msgstr "" -"Erreur d'entre/sortie lors de la sauvegarde du fichier de cache des sources" +msgstr "Erreur d'entre/sortie lors de la sauvegarde du fichier de cache des sources" #: apt-pkg/acquire-item.cc:126 #, c-format @@ -2528,8 +2509,7 @@ msgstr "" #: apt-pkg/acquire-item.cc:797 #, c-format -msgid "" -"The package index files are corrupted. No Filename: field for package %s." +msgid "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Les fichiers d'index des paquets sont corrompus. Aucun champ Filename: " "pour le paquet %s." @@ -2643,3 +2623,4 @@ msgstr "" #~ msgstr "" #~ "Identifiant %s du fournisseur inconnu dans la ligne %u de la liste " #~ "des sources %s" + diff --git a/po/he.po b/po/he.po index ebab198ec..242155eff 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: 2005-03-05 12:06+0100\n" +"POT-Creation-Date: 2005-03-29 07:17+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" @@ -303,7 +303,7 @@ msgid "" " --no-delink Enable delinking debug mode\n" " --contents Control contents file generation\n" " -c=? Read this configuration file\n" -" -o=? Set an arbitary configuration option" +" -o=? Set an arbitrary configuration option" msgstr "" #: ftparchive/apt-ftparchive.cc:757 @@ -535,16 +535,16 @@ msgstr "לחבילות הבאות יש תלויות שלא נענו:" #: cmdline/apt-get.cc:325 #, c-format msgid "but %s is installed" -msgstr "אבל %s מותקן" +msgstr "אבל %s מותקנת" #: cmdline/apt-get.cc:327 #, c-format msgid "but %s is to be installed" -msgstr "" +msgstr "אבל %s הולכת להיות מותקנת" #: cmdline/apt-get.cc:334 msgid "but it is not installable" -msgstr "" +msgstr "אבל היא אינה ניתנת להתקנה" #: cmdline/apt-get.cc:336 msgid "but it is a virtual package" @@ -572,7 +572,7 @@ msgstr "החבילות הבאות יוסרו:" #: cmdline/apt-get.cc:421 msgid "The following packages have been kept back:" -msgstr "החבילות הבאות מעוקבות:" +msgstr "החבילות הבאות מעובות:" #: cmdline/apt-get.cc:442 msgid "The following packages will be upgraded:" @@ -596,6 +596,8 @@ 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:575 #, c-format @@ -637,6 +639,8 @@ msgstr "לא מצליח לתקן תלויות" #: cmdline/apt-get.cc:656 msgid "Unable to minimize the upgrade set" msgstr "" +"א ז ה ר ה: החבילות החיוניות הבאות יוסרו\n" +"על הפעולה להעשות *רק* אם אתה יודע מה אתה עושה!" #: cmdline/apt-get.cc:658 msgid " Done" @@ -656,7 +660,7 @@ msgid "WARNING: The following packages cannot be authenticated!" msgstr "החבילות הבאות ישודרגו:" #: cmdline/apt-get.cc:698 -msgid "Install these packages without verification? [y/N] " +msgid "Install these packages without verification [y/N]? " msgstr "" #: cmdline/apt-get.cc:700 @@ -726,7 +730,8 @@ msgid "Abort." msgstr "בטל." #: cmdline/apt-get.cc:886 -msgid "Do you want to continue? [Y/n] " +#, fuzzy +msgid "Do you want to continue [Y/n]? " msgstr "האם אתה רוצה להמשיך? [Y/n]" #: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959 @@ -1359,7 +1364,7 @@ msgid "Internal error adding a diversion" msgstr "" #: apt-inst/deb/dpkgdb.cc:383 -msgid "The pkg cache must be initialize first" +msgid "The pkg cache must be initialized first" msgstr "" #: apt-inst/deb/dpkgdb.cc:386 @@ -1420,7 +1425,7 @@ msgid "" msgstr "" #: methods/cdrom.cc:130 methods/cdrom.cc:168 -msgid "Wrong CD" +msgid "Wrong CD-ROM" msgstr "" #: methods/cdrom.cc:163 @@ -2174,37 +2179,37 @@ msgstr "" #: apt-pkg/pkgcachegen.cc:117 #, c-format -msgid "Error occured while processing %s (NewPackage)" +msgid "Error occurred while processing %s (NewPackage)" msgstr "" #: apt-pkg/pkgcachegen.cc:129 #, c-format -msgid "Error occured while processing %s (UsePackage1)" +msgid "Error occurred while processing %s (UsePackage1)" msgstr "" #: apt-pkg/pkgcachegen.cc:150 #, c-format -msgid "Error occured while processing %s (UsePackage2)" +msgid "Error occurred while processing %s (UsePackage2)" msgstr "" #: apt-pkg/pkgcachegen.cc:154 #, c-format -msgid "Error occured while processing %s (NewFileVer1)" +msgid "Error occurred while processing %s (NewFileVer1)" msgstr "" #: apt-pkg/pkgcachegen.cc:184 #, c-format -msgid "Error occured while processing %s (NewVersion1)" +msgid "Error occurred while processing %s (NewVersion1)" msgstr "" #: apt-pkg/pkgcachegen.cc:188 #, c-format -msgid "Error occured while processing %s (UsePackage3)" +msgid "Error occurred while processing %s (UsePackage3)" msgstr "" #: apt-pkg/pkgcachegen.cc:192 #, c-format -msgid "Error occured while processing %s (NewVersion2)" +msgid "Error occurred while processing %s (NewVersion2)" msgstr "" #: apt-pkg/pkgcachegen.cc:207 @@ -2221,12 +2226,12 @@ msgstr "" #: apt-pkg/pkgcachegen.cc:241 #, c-format -msgid "Error occured while processing %s (FindPkg)" +msgid "Error occurred while processing %s (FindPkg)" msgstr "" #: apt-pkg/pkgcachegen.cc:254 #, c-format -msgid "Error occured while processing %s (CollectFileProvides)" +msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "" #: apt-pkg/pkgcachegen.cc:260 diff --git a/po/hu.po b/po/hu.po index d9540a7b9..cdc21fce3 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: 2005-03-05 22:10+0100\n" +"POT-Creation-Date: 2005-03-29 07:17+0200\n" "PO-Revision-Date: 2005-02-15 18:03+0100\n" "Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n" "Language-Team: Hungarian <gnome@gnome.hu>\n" @@ -325,6 +325,7 @@ msgid "Error processing contents %s" msgstr "Hiba %s tartalmának feldolgozásakor" #: ftparchive/apt-ftparchive.cc:551 +#, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -363,7 +364,7 @@ msgid "" " --no-delink Enable delinking debug mode\n" " --contents Control contents file generation\n" " -c=? Read this configuration file\n" -" -o=? Set an arbitary configuration option" +" -o=? Set an arbitrary configuration option" msgstr "" "Használat: apt-ftparchive [opciók] parancs\n" "Parancsok: packages binarypath [felülbírálófájl [útvonal-előtag]]\n" @@ -1543,7 +1544,7 @@ msgid "Internal error adding a diversion" msgstr "Belső hiba egy eltérítés hozzáadásakor" #: apt-inst/deb/dpkgdb.cc:383 -msgid "The pkg cache must be initialize first" +msgid "The pkg cache must be initialized first" msgstr "A csomag gyorsítótárnak előbb kell inicializálva lennie" #: apt-inst/deb/dpkgdb.cc:386 @@ -2377,37 +2378,37 @@ msgstr "A gyorsítótárnak inkompatibilis verziórendszere van" #: apt-pkg/pkgcachegen.cc:117 #, c-format -msgid "Error occured while processing %s (NewPackage)" +msgid "Error occurred while processing %s (NewPackage)" msgstr "Hiba adódott a(z) %s feldolgozásakor (NewPackage)" #: apt-pkg/pkgcachegen.cc:129 #, c-format -msgid "Error occured while processing %s (UsePackage1)" +msgid "Error occurred while processing %s (UsePackage1)" msgstr "Hiba adódott a(z) %s feldolgozásakor (UsePackage1)" #: apt-pkg/pkgcachegen.cc:150 #, c-format -msgid "Error occured while processing %s (UsePackage2)" +msgid "Error occurred while processing %s (UsePackage2)" msgstr "Hiba adódott a(z) %s feldolgozásakor (UsePackage2)" #: apt-pkg/pkgcachegen.cc:154 #, c-format -msgid "Error occured while processing %s (NewFileVer1)" +msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Hiba adódott a(z) %s feldolgozásakor (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:184 #, c-format -msgid "Error occured while processing %s (NewVersion1)" +msgid "Error occurred while processing %s (NewVersion1)" msgstr "Hiba adódott a(z) %s feldolgozásakor (NewVersion1)" #: apt-pkg/pkgcachegen.cc:188 #, c-format -msgid "Error occured while processing %s (UsePackage3)" +msgid "Error occurred while processing %s (UsePackage3)" msgstr "Hiba adódott a(z) %s feldolgozásakor (UsePackage3)" #: apt-pkg/pkgcachegen.cc:192 #, c-format -msgid "Error occured while processing %s (NewVersion2)" +msgid "Error occurred while processing %s (NewVersion2)" msgstr "Hiba adódott a(z) %s feldolgozásakor (NewVersion2)" #: apt-pkg/pkgcachegen.cc:207 @@ -2427,12 +2428,12 @@ msgstr "" #: apt-pkg/pkgcachegen.cc:241 #, c-format -msgid "Error occured while processing %s (FindPkg)" +msgid "Error occurred while processing %s (FindPkg)" msgstr "Hiba adódott a(z) %s feldolgozásakor (FindPkg)" #: apt-pkg/pkgcachegen.cc:254 #, c-format -msgid "Error occured while processing %s (CollectFileProvides)" +msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Hiba adódott a(z) %s feldolgozásakor (CollectFileProvides)" #: apt-pkg/pkgcachegen.cc:260 diff --git a/po/it.po b/po/it.po index 7e48818ff..602e441ab 100644 --- a/po/it.po +++ b/po/it.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-06 12:50+0100\n" -"PO-Revision-Date: 2005-03-25 17:19+0100\n" +"POT-Creation-Date: 2005-03-29 07:17+0200\n" +"PO-Revision-Date: 2005-03-26 00:42+0100\n" "Last-Translator: Samuele Giovanni Tonon <samu@debian.org>\n" "Language-Team: Italian <it@li.org>\n" "MIME-Version: 1.0\n" @@ -324,6 +324,7 @@ msgid "Error processing contents %s" msgstr "Errore nell'analisi dei contents %s" #: ftparchive/apt-ftparchive.cc:551 +#, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -362,7 +363,7 @@ msgid "" " --no-delink Enable delinking debug mode\n" " --contents Control contents file generation\n" " -c=? Read this configuration file\n" -" -o=? Set an arbitary configuration option" +" -o=? Set an arbitrary configuration option" msgstr "" "Utilizzo: apt-ftparchive [opzioni] comando\n" "Comandi: packages pathaibinari [filedioverride [pathprefix]\n" @@ -422,7 +423,7 @@ msgstr "DB era corrotto, il file #: ftparchive/cachedb.cc:63 #, c-format msgid "DB is old, attempting to upgrade %s" -msgstr "" +msgstr "Il DB vecchio, tentativo di aggiornamento %s" #: ftparchive/cachedb.cc:73 #, c-format @@ -759,11 +760,11 @@ msgstr "ATTENZIONE: i seguenti pacchetti non possono essere autenticati!" #: cmdline/apt-get.cc:698 msgid "Install these packages without verification [y/N]? " -msgstr "" +msgstr "Installare questi pacchetti senza la verifica [s/N]? " #: cmdline/apt-get.cc:700 msgid "Some packages could not be authenticated" -msgstr "" +msgstr "Non stato possibile autenticare alcuni pacchetti" #: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855 msgid "There are problems and -y was used without --force-yes" @@ -1131,6 +1132,8 @@ msgstr "" #, 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:2268 #, c-format @@ -1140,7 +1143,7 @@ msgstr "La dipendenza %s per %s: %s #: cmdline/apt-get.cc:2282 #, c-format msgid "Build-dependencies for %s could not be satisfied." -msgstr "" +msgstr "Non stato possibile soddisfare le dipendenze di costruzione per %s." #: cmdline/apt-get.cc:2286 msgid "Failed to process build dependencies" @@ -1556,7 +1559,7 @@ msgid "Internal error adding a diversion" msgstr "Errore interno nell'aggiunta di una diversion" #: apt-inst/deb/dpkgdb.cc:383 -msgid "The pkg cache must be initialize first" +msgid "The pkg cache must be initialized first" msgstr "La cache dei pacchetti deve prima essere inizializzata" #: apt-inst/deb/dpkgdb.cc:386 @@ -2391,37 +2394,37 @@ msgstr "La cache ha un sistema incompatibile di gestione delle versioni" #: apt-pkg/pkgcachegen.cc:117 #, c-format -msgid "Error occured while processing %s (NewPackage)" +msgid "Error occurred while processing %s (NewPackage)" msgstr "Errore nell'analisi di %s (NewPackage)" #: apt-pkg/pkgcachegen.cc:129 #, c-format -msgid "Error occured while processing %s (UsePackage1)" +msgid "Error occurred while processing %s (UsePackage1)" msgstr "Errore nell'analisi di %s (UsePackage1)" #: apt-pkg/pkgcachegen.cc:150 #, c-format -msgid "Error occured while processing %s (UsePackage2)" +msgid "Error occurred while processing %s (UsePackage2)" msgstr "Errore nell'analisi di %s (UsePackage2)" #: apt-pkg/pkgcachegen.cc:154 #, c-format -msgid "Error occured while processing %s (NewFileVer1)" +msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Errore nell'analisi di %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:184 #, c-format -msgid "Error occured while processing %s (NewVersion1)" +msgid "Error occurred while processing %s (NewVersion1)" msgstr "Errore nell'analisi di %s (NewVersion1)" #: apt-pkg/pkgcachegen.cc:188 #, c-format -msgid "Error occured while processing %s (UsePackage3)" +msgid "Error occurred while processing %s (UsePackage3)" msgstr "Errore nell'analisi di %s (UsePackage3)" #: apt-pkg/pkgcachegen.cc:192 #, c-format -msgid "Error occured while processing %s (NewVersion2)" +msgid "Error occurred while processing %s (NewVersion2)" msgstr "Errore nell'analisi di %s (NewVersion2)" #: apt-pkg/pkgcachegen.cc:207 @@ -2444,12 +2447,12 @@ msgstr "" #: apt-pkg/pkgcachegen.cc:241 #, c-format -msgid "Error occured while processing %s (FindPkg)" +msgid "Error occurred while processing %s (FindPkg)" msgstr "Errore nell'analisi di %s (FindPkg)" #: apt-pkg/pkgcachegen.cc:254 #, c-format -msgid "Error occured while processing %s (CollectFileProvides)" +msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Errore nell'analisi di %s (CollectFileProvides)" #: apt-pkg/pkgcachegen.cc:260 @@ -2559,7 +2562,7 @@ msgstr "Scansione del disco alla ricerca di file indice, in corso..\n" #: apt-pkg/cdrom.cc:644 #, c-format msgid "Found %i package indexes, %i source indexes and %i signatures\n" -msgstr "" +msgstr "Trovati %i indici di pacchetto, %i indici di sorgenti e %i firme\n" #: apt-pkg/cdrom.cc:701 msgid "That is not a valid name, try again.\n" @@ -2593,22 +2596,22 @@ msgstr "Smontaggio CD-ROM in corso..." #: apt-pkg/indexcopy.cc:261 #, c-format msgid "Wrote %i records.\n" -msgstr "" +msgstr "Scritti %i record.\n" #: apt-pkg/indexcopy.cc:263 #, c-format msgid "Wrote %i records with %i missing files.\n" -msgstr "" +msgstr "Scritti %i record con %i file mancanti.\n" #: apt-pkg/indexcopy.cc:266 #, c-format msgid "Wrote %i records with %i mismatched files\n" -msgstr "" +msgstr "Scritti %i record con %i file senza match\n" #: apt-pkg/indexcopy.cc:269 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" -msgstr "" +msgstr "Scritti %i record con %i file mancanti e %i file senza match\n" #~ msgid "Write Error" #~ msgstr "Errore di Scrittura" @@ -2639,7 +2642,7 @@ msgstr "" #~ msgstr "-> '" #~ msgid "Followed conf file from " -#~ msgstr "Si Ú seguito il file di configurazione da " +#~ msgstr "Si Ú seguito il file di configurazione da " #~ msgid " to " #~ msgstr " a " @@ -2718,9 +2721,7 @@ msgstr "" #~ msgid "" #~ "Unable to locate any package files, perhaps this is not a Debian Disc" -#~ msgstr "" -#~ "Impossibile trovare file di pacchetti, forse questo non Ú un disco " -#~ "Debian" +#~ msgstr "Impossibile trovare file di pacchetti, forse questo non Ú un disco Debian" #~ msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" #~ msgstr "Si prega di dare un nome a questo disco, tipo 'Debian 2.1r1 Disk 1'" @@ -2755,23 +2756,22 @@ msgstr "" #~ msgstr "" #~ "Utilizzo: apt-cdrom [opzioni] comando\n" #~ "\n" -#~ "apt-cdrom Ú un tool per aggiungere CD-ROM alla lista sorgenti di apt. " -#~ "Il\n" +#~ "apt-cdrom Ú un tool per aggiungere CD-ROM alla lista sorgenti di apt. Il\n" #~ "mount point del CDROM e l'informazione della periferica sono presi da apt." #~ "conf\n" #~ "e /etc/fstab.\n" #~ "\n" #~ "Comandi:\n" #~ " add - Aggiunge un CDROM\n" -#~ " ident - riporta l'identità di un CDROM\n" +#~ " ident - riporta l'identità di un CDROM\n" #~ "\n" #~ "Opzioni:\n" #~ " -h Questo help\n" #~ " -d Mount point del CDROM\n" #~ " -r Rinomina un CDROM riconosciuto\n" #~ " -m Nessun montaggio\n" -#~ " -f Modalità veloce, non controlla i file dei pacchetti\n" -#~ " -a Scansione in modalità accurata\n" +#~ " -f Modalità veloce, non controlla i file dei pacchetti\n" +#~ " -a Scansione in modalità accurata\n" #~ " -c=? Legge come configurazione il file specificato\n" #~ " -o=? Imposta un'opzione di configurazione, es -o dir::cache=/tmp\n" #~ "Vedere fstab(5)\n" @@ -2780,11 +2780,10 @@ msgstr "" #~ msgstr "Errore interno, contatori non a zero" #~ msgid "Internal Error, InstallPackages was called with broken packages!" -#~ msgstr "" -#~ "Errore interno, InstallPackages Ú stato chiamato con un pacchetto rotto!" +#~ msgstr "Errore interno, InstallPackages Ú stato chiamato con un pacchetto rotto!" #~ msgid "Internal Error, Ordering didn't finish" -#~ msgstr "Errore interno, l'ordinamento non Ú finito" +#~ msgstr "Errore interno, l'ordinamento non Ú finito" #~ msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" #~ msgstr "" @@ -2853,7 +2852,7 @@ msgstr "" #~ " -s=? file override per i sorgenti.\n" #~ " -q silenzioso\n" #~ " -d=? Seleziona il database opzionale per la cache\n" -#~ " -no-delink Abilita la modalità di debug per il delink\n" +#~ " -no-delink Abilita la modalità di debug per il delink\n" #~ " -contents Generazione file contents di controllo\n" #~ " -c=? Legge come configurazione il file specificato\n" #~ " -o=? Imposta un'opzione di configurazione\n" @@ -2880,7 +2879,7 @@ msgstr "" #~ msgstr " non " #~ msgid "DSC file '%s' is too large!" -#~ msgstr "il file DSC '%s' Ú troppo largo!" +#~ msgstr "il file DSC '%s' Ú troppo largo!" #~ msgid "Could not find a record in the DSC '%s'" #~ msgstr "Impossibile trovare un campo nel DSC '%s'" diff --git a/po/ja.po b/po/ja.po index 42343ecb0..fa9829bb2 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: 2005-03-05 22:10+0100\n" +"POT-Creation-Date: 2005-03-29 07:17+0200\n" "PO-Revision-Date: 2005-02-09 12:54+0900\n" "Last-Translator: Kenshi Muto <kmuto@debian.org>\n" "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n" @@ -324,6 +324,7 @@ msgid "Error processing contents %s" msgstr "Contents %s ν˥顼ȯޤ" #: ftparchive/apt-ftparchive.cc:551 +#, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -362,7 +363,7 @@ msgid "" " --no-delink Enable delinking debug mode\n" " --contents Control contents file generation\n" " -c=? Read this configuration file\n" -" -o=? Set an arbitary configuration option" +" -o=? Set an arbitrary configuration option" msgstr "" "ˡ: apt-ftparchive [ץ] ޥ\n" "ޥ: packages binarypath [overridefile [pathprefix]]\n" @@ -1549,7 +1550,7 @@ msgid "Internal error adding a diversion" msgstr "顼diversion ɲ" #: apt-inst/deb/dpkgdb.cc:383 -msgid "The pkg cache must be initialize first" +msgid "The pkg cache must be initialized first" msgstr "ǽ˥ѥååʤФʤޤ" #: apt-inst/deb/dpkgdb.cc:386 @@ -2382,37 +2383,37 @@ msgstr " #: apt-pkg/pkgcachegen.cc:117 #, c-format -msgid "Error occured while processing %s (NewPackage)" +msgid "Error occurred while processing %s (NewPackage)" msgstr "%s ˥顼ȯޤ (NewPackage)" #: apt-pkg/pkgcachegen.cc:129 #, c-format -msgid "Error occured while processing %s (UsePackage1)" +msgid "Error occurred while processing %s (UsePackage1)" msgstr "%s ˥顼ȯޤ (UsePackage1)" #: apt-pkg/pkgcachegen.cc:150 #, c-format -msgid "Error occured while processing %s (UsePackage2)" +msgid "Error occurred while processing %s (UsePackage2)" msgstr "%s ˥顼ȯޤ (UsePackage2)" #: apt-pkg/pkgcachegen.cc:154 #, c-format -msgid "Error occured while processing %s (NewFileVer1)" +msgid "Error occurred while processing %s (NewFileVer1)" msgstr "%s ˥顼ȯޤ (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:184 #, c-format -msgid "Error occured while processing %s (NewVersion1)" +msgid "Error occurred while processing %s (NewVersion1)" msgstr "%s ˥顼ȯޤ (NewVersion1)" #: apt-pkg/pkgcachegen.cc:188 #, c-format -msgid "Error occured while processing %s (UsePackage3)" +msgid "Error occurred while processing %s (UsePackage3)" msgstr "%s ˥顼ȯޤ (UsePackage3)" #: apt-pkg/pkgcachegen.cc:192 #, c-format -msgid "Error occured while processing %s (NewVersion2)" +msgid "Error occurred while processing %s (NewVersion2)" msgstr "%s ˥顼ȯޤ (NewVersion2)" #: apt-pkg/pkgcachegen.cc:207 @@ -2429,12 +2430,12 @@ msgstr " #: apt-pkg/pkgcachegen.cc:241 #, c-format -msgid "Error occured while processing %s (FindPkg)" +msgid "Error occurred while processing %s (FindPkg)" msgstr "%s ˥顼ȯޤ (FindPkg)" #: apt-pkg/pkgcachegen.cc:254 #, c-format -msgid "Error occured while processing %s (CollectFileProvides)" +msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "%s ˥顼ȯޤ (CollectFileProvides)" #: apt-pkg/pkgcachegen.cc:260 diff --git a/po/ko.po b/po/ko.po index 658d8f4b2..50999a8da 100644 --- a/po/ko.po +++ b/po/ko.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-05 22:10+0100\n" +"POT-Creation-Date: 2005-03-29 07:17+0200\n" "PO-Revision-Date: 2005-02-10 21:56+0900\n" "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n" "Language-Team: Korean <cwryu@debian.org>\n" @@ -319,6 +319,7 @@ msgid "Error processing contents %s" msgstr "%s 컨텐츠를 처리하는 데 오류가 발생했습니다" #: ftparchive/apt-ftparchive.cc:551 +#, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -357,7 +358,7 @@ msgid "" " --no-delink Enable delinking debug mode\n" " --contents Control contents file generation\n" " -c=? Read this configuration file\n" -" -o=? Set an arbitary configuration option" +" -o=? Set an arbitrary configuration option" msgstr "" "사용법: apt-ftparchive [옵션] 명령\n" "명령: packages 바이너리경로 [override파일 [경로앞부분]]\n" @@ -1538,7 +1539,7 @@ msgid "Internal error adding a diversion" msgstr "diversion을 추가하는 데 내부 오류" #: apt-inst/deb/dpkgdb.cc:383 -msgid "The pkg cache must be initialize first" +msgid "The pkg cache must be initialized first" msgstr "꾸러미 캐시를 먼저 초기화해야 합니다" #: apt-inst/deb/dpkgdb.cc:386 @@ -2363,37 +2364,37 @@ msgstr "캐시의 버전 시스템이 호환되지 않습니다" #: apt-pkg/pkgcachegen.cc:117 #, c-format -msgid "Error occured while processing %s (NewPackage)" +msgid "Error occurred while processing %s (NewPackage)" msgstr "%s 처리하는 중에 오류가 발생했습니다 (NewPackage)" #: apt-pkg/pkgcachegen.cc:129 #, c-format -msgid "Error occured while processing %s (UsePackage1)" +msgid "Error occurred while processing %s (UsePackage1)" msgstr "%s 처리하는 중에 오류가 발생했습니다 (UsePackage1)" #: apt-pkg/pkgcachegen.cc:150 #, c-format -msgid "Error occured while processing %s (UsePackage2)" +msgid "Error occurred while processing %s (UsePackage2)" msgstr "%s 처리하는 중에 오류가 발생했습니다 (UsePackage2)" #: apt-pkg/pkgcachegen.cc:154 #, c-format -msgid "Error occured while processing %s (NewFileVer1)" +msgid "Error occurred while processing %s (NewFileVer1)" msgstr "%s 처리하는 중에 오류가 발생했습니다 (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:184 #, c-format -msgid "Error occured while processing %s (NewVersion1)" +msgid "Error occurred while processing %s (NewVersion1)" msgstr "%s 처리하는 중에 오류가 발생했습니다 (NewVersion1)" #: apt-pkg/pkgcachegen.cc:188 #, c-format -msgid "Error occured while processing %s (UsePackage3)" +msgid "Error occurred while processing %s (UsePackage3)" msgstr "%s 처리하는 중에 오류가 발생했습니다 (UsePackage3)" #: apt-pkg/pkgcachegen.cc:192 #, c-format -msgid "Error occured while processing %s (NewVersion2)" +msgid "Error occurred while processing %s (NewVersion2)" msgstr "%s 처리하는 중에 오류가 발생했습니다 (NewVersion2)" #: apt-pkg/pkgcachegen.cc:207 @@ -2410,12 +2411,12 @@ msgstr "와우, 이 APT가 처리할 수 있는 의존성 개수를 넘어갔습 #: apt-pkg/pkgcachegen.cc:241 #, c-format -msgid "Error occured while processing %s (FindPkg)" +msgid "Error occurred while processing %s (FindPkg)" msgstr "%s 처리중에 오류가 발생했습니다 (FindPkg)" #: apt-pkg/pkgcachegen.cc:254 #, c-format -msgid "Error occured while processing %s (CollectFileProvides)" +msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "%s 처리중에 오류가 발생했습니다 (CollectFileProvides)" #: apt-pkg/pkgcachegen.cc:260 diff --git a/po/nb.po b/po/nb.po index 9323f7974..ff8fce4a2 100644 --- a/po/nb.po +++ b/po/nb.po @@ -19,7 +19,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-05 22:10+0100\n" +"POT-Creation-Date: 2005-03-29 07:17+0200\n" "PO-Revision-Date: 2005-02-09 10:45+0100\n" "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n" "Language-Team: Norwegian Bokml <i18n-nb@lister.ping.ui.no>\n" @@ -338,6 +338,7 @@ msgid "Error processing contents %s" msgstr "Det oppsto en feil ved lesing av %s" #: ftparchive/apt-ftparchive.cc:551 +#, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -376,7 +377,7 @@ msgid "" " --no-delink Enable delinking debug mode\n" " --contents Control contents file generation\n" " -c=? Read this configuration file\n" -" -o=? Set an arbitary configuration option" +" -o=? Set an arbitrary configuration option" msgstr "" "Bruk: apt-ftparchive [innstillinger] ordre\n" "Ordrer: packages binrsti [overstyringsfil [sti-prefiks]]\n" @@ -1556,7 +1557,7 @@ msgid "Internal error adding a diversion" msgstr "Det oppsto en intern feil nr avledningen ble lagt til" #: apt-inst/deb/dpkgdb.cc:383 -msgid "The pkg cache must be initialize first" +msgid "The pkg cache must be initialized first" msgstr "Pakkelageret m klargjres frst" #: apt-inst/deb/dpkgdb.cc:386 @@ -2386,37 +2387,37 @@ msgstr "Lageret har et uoverensstemmende versjonssystem" #: apt-pkg/pkgcachegen.cc:117 #, c-format -msgid "Error occured while processing %s (NewPackage)" +msgid "Error occurred while processing %s (NewPackage)" msgstr "Feil oppsto under behandling av %s (NewPackage)" #: apt-pkg/pkgcachegen.cc:129 #, c-format -msgid "Error occured while processing %s (UsePackage1)" +msgid "Error occurred while processing %s (UsePackage1)" msgstr "Feil oppsto under behandling av %s (UsePackage1)" #: apt-pkg/pkgcachegen.cc:150 #, c-format -msgid "Error occured while processing %s (UsePackage2)" +msgid "Error occurred while processing %s (UsePackage2)" msgstr "Feil oppsto under behandling av %s (UsePackage2)" #: apt-pkg/pkgcachegen.cc:154 #, c-format -msgid "Error occured while processing %s (NewFileVer1)" +msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Feil oppsto under behandling av %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:184 #, c-format -msgid "Error occured while processing %s (NewVersion1)" +msgid "Error occurred while processing %s (NewVersion1)" msgstr "Feil oppsto under behandling av %s (NewVersion1)" #: apt-pkg/pkgcachegen.cc:188 #, c-format -msgid "Error occured while processing %s (UsePackage3)" +msgid "Error occurred while processing %s (UsePackage3)" msgstr "Feil oppsto under behandling av %s (UsePackage3)" #: apt-pkg/pkgcachegen.cc:192 #, c-format -msgid "Error occured while processing %s (NewVersion2)" +msgid "Error occurred while processing %s (NewVersion2)" msgstr "Feil oppsto under behandling av %s (NewVersion2)" #: apt-pkg/pkgcachegen.cc:207 @@ -2433,12 +2434,12 @@ msgstr "J #: apt-pkg/pkgcachegen.cc:241 #, c-format -msgid "Error occured while processing %s (FindPkg)" +msgid "Error occurred while processing %s (FindPkg)" msgstr "Feil oppsto under behandling av %s (FindPkg)" #: apt-pkg/pkgcachegen.cc:254 #, c-format -msgid "Error occured while processing %s (CollectFileProvides)" +msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Feil oppsto under behandling av %s (CollectFileProvides)" #: apt-pkg/pkgcachegen.cc:260 diff --git a/po/nl.po b/po/nl.po index 842324c2a..f0b90d9bf 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: 2005-03-05 22:10+0100\n" +"POT-Creation-Date: 2005-03-29 07:17+0200\n" "PO-Revision-Date: 2005-02-10 17:35+0100\n" "Last-Translator: Bart Cornelis <cobaco@linux.be>\n" "Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n" @@ -324,6 +324,7 @@ msgid "Error processing contents %s" msgstr "Fout bij het verwerken van de inhoud van %s" #: ftparchive/apt-ftparchive.cc:551 +#, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -362,7 +363,7 @@ msgid "" " --no-delink Enable delinking debug mode\n" " --contents Control contents file generation\n" " -c=? Read this configuration file\n" -" -o=? Set an arbitary configuration option" +" -o=? Set an arbitrary configuration option" msgstr "" "Gebruik: apt-ftparchive [opties] opdracht\n" "\n" @@ -1564,7 +1565,7 @@ msgid "Internal error adding a diversion" msgstr "Interne fout bij het toevoegen van een omleiding" #: apt-inst/deb/dpkgdb.cc:383 -msgid "The pkg cache must be initialize first" +msgid "The pkg cache must be initialized first" msgstr "De pakketcache dient eerst genitialiseerd te zijn" #: apt-inst/deb/dpkgdb.cc:386 @@ -2408,37 +2409,37 @@ msgstr "Cache heeft een niet-compatibel versienummeringssysteem" #: apt-pkg/pkgcachegen.cc:117 #, c-format -msgid "Error occured while processing %s (NewPackage)" +msgid "Error occurred while processing %s (NewPackage)" msgstr "Fout tijdens verwerken van %s (NewPackage)" #: apt-pkg/pkgcachegen.cc:129 #, c-format -msgid "Error occured while processing %s (UsePackage1)" +msgid "Error occurred while processing %s (UsePackage1)" msgstr "Fout tijdens verwerken van %s (UsePackage1)" #: apt-pkg/pkgcachegen.cc:150 #, c-format -msgid "Error occured while processing %s (UsePackage2)" +msgid "Error occurred while processing %s (UsePackage2)" msgstr "Fout tijdens verwerken van %s (UsePackage2)" #: apt-pkg/pkgcachegen.cc:154 #, c-format -msgid "Error occured while processing %s (NewFileVer1)" +msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Fout tijdens verwerken van %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:184 #, c-format -msgid "Error occured while processing %s (NewVersion1)" +msgid "Error occurred while processing %s (NewVersion1)" msgstr "Fout tijdens verwerken van %s (NewVersion1)" #: apt-pkg/pkgcachegen.cc:188 #, c-format -msgid "Error occured while processing %s (UsePackage3)" +msgid "Error occurred while processing %s (UsePackage3)" msgstr "Fout tijdens verwerken van %s (UsePackage3)" #: apt-pkg/pkgcachegen.cc:192 #, c-format -msgid "Error occured while processing %s (NewVersion2)" +msgid "Error occurred while processing %s (NewVersion2)" msgstr "Fout tijdens verwerken van %s (NewVersion2)" #: apt-pkg/pkgcachegen.cc:207 @@ -2455,12 +2456,12 @@ msgstr "Wauw, u heeft meer afhankelijkheden dan deze APT aankan." #: apt-pkg/pkgcachegen.cc:241 #, c-format -msgid "Error occured while processing %s (FindPkg)" +msgid "Error occurred while processing %s (FindPkg)" msgstr "Fout tijdens verwerken van %s (FindPkg)" #: apt-pkg/pkgcachegen.cc:254 #, c-format -msgid "Error occured while processing %s (CollectFileProvides)" +msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Fout tijdens verwerken van %s (CollectFileProvides)" #: apt-pkg/pkgcachegen.cc:260 diff --git a/po/nn.po b/po/nn.po index 8419e51c1..4284ac7cd 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: 2005-03-05 22:10+0100\n" +"POT-Creation-Date: 2005-03-29 07:17+0200\n" "PO-Revision-Date: 2005-02-14 23:30+0100\n" "Last-Translator: Hvard Korsvoll <korsvoll@skulelinux.no>\n" "Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n" @@ -325,6 +325,7 @@ msgid "Error processing contents %s" msgstr "Feil ved lesing av %s" #: ftparchive/apt-ftparchive.cc:551 +#, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -363,7 +364,7 @@ msgid "" " --no-delink Enable delinking debug mode\n" " --contents Control contents file generation\n" " -c=? Read this configuration file\n" -" -o=? Set an arbitary configuration option" +" -o=? Set an arbitrary configuration option" msgstr "" "Bruk: apt-ftparchive [val] kommando\n" "Kommandoar: packages binrstig [overstyringsfil [stigprefiks]]\n" @@ -1540,7 +1541,7 @@ msgid "Internal error adding a diversion" msgstr "Intern feil ved tilleggjing av avleiing" #: apt-inst/deb/dpkgdb.cc:383 -msgid "The pkg cache must be initialize first" +msgid "The pkg cache must be initialized first" msgstr "Pakkelageret m frst klargjerast" #: apt-inst/deb/dpkgdb.cc:386 @@ -2369,37 +2370,37 @@ msgstr "Mellomlageret brukar eit inkompatibelt versjonssystem" #: apt-pkg/pkgcachegen.cc:117 #, c-format -msgid "Error occured while processing %s (NewPackage)" +msgid "Error occurred while processing %s (NewPackage)" msgstr "Feil ved behandling av %s (NewPackage)" #: apt-pkg/pkgcachegen.cc:129 #, c-format -msgid "Error occured while processing %s (UsePackage1)" +msgid "Error occurred while processing %s (UsePackage1)" msgstr "Feil ved behandling av %s (UsePackage1)" #: apt-pkg/pkgcachegen.cc:150 #, c-format -msgid "Error occured while processing %s (UsePackage2)" +msgid "Error occurred while processing %s (UsePackage2)" msgstr "Feil ved behandling av %s (UsePackage2)" #: apt-pkg/pkgcachegen.cc:154 #, c-format -msgid "Error occured while processing %s (NewFileVer1)" +msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Feil ved behandling av %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:184 #, c-format -msgid "Error occured while processing %s (NewVersion1)" +msgid "Error occurred while processing %s (NewVersion1)" msgstr "Feil ved behandling av %s (NewVersion1)" #: apt-pkg/pkgcachegen.cc:188 #, c-format -msgid "Error occured while processing %s (UsePackage3)" +msgid "Error occurred while processing %s (UsePackage3)" msgstr "Feil ved behandling av %s (UsePackage3)" #: apt-pkg/pkgcachegen.cc:192 #, c-format -msgid "Error occured while processing %s (NewVersion2)" +msgid "Error occurred while processing %s (NewVersion2)" msgstr "Feil ved behandling av %s (NewVersion2)" #: apt-pkg/pkgcachegen.cc:207 @@ -2416,12 +2417,12 @@ msgstr "J #: apt-pkg/pkgcachegen.cc:241 #, c-format -msgid "Error occured while processing %s (FindPkg)" +msgid "Error occurred while processing %s (FindPkg)" msgstr "Feil ved behandling av %s (FindPkg)" #: apt-pkg/pkgcachegen.cc:254 #, c-format -msgid "Error occured while processing %s (CollectFileProvides)" +msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Feil ved behandling av %s (CollectFileProvides)" #: apt-pkg/pkgcachegen.cc:260 diff --git a/po/pl.po b/po/pl.po index fb351d4f5..26a5239b7 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: 2005-03-05 22:10+0100\n" +"POT-Creation-Date: 2005-03-29 07:17+0200\n" "PO-Revision-Date: 2005-02-11 11:47+0100\n" "Last-Translator: Bartosz Fenski <fenio@debian.org>\n" "Language-Team: Polish <pddp@debian.linux.org.pl>\n" @@ -325,6 +325,7 @@ msgid "Error processing contents %s" msgstr "Bd przy przetwarzaniu zawartoci %s" #: ftparchive/apt-ftparchive.cc:551 +#, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -363,7 +364,7 @@ msgid "" " --no-delink Enable delinking debug mode\n" " --contents Control contents file generation\n" " -c=? Read this configuration file\n" -" -o=? Set an arbitary configuration option" +" -o=? Set an arbitrary configuration option" msgstr "" "Uycie: apt-ftparchive [opcje] polecenie\n" "Polecenia: packages cieka_do_binariw [plik_override [przedrostek]]\n" @@ -1551,7 +1552,7 @@ msgid "Internal error adding a diversion" msgstr "Bd wewntrzny przy dodawaniu objazdu" #: apt-inst/deb/dpkgdb.cc:383 -msgid "The pkg cache must be initialize first" +msgid "The pkg cache must be initialized first" msgstr "Magazyn podrczny pakietw musi wczeniej zosta zainicjalizowany" #: apt-inst/deb/dpkgdb.cc:386 @@ -2379,37 +2380,37 @@ msgstr "Magazyn podr #: apt-pkg/pkgcachegen.cc:117 #, c-format -msgid "Error occured while processing %s (NewPackage)" +msgid "Error occurred while processing %s (NewPackage)" msgstr "Wystpi bd przy przetwarzaniu %s (NewPackage)" #: apt-pkg/pkgcachegen.cc:129 #, c-format -msgid "Error occured while processing %s (UsePackage1)" +msgid "Error occurred while processing %s (UsePackage1)" msgstr "Wystpi bd przy przetwarzaniu %s (UsePackage1)" #: apt-pkg/pkgcachegen.cc:150 #, c-format -msgid "Error occured while processing %s (UsePackage2)" +msgid "Error occurred while processing %s (UsePackage2)" msgstr "Wystpi bd przy przetwarzaniu %s (UsePackage2)" #: apt-pkg/pkgcachegen.cc:154 #, c-format -msgid "Error occured while processing %s (NewFileVer1)" +msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Wystpi bd przy przetwarzaniu %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:184 #, c-format -msgid "Error occured while processing %s (NewVersion1)" +msgid "Error occurred while processing %s (NewVersion1)" msgstr "Wystpi bd przy przetwarzaniu %s (NewVersion1)" #: apt-pkg/pkgcachegen.cc:188 #, c-format -msgid "Error occured while processing %s (UsePackage3)" +msgid "Error occurred while processing %s (UsePackage3)" msgstr "Wystpi bd przy przetwarzaniu %s (UsePackage3)" #: apt-pkg/pkgcachegen.cc:192 #, c-format -msgid "Error occured while processing %s (NewVersion2)" +msgid "Error occurred while processing %s (NewVersion2)" msgstr "Wystpi bd przy przetwarzaniu %s (NewVersion2)" #: apt-pkg/pkgcachegen.cc:207 @@ -2430,12 +2431,12 @@ msgstr "" #: apt-pkg/pkgcachegen.cc:241 #, c-format -msgid "Error occured while processing %s (FindPkg)" +msgid "Error occurred while processing %s (FindPkg)" msgstr "Wystpi bd przy przetwarzaniu %s (FindPkg)" #: apt-pkg/pkgcachegen.cc:254 #, c-format -msgid "Error occured while processing %s (CollectFileProvides)" +msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Wystpi bd przy przetwarzaniu %s (CollectFileProvides)" #: apt-pkg/pkgcachegen.cc:260 diff --git a/po/pt.po b/po/pt.po index ed0f50cd2..21912759b 100644 --- a/po/pt.po +++ b/po/pt.po @@ -1,13 +1,13 @@ # Debian-PT translation for apt. # Copyright (C) 2004 Free Software Foundation, Inc. # Miguel Figueiredo <elmig@debianpt.org>, 2003. -# 10-02-2005 - Miguel Figueiredo <elmig@debianpt.org> - Transaleted new msgs and new fuzzys (8f17u). +# 2005-03-07 - Miguel Figueiredo <elmig@debianpt.org> - Fxed 1 new fuzzy. msgid "" msgstr "" -"Project-Id-Version: apt 0.6\n" +"Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-05 22:10+0100\n" -"PO-Revision-Date: 2005-02-18 23:27+0000\n" +"POT-Creation-Date: 2005-03-29 07:17+0200\n" +"PO-Revision-Date: 2005-03-07 22:20+0000\n" "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n" "Language-Team: Portuguese <traduz@debianpt.org>\n" "MIME-Version: 1.0\n" @@ -40,7 +40,7 @@ msgstr " Pacotes Puramente Virtuais: " #: cmdline/apt-cache.cc:274 msgid " Single virtual packages: " -msgstr " Pacotes Virtuais Individuais: " +msgstr " Pacotes Virtuais Únicos: " #: cmdline/apt-cache.cc:275 msgid " Mixed virtual packages: " @@ -102,7 +102,7 @@ msgstr "Ficheiros de Pacotes :" #: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" -"A cache está dessincronizada, não pode x-referênciar um ficheiro de pacote" +"a cache está dessíncronizada, não pode x-referênciar um ficheiro de pacote" #: cmdline/apt-cache.cc:1470 #, c-format @@ -204,14 +204,14 @@ msgstr "" " add - Adiciona um ficheiro de pacote à cache de fontes\n" " gencaches - Constrói ambas as caches de pacotes e de fontes\n" " showpkg - Mostra informações gerais sobre um pacote\n" -" showsrc - Mostra registos de fontes\n" +" showsrc - Mostra registros de fontes\n" " stats - Mostra estatísticas básicas\n" " dump - Mostra o ficheiro inteiro de forma concisa\n" -" dumpavail - Mostra um ficheiro disponível para stdout\n" +" dumpavail - Imprime um ficheiro disponível para stdout\n" " unmet - Mostra dependências não satisfeitas\n" -" search - Procura na lista de pacotes por um padrão regex\n" +" search - Procura na lista de pacotes por um pattern regex\n" " show - Mostra um registro legível sobre o pacote\n" -" depends - Mostra informações em bruto de dependências dum pacote\n" +" depends - Mostra informações em bruto de dependências de um pacote\n" " pkgnames - Lista o nome de todos os pacotes\n" " dotty - Gera gráficos de pacotes para o GraphVis\n" " xvcg - Gera gráficos de pacotes para o xvcg\n" @@ -229,7 +229,7 @@ msgstr "" #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" -msgstr "Os argumentos não estão em pares" +msgstr "Argumentos não estão em pares" #: cmdline/apt-config.cc:76 msgid "" @@ -280,8 +280,8 @@ msgid "" msgstr "" "Utilização: apt-extracttemplates ficheiro1 [ficheiro2 ...]\n" "\n" -"O apt-extracttemplates é uma ferramenta para extrair a informação\n" -"de configuração e de template de pacotes debian.\n" +"O apt-extracttemplates é uma ferramenta para extrair configuração\n" +"e informação de template de pacotes debian.\n" "\n" "Opções:\n" " -h Este texto de ajuda\n" @@ -307,7 +307,7 @@ msgstr "Lista de extensão de pacotes é demasiado longa" #: ftparchive/apt-ftparchive.cc:266 ftparchive/apt-ftparchive.cc:288 #, c-format msgid "Error processing directory %s" -msgstr "Erro ao processar o directório %s" +msgstr "Erro processando o directório %s" #: ftparchive/apt-ftparchive.cc:250 msgid "Source extension list is too long" @@ -361,7 +361,7 @@ msgid "" " --no-delink Enable delinking debug mode\n" " --contents Control contents file generation\n" " -c=? Read this configuration file\n" -" -o=? Set an arbitary configuration option" +" -o=? Set an arbitrary configuration option" msgstr "" "Utilização: apt-ftparchive [opções] comando\n" "Comandos: packages caminho_binário [ficheiro_override [prefixo_caminho]]\n" @@ -372,7 +372,7 @@ msgstr "" " clean config\n" "\n" "O apt-ftparchive gera ficheiros de índice para repositórios Debian. Ele \n" -"suporta muitos estilos de criação, desde totalmente automatizadas até \n" +"suporta muitos estilos de criação, desde totalmente automatizados até \n" "substitutos funcionais para o dpkg-scanpackages e dpkg-scansources\n" "\n" "O apt-ftparchive gera ficheiros Packages a partir de uma árvore de .debs.\n" @@ -385,23 +385,23 @@ msgstr "" "especificar um ficheiro override de fontes\n" "\n" "Os comandos 'packages' e 'sources' devem ser executados na raíz da \n" -"árvore. CaminhoBinário deve apontar para a base da procura recursiva \n" +"árvore. CaminhoBinário deve apontar para a base de procura recursiva \n" "e o ficheiro override deve conter as flags override. CaminhoPrefixo é \n" -"incluído aos campos filename caso esteja presente. Exemplo de uso \n" -"a partir do repositório Debian :\n" +"incluído aos campos filename caso esteja presente. Exemplo de uso do \n" +"repositório Debian :\n" " apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" " dists/potato/main/binary-i386/Packages\n" "\n" "Opções:\n" -" -h Este texto de ajuda\n" -" --md5 Controla a criação do MD5\n" -" -s=? Ficheiro override de código-fonte \n" -" -q Quieto\n" -" -d=? Selecciona a base de dados de caching opcional\n" -" --no-delink Habilita o modo de debug delinking\n" -" --contents Controla a criação do ficheiro de conteúdo\n" -" -c=? Lê este ficheiro de configuração\n" -" -o=? Define uma opção de configuração arbitrária" +" -h Este texto de ajuda\n" +" --md5 Controla a criação do MD5\n" +" -s=? Ficheiro override de código-fonte \n" +" -q Quieto\n" +" -d=? Selecciona a base de dados de caching opcional\n" +" --no-delink Habilita o modo de debug delinking\n" +" --contents Controla a criação do ficheiro de conteúdo\n" +" -c=? Lê este ficheiro de configuração\n" +" -o=? Define uma opção de configuração arbitrária" #: ftparchive/apt-ftparchive.cc:757 msgid "No selections matched" @@ -410,17 +410,17 @@ msgstr "Nenhuma selecção coincidiu" #: ftparchive/apt-ftparchive.cc:830 #, c-format msgid "Some files are missing in the package file group `%s'" -msgstr "Faltam alguns ficheiros no grupo de ficheiros de pacotes `%s'" +msgstr "Alguns ficheiros faltam no ficheiro de grupo de pacotes `%s'" #: ftparchive/cachedb.cc:45 #, c-format msgid "DB was corrupted, file renamed to %s.old" -msgstr "A DB estava corrompida, ficheiro renomeado para %s.old" +msgstr "A base de dados estava corrompida, ficheiro renomeado para %s.old" #: ftparchive/cachedb.cc:63 #, c-format msgid "DB is old, attempting to upgrade %s" -msgstr "DB é antiga, a tentar uma actualização %s" +msgstr "DB é antiga, tentando uma actualização %s" #: ftparchive/cachedb.cc:73 #, c-format @@ -430,11 +430,11 @@ msgstr "Não foi possível abrir o ficheiro DB %s: %s" #: ftparchive/cachedb.cc:114 #, c-format msgid "File date has changed %s" -msgstr "Mudou a data do ficheiro %s" +msgstr "Data do ficheiro mudou %s" #: ftparchive/cachedb.cc:155 msgid "Archive has no control record" -msgstr "O arquivo não tem registo de controle" +msgstr "O arquivo não tem registro de controle" #: ftparchive/cachedb.cc:267 msgid "Unable to get a cursor" @@ -448,7 +448,7 @@ msgstr "W: Não foi possível ler o directório %s\n" #: ftparchive/writer.cc:84 #, c-format msgid "W: Unable to stat %s\n" -msgstr "W: Não foi possível stat %s\n" +msgstr "W: Não foi possível fazer stat %s\n" #: ftparchive/writer.cc:126 msgid "E: " @@ -469,12 +469,12 @@ msgstr "Falha ao resolver %s" #: ftparchive/writer.cc:164 msgid "Tree walking failed" -msgstr "Falhou percorrer a árvore" +msgstr "Falhou ao percorrer a árvore" #: ftparchive/writer.cc:189 #, c-format msgid "Failed to open %s" -msgstr "Falhou abrir %s" +msgstr "Falhou ao abrir %s" #: ftparchive/writer.cc:246 #, c-format @@ -505,11 +505,11 @@ msgstr " Limite DeLink de %sB atingido.\n" #: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 #, c-format msgid "Failed to stat %s" -msgstr "Falha executar stat %s" +msgstr "Falha ao executar stat %s" #: ftparchive/writer.cc:378 msgid "Archive had no package field" -msgstr "Arquivo não possuía campo package" +msgstr "Arquivo não possuía campo pacote" #: ftparchive/writer.cc:386 ftparchive/writer.cc:595 #, c-format @@ -528,7 +528,7 @@ msgstr "Erro Interno, não foi possível localizar o membro %s" #: ftparchive/contents.cc:353 ftparchive/contents.cc:384 msgid "realloc - Failed to allocate memory" -msgstr "realloc - Falhou alocar memória" +msgstr "realloc - Falha ao alocar memória" #: ftparchive/override.cc:38 ftparchive/override.cc:146 #, c-format @@ -584,15 +584,15 @@ msgstr "Compactar Filho" #: ftparchive/multicompress.cc:238 #, c-format msgid "Internal error, failed to create %s" -msgstr "Erro Interno, Falhou criar %s" +msgstr "Erro Interno, Falha ao criar %s" #: ftparchive/multicompress.cc:289 msgid "Failed to create subprocess IPC" -msgstr "Falhou criar subprocesso IPC" +msgstr "Falha ao criar subprocesso IPC" #: ftparchive/multicompress.cc:324 msgid "Failed to exec compressor " -msgstr "Falhou executar compressor " +msgstr "Falha ao executar compressor " #: ftparchive/multicompress.cc:363 msgid "decompressor" @@ -600,11 +600,11 @@ msgstr "descompactador" #: ftparchive/multicompress.cc:406 msgid "IO to subprocess/file failed" -msgstr "Falhou IO para subprocesso/arquivo" +msgstr "IO para subprocesso/arquivo falhou" #: ftparchive/multicompress.cc:458 msgid "Failed to read while computing MD5" -msgstr "Falhou a leitura durante o cálculo de MD5" +msgstr "Falha ao ler durante o cálculo de MD5" #: ftparchive/multicompress.cc:475 #, c-format @@ -614,7 +614,7 @@ msgstr "Problema ao executar unlinking %s" #: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 #, c-format msgid "Failed to rename %s to %s" -msgstr "Falhou renomear %s para %s" +msgstr "Falha ao renomear %s para %s" #: cmdline/apt-get.cc:118 msgid "Y" @@ -669,7 +669,7 @@ msgstr "Os seguintes pacotes serão REMOVIDOS:" #: cmdline/apt-get.cc:421 msgid "The following packages have been kept back:" -msgstr "Os seguintes pacotes serão mantidos nas suas versões actuais:" +msgstr "Os seguintes pacotes serão mantidos em suas versões actuais:" #: cmdline/apt-get.cc:442 msgid "The following packages will be upgraded:" @@ -700,7 +700,7 @@ msgstr "" #: cmdline/apt-get.cc:575 #, c-format msgid "%lu upgraded, %lu newly installed, " -msgstr "%lu actualizados, %lu novos instalados, " +msgstr "%lu pacotes actualizados, %lu pacotes novos instalados, " #: cmdline/apt-get.cc:579 #, c-format @@ -720,11 +720,11 @@ msgstr "%lu a remover e %lu não actualizados.\n" #: cmdline/apt-get.cc:587 #, c-format msgid "%lu not fully installed or removed.\n" -msgstr "%lu não totalmente instalados ou removidos.\n" +msgstr "%lu pacotes não totalmente instalados ou removidos.\n" #: cmdline/apt-get.cc:647 msgid "Correcting dependencies..." -msgstr "A corrigir dependências..." +msgstr "Corrigindo dependências..." #: cmdline/apt-get.cc:650 msgid " failed." @@ -764,7 +764,7 @@ msgstr "Alguns pacotes não poderam ser autenticados" #: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855 msgid "There are problems and -y was used without --force-yes" -msgstr "Existem problemas e -y foi usado sem --force-yes" +msgstr "Há problemas e -y foi usado sem --force-yes" #: cmdline/apt-get.cc:762 msgid "Packages need to be removed but remove is disabled." @@ -782,12 +782,12 @@ msgstr "A lista de fontes não pôde ser lida." #: cmdline/apt-get.cc:818 #, c-format msgid "Need to get %sB/%sB of archives.\n" -msgstr "É necessário obter %sB/%sB de arquivos.\n" +msgstr "É necessário fazer o download de %sB/%sB de arquivos.\n" #: cmdline/apt-get.cc:821 #, c-format msgid "Need to get %sB of archives.\n" -msgstr "É necessário obter %sB de arquivos.\n" +msgstr "É necessário fazer o download de %sB de arquivos.\n" #: cmdline/apt-get.cc:826 #, c-format @@ -807,7 +807,7 @@ msgstr "Você não possui espaço livre suficiente em %s." #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881 msgid "Trivial Only specified but this is not a trivial operation." -msgstr "Especificado Trivial Only mas essa não é uma operação trivial." +msgstr "Trivial Only especificado mas essa não é uma operação trivial." #: cmdline/apt-get.cc:863 msgid "Yes, do as I say!" @@ -826,7 +826,7 @@ msgstr "" #: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890 msgid "Abort." -msgstr "Abortar." +msgstr "Abortado." #: cmdline/apt-get.cc:886 msgid "Do you want to continue [Y/n]? " @@ -868,7 +868,7 @@ msgstr "Abortando a Instalação." #: cmdline/apt-get.cc:1026 #, c-format msgid "Note, selecting %s instead of %s\n" -msgstr "Note, seleccionando %s em vez de %s\n" +msgstr "Nota, seleccionando %s em vez de %s\n" #: cmdline/apt-get.cc:1036 #, c-format @@ -917,8 +917,8 @@ msgstr "O pacote %s não tem candidato para instalação" #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" -"A reinstalação de %s não é possível, não pode ser feito o download do " -"mesmo.\n" +"A reinstalação de %s não é possível, o download do mesmo não pode ser " +"feito.\n" #: cmdline/apt-get.cc:1137 #, c-format @@ -968,11 +968,11 @@ msgstr "Impossível encontrar o pacote %s" #: cmdline/apt-get.cc:1485 #, c-format msgid "Note, selecting %s for regex '%s'\n" -msgstr "Note, a seleccionar %s para a expressão regular '%s'\n" +msgstr "Nota, seleccionando %s para a expressão regular '%s'\n" #: cmdline/apt-get.cc:1515 msgid "You might want to run `apt-get -f install' to correct these:" -msgstr "Você deve querer executar `apt-get -f install' para corrigir estes:" +msgstr "Você deve querer executar `apt-get -f install' para corrigir isto:" #: cmdline/apt-get.cc:1518 msgid "" @@ -991,7 +991,7 @@ msgid "" msgstr "" "Alguns pacotes não puderam ser instalados. Isso pode significar que\n" "você solicitou uma situação impossível ou se você está a usar a\n" -"distribuição unstable, que alguns pacotes necessários ainda não foram \n" +"distribuição instável, que alguns pacotes requesitados ainda não foram \n" "criados ou foram tirados do Incoming." #: cmdline/apt-get.cc:1538 @@ -1000,9 +1000,10 @@ msgid "" "the package is simply not installable and a bug report against\n" "that package should be filed." msgstr "" -"Já que você requisitou uma única operação e é extremamanete provável que o \n" -"pacote esteja simplesmente num estado não instalável deve ser preenchido \n" -"um relatório de bug sobre este pacote." +"Já que você requisitou uma única operação é extremamanete provável que o \n" +"pacote esteja simplesmente não instalável e deve ser enviado um relatório " +"de\n" +"bug sobre esse pacote." #: cmdline/apt-get.cc:1543 msgid "The following information may help to resolve the situation:" @@ -1010,7 +1011,7 @@ msgstr "A seguinte informação pode ajudar a resolver a situação:" #: cmdline/apt-get.cc:1546 msgid "Broken packages" -msgstr "Pacotes com problemas" +msgstr "Pacotes estragados" #: cmdline/apt-get.cc:1572 msgid "The following extra packages will be installed:" @@ -1026,7 +1027,7 @@ msgstr "Pacotes recomendados :" #: cmdline/apt-get.cc:1664 msgid "Calculating upgrade... " -msgstr "A Calcular a Actualização... " +msgstr "Calculando Actualização... " #: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99 msgid "Failed" @@ -1034,11 +1035,12 @@ msgstr "Falhou" #: cmdline/apt-get.cc:1672 msgid "Done" -msgstr "Feito" +msgstr "Pronto" #: cmdline/apt-get.cc:1845 msgid "Must specify at least one package to fetch source for" -msgstr "Deve especificar pelo menos um pacote para obter o código fonte" +msgstr "" +"Deve-se especificar pelo menos um pacote para que se obtenha o código fonte" #: cmdline/apt-get.cc:1872 cmdline/apt-get.cc:2079 #, c-format @@ -1053,12 +1055,12 @@ msgstr "Você não possui espaço livre suficiente em %s" #: cmdline/apt-get.cc:1924 #, c-format msgid "Need to get %sB/%sB of source archives.\n" -msgstr "É necessário obter %sB/%sB de arquivos de código fonte.\n" +msgstr "Preciso obter %sB/%sB de arquivos de código fonte.\n" #: cmdline/apt-get.cc:1927 #, c-format msgid "Need to get %sB of source archives.\n" -msgstr "É necessário obter %sB de arquivos de código fonte.\n" +msgstr "Precisa obter %sB de arquivos de código fonte.\n" #: cmdline/apt-get.cc:1933 #, c-format @@ -1067,23 +1069,23 @@ msgstr "Obter Código Fonte %s\n" #: cmdline/apt-get.cc:1964 msgid "Failed to fetch some archives." -msgstr "Falhou obter alguns arquivos." +msgstr "Falha ao obter alguns arquivos." #: cmdline/apt-get.cc:1992 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -"A saltar a descompactação de pacote código fonte já descompactado em %s\n" +"Saltando a descompactação de pacote código fonte já descompactado em %s\n" #: cmdline/apt-get.cc:2004 #, c-format msgid "Unpack command '%s' failed.\n" -msgstr "Falhou o comando de descompactação '%s'.\n" +msgstr "O comando de descompactação '%s' falhou.\n" #: cmdline/apt-get.cc:2021 #, c-format msgid "Build command '%s' failed.\n" -msgstr "Falhou o comando de compilação '%s'.\n" +msgstr "O comando de compilação '%s' falhou.\n" #: cmdline/apt-get.cc:2040 msgid "Child process failed" @@ -1111,8 +1113,8 @@ msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -"a dependência %s para %s não pôde ser satisfeita porque o pacote %s não pôde " -"ser encontrado" +"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:2208 #, c-format @@ -1120,28 +1122,29 @@ msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" -"a dependência de %s para %s não pode ser satisfeita porque nenhuma versão " -"disponível do pacote %s pode satisfazer os requesitos da versão" +"a dependência de %s por %s não pode ser satisfeita porque nenhuma versão " +"disponível do pacote %s pode satisfazer os requesitos de versão" #: cmdline/apt-get.cc:2243 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -"Falhou satisfazer a dependência %s para %s: Pacote instalado %s é muito novo" +"Falha ao satisfazer a dependência %s para %s: Pacote instalado %s é muito " +"novo" #: cmdline/apt-get.cc:2268 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" -msgstr "Falhou satisfazer a dependência %s para %s: %s" +msgstr "Falha ao satisfazer a dependência %s para %s: %s" #: cmdline/apt-get.cc:2282 #, c-format msgid "Build-dependencies for %s could not be satisfied." -msgstr "Não puderam ser satisfeitas as dependências de compilação para %s." +msgstr "Não foi possível satisfazer as dependências de compilação para %s." #: cmdline/apt-get.cc:2286 msgid "Failed to process build dependencies" -msgstr "Falhou processar as dependências de compilação" +msgstr "Falha ao processar as dependências de compilação" #: cmdline/apt-get.cc:2318 msgid "Supported modules:" @@ -1193,8 +1196,7 @@ msgstr "" " apt-get [opções] source pacote1 [pacote2 ...]\n" "\n" "O apt-get é um interface simples de linha de comando para fazer o\n" -"download de pacotes e os instalar. Os comandos mais frequentemente " -"utilizados\n" +"download de pacotes e instalá-los. Os comandos usados mais frequentemente\n" "são o update e install\n" "\n" "Comandos:\n" @@ -1203,10 +1205,10 @@ msgstr "" " install - Instala novos pacotes (um pacote é libc6 e não libc6.deb)\n" " remove - Remove um pacote\n" " source - Faz o download de arquivos de código fonte\n" -" build-dep - Configura as dependências de compilação de pacotes de código " +" build-dep - Configura as dependências de compilação de pacotes código " "fonte\n" " dist-upgrade - Actualiza a distribuição, consulte apt-get(8)\n" -" dselect-upgrade - Segue as selecções feitas pelo dselect\n" +" dselect-upgrade - Segue as selecções feitas do dselect\n" " clean - Apaga arquivos obtidos para instalação\n" " autoclean - Apaga arquivos antigos obtidos para instalação\n" " check - Verifica se não há dependências erradas\n" @@ -1215,11 +1217,11 @@ msgstr "" " -h Este texto de ajuda\n" " -q Saída para log, excepto para erros\n" " -qq Sem saída, excepto para erros\n" -" -d Fazer apenas o download - NÃO instalar ou descompactar arquivos\n" +" -d Fazer o download apenas - NÃO instalar ou descompactar arquivos\n" " -s Não-agir. Executar simulação de ordenação\n" " -y Assumir Sim para todas as perguntas, sem pedir confirmação\n" " -f Tenta continuar se a verificação de integridade falhar\n" -" -m Tenta continuar se os arquivos não poderem ser encontrados\n" +" -m Tenta continuar se os arquivos não poderem ser localizados\n" " -u Mostra uma lista também de pacotes actualizados\n" " -b Compila o pacote fonte depois de fazer o download\n" " -c=? Ler este arquivo de configuração\n" @@ -1231,7 +1233,7 @@ msgstr "" #: cmdline/acqprogress.cc:55 msgid "Hit " -msgstr "Obtido " +msgstr "Atingido " #: cmdline/acqprogress.cc:79 msgid "Get:" @@ -1253,7 +1255,7 @@ msgstr "Obtidos %sB em %s (%sB/s)\n" #: cmdline/acqprogress.cc:225 #, c-format msgid " [Working]" -msgstr " [A Trabalhar]" +msgstr " [Trabalhando]" #: cmdline/acqprogress.cc:271 #, c-format @@ -1264,7 +1266,7 @@ msgid "" msgstr "" "Troca de mídia: Por favor insira o disco chamado\n" " '%s'\n" -"na drive '%s' e carregue em enter\n" +"na drive '%s' e pressione enter\n" #: cmdline/apt-sortpkgs.cc:86 msgid "Unknown package record!" @@ -1285,8 +1287,8 @@ msgid "" msgstr "" "Utilização: apt-sortpkgs [opções] ficheiro1 [ficheiro2 ...]\n" "\n" -"O apt-sortpkgs é uma ferramenta simples para ordenar ficheiros de pacotes.\n" -"A opção -s é usada para indicar qual é o tipo de ficheiro.\n" +"O apt-sortpkgs é uma ferramenta simples para ordenar ficheiros de pacote.\n" +"A opção -s é usada para indicar que tipo de ficheiro é.\n" "\n" "Opções:\n" " -h Este texto de ajuda\n" @@ -1296,34 +1298,33 @@ msgstr "" #: dselect/install:32 msgid "Bad default setting!" -msgstr "Configuração por omissão Errada!" +msgstr "Configuração padrão Errada!" #: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 #: dselect/install:104 dselect/update:45 msgid "Press enter to continue." -msgstr "Carregue em enter para continuar." +msgstr "Pressione enter para continuar." # Note to translators: The following four messages belong together. It doesn't # matter where sentences start, but it has to fit in just these four lines, and # at only 80 characters per line, if possible. #: dselect/install:100 msgid "Some errors occurred while unpacking. I'm going to configure the" -msgstr "Alguns erros ocorreram ao descompactar. Irei configurar os " +msgstr "Alguns erros ocorreram ao descompactar. Irei configurar os pacotes" #: dselect/install:101 msgid "packages that were installed. This may result in duplicate errors" -msgstr "pacotes que foram instalados. Isto pode resultar em erros duplicados" +msgstr "que foram instalados. Isto pode resultar em erros duplicados" #: dselect/install:102 msgid "or errors caused by missing dependencies. This is OK, only the errors" -msgstr "" -"os erros causados por dependências em falta. Isto está OK, somente os erros" +msgstr "causados por dependências em falta. Isto está OK, somente os erros" #: dselect/install:103 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" -"acima desta mensagem são importantes. Por favor corriga-os e execute [I]" +"acima desta mensagem são importantes. Por favor resolva-os e execute [I]" "nstalar novamente" #: dselect/update:30 @@ -1332,11 +1333,11 @@ msgstr "Juntando informação Disponível" #: apt-inst/contrib/extracttar.cc:117 msgid "Failed to create pipes" -msgstr "Falhou criar pipes" +msgstr "Falha ao criar pipes" #: apt-inst/contrib/extracttar.cc:143 msgid "Failed to exec gzip " -msgstr "Falhou executar gzip " +msgstr "Falha ao executar gzip " #: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 msgid "Corrupted archive" @@ -1369,7 +1370,7 @@ msgstr "Arquivo é demasiado pequeno" #: apt-inst/contrib/arfile.cc:135 msgid "Failed to read the archive headers" -msgstr "Falhou a leitura dos cabeçalhos do arquivo" +msgstr "Falha ao ler os cabeçahos do arquivo" #: apt-inst/filelist.cc:384 msgid "DropNode called on still linked node" @@ -1377,11 +1378,11 @@ msgstr "DropNode chamado em nó ainda linkado" #: apt-inst/filelist.cc:416 msgid "Failed to locate the hash element!" -msgstr "Falhou localizar o elemento de hash!" +msgstr "Falha ao localizar o elemento de hash !" #: apt-inst/filelist.cc:463 msgid "Failed to allocate diversion" -msgstr "Falhou alocar desvio (diversion)" +msgstr "Falha ao alocar desvio (diversion)" #: apt-inst/filelist.cc:468 msgid "Internal error in AddDiversion" @@ -1390,27 +1391,27 @@ msgstr "Erro Interno em AddDiversion" #: apt-inst/filelist.cc:481 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" -msgstr "Tentando sobreescrever um desvio (diversion), %s -> %s e %s/%s" +msgstr "Tentando sobreescrever um desvio, %s -> %s e %s/%s" #: apt-inst/filelist.cc:510 #, c-format msgid "Double add of diversion %s -> %s" -msgstr "Adição dupla de desvio (diversion) %s -> %s" +msgstr "Adição dupla de desvio %s -> %s" #: apt-inst/filelist.cc:553 #, c-format msgid "Duplicate conf file %s/%s" -msgstr "Ficheiro de configuração duplicado %s/%s" +msgstr "Arquivo de configuração duplicado %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 #, c-format msgid "Failed write file %s" -msgstr "Falhou escrever o ficheiro %s" +msgstr "Falha ao escrever ficheiro %s" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 #, c-format msgid "Failed to close file %s" -msgstr "Falhou fechar o ficheiro %s" +msgstr "Falha ao fechar ficheiro %s" #: apt-inst/extract.cc:96 apt-inst/extract.cc:167 #, c-format @@ -1420,30 +1421,30 @@ msgstr "O caminho %s é demasiado longo" #: apt-inst/extract.cc:127 #, c-format msgid "Unpacking %s more than once" -msgstr "A descompactar %s mais de uma vez" +msgstr "Descompactando %s mais de uma vez" #: apt-inst/extract.cc:137 #, c-format msgid "The directory %s is diverted" -msgstr "O directório %s é desviado (diverted)" +msgstr "O directório %s é desviado" #: apt-inst/extract.cc:147 #, c-format msgid "The package is trying to write to the diversion target %s/%s" -msgstr "O pacote está a tentar escrever no alvo de desvio (diverson) %s/%s" +msgstr "O pacote está a tentar gravar no alvo de desvio %s/%s" #: apt-inst/extract.cc:157 apt-inst/extract.cc:300 msgid "The diversion path is too long" -msgstr "O caminho de desvio (diversion) é demasiado longo" +msgstr "O caminho de desvio é muito longo" #: apt-inst/extract.cc:243 #, c-format msgid "The directory %s is being replaced by a non-directory" -msgstr "O directório %s está a ser substituído por um não-diretório" +msgstr "O directório %s está sendo substituído por um não-diretório" #: apt-inst/extract.cc:283 msgid "Failed to locate node in its hash bucket" -msgstr "Falhou localizar nó no seu hash bucket" +msgstr "Falha ao localizar nó no seu hash bucket" #: apt-inst/extract.cc:287 msgid "The path is too long" @@ -1457,7 +1458,7 @@ msgstr "Sobreescrita de pacote não coincide com nenhuma versão para %s" #: apt-inst/extract.cc:434 #, c-format msgid "File %s/%s overwrites the one in the package %s" -msgstr "O ficheiro %s/%s sobreescreve o que está no pacote %s" +msgstr "Ficheiro %s/%s sobreescreve o que está no pacote %s" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709 #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38 @@ -1473,7 +1474,7 @@ msgstr "Impossível executar stat %s" #: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 #, c-format msgid "Failed to remove %s" -msgstr "Falhou remover %s" +msgstr "Falha ao remover %s" #: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 #, c-format @@ -1483,12 +1484,11 @@ msgstr "Impossível criar %s" #: apt-inst/deb/dpkgdb.cc:118 #, c-format msgid "Failed to stat %sinfo" -msgstr "Falhou stat %sinfo." +msgstr "Impossível executar stat %sinfo." #: apt-inst/deb/dpkgdb.cc:123 msgid "The info and temp directories need to be on the same filesystem" -msgstr "" -"Os directórios info e temp precisam estar no mesmo sistema de ficheiros" +msgstr "Os directórios info e temp precisam estar no mesmo sistema de arquivos" #. Build the status cache #: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 @@ -1500,16 +1500,16 @@ msgstr "A Ler Listas de Pacotes" #: apt-inst/deb/dpkgdb.cc:180 #, c-format msgid "Failed to change to the admin dir %sinfo" -msgstr "Falhou mudar para o directório administrativo %sinfo" +msgstr "Falha ao mudar para o directório administrativo %sinfo" #: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 #: apt-inst/deb/dpkgdb.cc:448 msgid "Internal error getting a package name" -msgstr "Erro Interno ao obter um Nome de Pacote" +msgstr "Erro Interno obtendo um Nome de Pacote" #: apt-inst/deb/dpkgdb.cc:205 msgid "Reading file listing" -msgstr "A Ler Listagem de Ficheiros" +msgstr "Lendo Listagem de Ficheiros" #: apt-inst/deb/dpkgdb.cc:216 #, c-format @@ -1518,50 +1518,50 @@ msgid "" "then make it empty and immediately re-install the same version of the " "package!" msgstr "" -"Falhou abrir o ficheiro da lista '%sinfo/%s'. Caso você não consiga " -"restaurar este ficheiro, crie um vazio e imediatamente reinstale a mesma " -"versão do pacote !" +"Falha ao abrir o ficheiro da lista '%sinfo/%s'. Caso você não consiga " +"restaurar este ficheiro, crie outro vazio e re-instale a mesma versão do " +"pacote !" #: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 #, c-format msgid "Failed reading the list file %sinfo/%s" -msgstr "Falhou ler o ficheiro de lista %sinfo/%s" +msgstr "Falha ao ler o ficheiro de lista %sinfo/%s" #: apt-inst/deb/dpkgdb.cc:266 msgid "Internal error getting a node" -msgstr "Erro Interno ao obter um Nó" +msgstr "Erro Interno obtendo um Nó" #: apt-inst/deb/dpkgdb.cc:309 #, c-format msgid "Failed to open the diversions file %sdiversions" -msgstr "Falhou abrir o ficheiro de desvios (diversions) %sdiversions" +msgstr "Falha ao abrir o ficheiro de desvios %sdiversions" #: apt-inst/deb/dpkgdb.cc:324 msgid "The diversion file is corrupted" -msgstr "O ficheiro de desvio (diversion) está corrompido" +msgstr "O ficheiro de desvios está corrompido" #: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 #: apt-inst/deb/dpkgdb.cc:341 #, c-format msgid "Invalid line in the diversion file: %s" -msgstr "Linha inválida no ficheiro de desvio (diversion): %s" +msgstr "Linha inválida no ficheiro de desvio: %s" #: apt-inst/deb/dpkgdb.cc:362 msgid "Internal error adding a diversion" -msgstr "Erro Interno ao adicionar um desvio (diversion)" +msgstr "Erro Interno ao adicionar um desvio" #: apt-inst/deb/dpkgdb.cc:383 msgid "The pkg cache must be initialize first" -msgstr "A cache de pacotes tem de ser inicializada primeiro" +msgstr "A cache de pacotes deve ser inicializada primeiro" #: apt-inst/deb/dpkgdb.cc:386 msgid "Reading file list" -msgstr "A Ler Lista de Ficheiros" +msgstr "Lendo Lista de Ficheiros" #: apt-inst/deb/dpkgdb.cc:443 #, c-format msgid "Failed to find a Package: header, offset %lu" -msgstr "Falhou encontrar um Pacote: Cabeçalho, offset %lu" +msgstr "Falha ao encontrar um Pacote: Cabeçalho, posição %lu" #: apt-inst/deb/dpkgdb.cc:465 #, c-format @@ -1594,7 +1594,7 @@ msgstr "Erro Interno, não foi possível localizar membro" #: apt-inst/deb/debfile.cc:171 msgid "Failed to locate a valid control file" -msgstr "Falhou localizar um ficheiro de controle válido" +msgstr "Falha em localizar um ficheiro de controle válido" #: apt-inst/deb/debfile.cc:256 msgid "Unparsable control file" @@ -1603,7 +1603,7 @@ msgstr "Ficheiro de controle não interpretável" #: methods/cdrom.cc:113 #, c-format msgid "Unable to read the cdrom database %s" -msgstr "Impossível ler a base de dados do cdrom %s" +msgstr "Impossível ler a base de dados de cdrom %s" #: methods/cdrom.cc:122 msgid "" @@ -1620,7 +1620,7 @@ msgstr "CD errado" #: methods/cdrom.cc:163 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." -msgstr "Impossível desmontar o CD-ROM em %s, pode ainda estar em uso." +msgstr "Impossível desmontar o CD-ROM em %s, o mesmo ainda pode estar em uso." #: methods/cdrom.cc:177 methods/file.cc:77 methods/rsh.cc:264 msgid "File not found" @@ -1628,15 +1628,15 @@ msgstr "Arquivo não encontrado" #: methods/copy.cc:42 methods/gzip.cc:133 methods/gzip.cc:142 msgid "Failed to stat" -msgstr "Falhou executar stat" +msgstr "Falha ao executar stat" #: methods/copy.cc:79 methods/gzip.cc:139 msgid "Failed to set modification time" -msgstr "Falhou definir hora de modificação" +msgstr "Falha ao definir hora de modificação" #: methods/file.cc:42 msgid "Invalid URI, local URIS must not start with //" -msgstr "URI inválido, URIs locais não pdem começar por //" +msgstr "URI inválido, URIs locais não devem iniciar com //" #. Login must be before getpeername otherwise dante won't work. #: methods/ftp.cc:162 @@ -1645,7 +1645,7 @@ msgstr "A entrar no sistema" #: methods/ftp.cc:168 msgid "Unable to determine the peer name" -msgstr "Impossível determinar o nome do peer" +msgstr "Impossível determinar o nome do posto" #: methods/ftp.cc:173 msgid "Unable to determine the local name" @@ -1654,17 +1654,17 @@ msgstr "Impossível determinar o nome local" #: methods/ftp.cc:204 methods/ftp.cc:232 #, c-format msgid "The server refused the connection and said: %s" -msgstr "O servidor recusou a nossa ligação e disse: %s" +msgstr "O servidor recusou a nossa ligação e respondeu: %s" #: methods/ftp.cc:210 #, c-format msgid "USER failed, server said: %s" -msgstr "USER falhou, o servidor disse: %s" +msgstr "USER falhou, o servidor respondeu: %s" #: methods/ftp.cc:217 #, c-format msgid "PASS failed, server said: %s" -msgstr "PASS falhou, o servidor disse: %s" +msgstr "PASS falhou, o servidor respondeu: %s" #: methods/ftp.cc:237 msgid "" @@ -1677,12 +1677,12 @@ msgstr "" #: methods/ftp.cc:265 #, c-format msgid "Login script command '%s' failed, server said: %s" -msgstr "Falhou o comando de script de login '%s', o servidor disse: %s" +msgstr "Comando de script de login '%s' falhou, o servidor respondeu: %s" #: methods/ftp.cc:291 #, c-format msgid "TYPE failed, server said: %s" -msgstr "TYPE falhou, o servidor disse: %s" +msgstr "TYPE falhou, o servidor respondeu: %s" #: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226 msgid "Connection timeout" @@ -1714,7 +1714,7 @@ msgstr "Não foi possível criar um socket" #: methods/ftp.cc:698 msgid "Could not connect data socket, connection timed out" -msgstr "Não foi possível ligar socket de dados, o tempo de ligação expirou" +msgstr "Não foi possível ligar socket de dados, a ligação expirou" #: methods/ftp.cc:704 msgid "Could not connect passive socket." @@ -1726,11 +1726,11 @@ msgstr "getaddrinfo não foi capaz de obter um socket de escuta" #: methods/ftp.cc:736 msgid "Could not bind a socket" -msgstr "Não foi possível bind a um socket" +msgstr "Não foi possível fazer o bind a um socket" #: methods/ftp.cc:740 msgid "Could not listen on the socket" -msgstr "Não foi possível listen no socket" +msgstr "Não foi possível executar listen no socket" #: methods/ftp.cc:747 msgid "Could not determine the socket's name" @@ -1748,11 +1748,11 @@ msgstr "Família de endereços %u desconhecida (AF_*)" #: methods/ftp.cc:798 #, c-format msgid "EPRT failed, server said: %s" -msgstr "EPRT falhou, o servidor disse: %s" +msgstr "EPRT falhou, o servidor respondeu: %s" #: methods/ftp.cc:818 msgid "Data socket connect timed out" -msgstr "Tempo do socket de dados expirou" +msgstr "Ligação de socket de dados expirou" #: methods/ftp.cc:825 msgid "Unable to accept connection" @@ -1760,12 +1760,12 @@ msgstr "Impossível aceitar ligação" #: methods/ftp.cc:864 methods/http.cc:916 methods/rsh.cc:303 msgid "Problem hashing file" -msgstr "Problema ao fazer o hash do ficheiro" +msgstr "Problema fazendo o hash do ficheiro" #: methods/ftp.cc:877 #, c-format msgid "Unable to fetch file, server said '%s'" -msgstr "Impossível obter ficheiro, o servidor disse '%s'" +msgstr "Impossível obter ficheiro, o servidor respondeu '%s'" #: methods/ftp.cc:892 methods/rsh.cc:322 msgid "Data socket timed out" @@ -2466,11 +2466,11 @@ 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:235 apt-pkg/acquire-item.cc:894 +#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 msgid "MD5Sum mismatch" msgstr "MD5Sum incorreto" -#: apt-pkg/acquire-item.cc:708 +#: apt-pkg/acquire-item.cc:714 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2480,7 +2480,7 @@ msgstr "" "que você precisa consertar manualmente este pacote. (devido a arquitetura " "não especificada)." -#: apt-pkg/acquire-item.cc:761 +#: apt-pkg/acquire-item.cc:767 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2489,7 +2489,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:797 +#: apt-pkg/acquire-item.cc:803 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2497,7 +2497,7 @@ msgstr "" "Os arquivos de índice de pacotes estão corrompidos. Nenhum campo Filename: " "para o pacote %s." -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "Tamanho incorreto" @@ -2602,6 +2602,55 @@ msgstr "" "Escreveu %i registos com %i ficheiros em falta e %i ficheiros não " "coincidentes\n" +#: apt-inst/deb/dpkgdb.cc:383 +msgid "The pkg cache must be initialized first" +msgstr "A cache de pacotes tem de ser inicializada primeiro" + +#: apt-pkg/pkgcachegen.cc:117 +#, c-format +msgid "Error occurred while processing %s (NewPackage)" +msgstr "Um erro ocorreu ao processar %s (NovoPacote)" + +#: apt-pkg/pkgcachegen.cc:129 +#, c-format +msgid "Error occurred while processing %s (UsePackage1)" +msgstr "Um erro ocorreu ao processar %s (UsePacote1)" + +#: apt-pkg/pkgcachegen.cc:150 +#, c-format +msgid "Error occurred while processing %s (UsePackage2)" +msgstr "Um erro ocorreu ao processar %s (UsePacote2)" + +#: apt-pkg/pkgcachegen.cc:154 +#, c-format +msgid "Error occurred while processing %s (NewFileVer1)" +msgstr "Um erro ocorreu ao processar %s (NovoArquivoVer1)" + +#: apt-pkg/pkgcachegen.cc:184 +#, c-format +msgid "Error occurred while processing %s (NewVersion1)" +msgstr "Um erro ocorreu ao processar %s (NovaVersão1)" + +#: apt-pkg/pkgcachegen.cc:188 +#, c-format +msgid "Error occurred while processing %s (UsePackage3)" +msgstr "Um erro ocorreu ao processar %s (UsePacote3)" + +#: apt-pkg/pkgcachegen.cc:192 +#, c-format +msgid "Error occurred while processing %s (NewVersion2)" +msgstr "Um erro ocorreu ao processar %s (NovaVersão2)" + +#: apt-pkg/pkgcachegen.cc:241 +#, c-format +msgid "Error occurred while processing %s (FindPkg)" +msgstr "Um erro ocorreu ao processar %s (FindPkg)" + +#: apt-pkg/pkgcachegen.cc:254 +#, c-format +msgid "Error occurred while processing %s (CollectFileProvides)" +msgstr "Um erro ocorreu ao processar %s (CollectFileProvides)" + #~ msgid "Unknown vendor ID '%s' in line %u of source list %s" #~ msgstr "" #~ "ID de fornecedor desconhecido '%s' na linha %u da lista de fontes %s" diff --git a/po/pt_BR.po b/po/pt_BR.po index c9896e26d..8e1525db7 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: 2005-03-05 22:10+0100\n" +"POT-Creation-Date: 2005-03-29 07:17+0200\n" "PO-Revision-Date: 2005-02-13 15:18-0200\n" "Last-Translator: Andr Lus Lopes <andrelop@debian.org>\n" "Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n" @@ -325,6 +325,7 @@ msgid "Error processing contents %s" msgstr "Erro processando Contedo %s" #: ftparchive/apt-ftparchive.cc:551 +#, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -363,7 +364,7 @@ msgid "" " --no-delink Enable delinking debug mode\n" " --contents Control contents file generation\n" " -c=? Read this configuration file\n" -" -o=? Set an arbitary configuration option" +" -o=? Set an arbitrary configuration option" msgstr "" "Uso: apt-ftparchive [opes] comando\n" "Comandos: packages caminho_binrio [arquivo_override [prefixo_caminho]]\n" @@ -1548,7 +1549,7 @@ msgid "Internal error adding a diversion" msgstr "Erro Interno ao adicionar um desvio" #: apt-inst/deb/dpkgdb.cc:383 -msgid "The pkg cache must be initialize first" +msgid "The pkg cache must be initialized first" msgstr "O cache de pacotes deve ser inicializado primeiro" #: apt-inst/deb/dpkgdb.cc:386 @@ -2383,37 +2384,37 @@ msgstr "O Cache possui um sistema de vers #: apt-pkg/pkgcachegen.cc:117 #, c-format -msgid "Error occured while processing %s (NewPackage)" +msgid "Error occurred while processing %s (NewPackage)" msgstr "Um erro ocorreu processando %s (NovoPacote)" #: apt-pkg/pkgcachegen.cc:129 #, c-format -msgid "Error occured while processing %s (UsePackage1)" +msgid "Error occurred while processing %s (UsePackage1)" msgstr "Um erro ocorreu processando %s (UsePacote1)" #: apt-pkg/pkgcachegen.cc:150 #, c-format -msgid "Error occured while processing %s (UsePackage2)" +msgid "Error occurred while processing %s (UsePackage2)" msgstr "Um erro ocorreu processando %s (UsePacote2)" #: apt-pkg/pkgcachegen.cc:154 #, c-format -msgid "Error occured while processing %s (NewFileVer1)" +msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Um erro ocorreu processando %s (NovoArquivoVer1)" #: apt-pkg/pkgcachegen.cc:184 #, c-format -msgid "Error occured while processing %s (NewVersion1)" +msgid "Error occurred while processing %s (NewVersion1)" msgstr "Um erro ocorreu processando %s (NovaVerso1)" #: apt-pkg/pkgcachegen.cc:188 #, c-format -msgid "Error occured while processing %s (UsePackage3)" +msgid "Error occurred while processing %s (UsePackage3)" msgstr "Um erro ocorreu processando %s (UsePacote3)" #: apt-pkg/pkgcachegen.cc:192 #, c-format -msgid "Error occured while processing %s (NewVersion2)" +msgid "Error occurred while processing %s (NewVersion2)" msgstr "Um erro ocorreu processando %s (NovaVerso2)" #: apt-pkg/pkgcachegen.cc:207 @@ -2434,12 +2435,12 @@ msgstr "" #: apt-pkg/pkgcachegen.cc:241 #, c-format -msgid "Error occured while processing %s (FindPkg)" +msgid "Error occurred while processing %s (FindPkg)" msgstr "Um erro ocorreu processando %s (FindPkg)" #: apt-pkg/pkgcachegen.cc:254 #, c-format -msgid "Error occured while processing %s (CollectFileProvides)" +msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Um erro ocorreu processando %s (CollectFileProvides)" #: apt-pkg/pkgcachegen.cc:260 diff --git a/po/ro.po b/po/ro.po index b37c35cdf..714787236 100644 --- a/po/ro.po +++ b/po/ro.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_ro\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-05 12:06+0100\n" +"POT-Creation-Date: 2005-03-29 07:17+0200\n" "PO-Revision-Date: 2004-11-16 01:22+0200\n" "Last-Translator: Sorin Batariuc <sorin@bonbon.net>\n" "Language-Team: Romanian <romanian>\n" @@ -363,7 +363,7 @@ msgid "" " --no-delink Enable delinking debug mode\n" " --contents Control contents file generation\n" " -c=? Read this configuration file\n" -" -o=? Set an arbitary configuration option" +" -o=? Set an arbitrary configuration option" msgstr "" "Utilizare: apt-ftparchive [opţiuni] comanda\n" "Comenzi: packages binarypath [fişier_înlocuire [prefix_cale]]\n" @@ -764,7 +764,7 @@ msgid "WARNING: The following packages cannot be authenticated!" msgstr "Următoarele pachete vor fi ÎNNOITE:" #: cmdline/apt-get.cc:698 -msgid "Install these packages without verification? [y/N] " +msgid "Install these packages without verification [y/N]? " msgstr "" #: cmdline/apt-get.cc:700 @@ -838,7 +838,8 @@ msgid "Abort." msgstr "Renunţare." #: cmdline/apt-get.cc:886 -msgid "Do you want to continue? [Y/n] " +#, fuzzy +msgid "Do you want to continue [Y/n]? " msgstr "Vreţi să continuaţi? [Y/n] " #: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959 @@ -1559,7 +1560,7 @@ msgid "Internal error adding a diversion" msgstr "Eroare internă în timpul adăugării unei diversiuni" #: apt-inst/deb/dpkgdb.cc:383 -msgid "The pkg cache must be initialize first" +msgid "The pkg cache must be initialized first" msgstr "Cache-ul pachetului trebuie întâi iniţializat" #: apt-inst/deb/dpkgdb.cc:386 @@ -1622,7 +1623,8 @@ msgstr "" "'apt-get update' nu poate fi folosit pentru adăugarea de noi CD-uri" #: methods/cdrom.cc:130 methods/cdrom.cc:168 -msgid "Wrong CD" +#, fuzzy +msgid "Wrong CD-ROM" msgstr "CD necorespunzător" #: methods/cdrom.cc:163 @@ -2391,37 +2393,37 @@ msgstr "Cache are un versioning system incompatibil" #: apt-pkg/pkgcachegen.cc:117 #, c-format -msgid "Error occured while processing %s (NewPackage)" +msgid "Error occurred while processing %s (NewPackage)" msgstr "Eroare în timpul procesării %s (pachet nou)" #: apt-pkg/pkgcachegen.cc:129 #, c-format -msgid "Error occured while processing %s (UsePackage1)" +msgid "Error occurred while processing %s (UsePackage1)" msgstr "Eroare în timpul procesării %s (folosit pachet 1)" #: apt-pkg/pkgcachegen.cc:150 #, c-format -msgid "Error occured while processing %s (UsePackage2)" +msgid "Error occurred while processing %s (UsePackage2)" msgstr "Eroare în timpul procesării %s (folosit pachet 2)" #: apt-pkg/pkgcachegen.cc:154 #, c-format -msgid "Error occured while processing %s (NewFileVer1)" +msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Eroare în timpul procesării %s (fişier nou versiunea 1)" #: apt-pkg/pkgcachegen.cc:184 #, c-format -msgid "Error occured while processing %s (NewVersion1)" +msgid "Error occurred while processing %s (NewVersion1)" msgstr "Eroare în timpul procesării %s (versiune nouă 1)" #: apt-pkg/pkgcachegen.cc:188 #, c-format -msgid "Error occured while processing %s (UsePackage3)" +msgid "Error occurred while processing %s (UsePackage3)" msgstr "Eroare în timpul procesării %s (folosire pachet 3)" #: apt-pkg/pkgcachegen.cc:192 #, c-format -msgid "Error occured while processing %s (NewVersion2)" +msgid "Error occurred while processing %s (NewVersion2)" msgstr "Eroare în timpul procesării %s (versiune nouă 2)" #: apt-pkg/pkgcachegen.cc:207 @@ -2442,12 +2444,12 @@ msgstr "" #: apt-pkg/pkgcachegen.cc:241 #, c-format -msgid "Error occured while processing %s (FindPkg)" +msgid "Error occurred while processing %s (FindPkg)" msgstr "Eroare în timpul procesării %s (găsire pachet)" #: apt-pkg/pkgcachegen.cc:254 #, c-format -msgid "Error occured while processing %s (CollectFileProvides)" +msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Eroare în timpul procesării %s (colectare furnizor fişiere)" #: apt-pkg/pkgcachegen.cc:260 diff --git a/po/ru.po b/po/ru.po index 7354bbcdf..de0660f8c 100644 --- a/po/ru.po +++ b/po/ru.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-ru\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-05 22:10+0100\n" +"POT-Creation-Date: 2005-03-29 07:17+0200\n" "PO-Revision-Date: 2005-02-09 19:50+0400\n" "Last-Translator: Yuri Kozlov <yuray@id.ru>\n" "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n" @@ -337,6 +337,7 @@ msgid "Error processing contents %s" msgstr "ошибка обработки полного перечня содержимого пакетов (Contents) %s" #: ftparchive/apt-ftparchive.cc:551 +#, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -375,7 +376,7 @@ msgid "" " --no-delink Enable delinking debug mode\n" " --contents Control contents file generation\n" " -c=? Read this configuration file\n" -" -o=? Set an arbitary configuration option" +" -o=? Set an arbitrary configuration option" msgstr "" "Использование: apt-ftparchive [options] command\n" "Команды: packages binarypath [overridefile [pathprefix]]\n" @@ -1577,7 +1578,7 @@ msgid "Internal error adding a diversion" msgstr "Внутренняя ошибка при добавлении diversion" #: apt-inst/deb/dpkgdb.cc:383 -msgid "The pkg cache must be initialize first" +msgid "The pkg cache must be initialized first" msgstr "В первую очередь должен быть проинициализирован кэш пакетов" #: apt-inst/deb/dpkgdb.cc:386 @@ -2416,37 +2417,37 @@ msgstr "Кэш имеет несовместимую систему версий #: apt-pkg/pkgcachegen.cc:117 #, c-format -msgid "Error occured while processing %s (NewPackage)" +msgid "Error occurred while processing %s (NewPackage)" msgstr "Произошла ошибка во время обработки %s (NewPackage)" #: apt-pkg/pkgcachegen.cc:129 #, c-format -msgid "Error occured while processing %s (UsePackage1)" +msgid "Error occurred while processing %s (UsePackage1)" msgstr "Произошла ошибка во время обработки %s (UsePackage1)" #: apt-pkg/pkgcachegen.cc:150 #, c-format -msgid "Error occured while processing %s (UsePackage2)" +msgid "Error occurred while processing %s (UsePackage2)" msgstr "Произошла ошибка во время обработки %s (UsePackage2)" #: apt-pkg/pkgcachegen.cc:154 #, c-format -msgid "Error occured while processing %s (NewFileVer1)" +msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Произошла ошибка во время обработки %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:184 #, c-format -msgid "Error occured while processing %s (NewVersion1)" +msgid "Error occurred while processing %s (NewVersion1)" msgstr "Произошла ошибка во время обработки %s (NewVersion1)" #: apt-pkg/pkgcachegen.cc:188 #, c-format -msgid "Error occured while processing %s (UsePackage3)" +msgid "Error occurred while processing %s (UsePackage3)" msgstr "Произошла ошибка во время обработки %s (UsePackage3)" #: apt-pkg/pkgcachegen.cc:192 #, c-format -msgid "Error occured while processing %s (NewVersion2)" +msgid "Error occurred while processing %s (NewVersion2)" msgstr "Произошла ошибка во время обработки %s (NewVersion2)" #: apt-pkg/pkgcachegen.cc:207 @@ -2463,12 +2464,12 @@ msgstr "Превышено допустимое количество завис #: apt-pkg/pkgcachegen.cc:241 #, c-format -msgid "Error occured while processing %s (FindPkg)" +msgid "Error occurred while processing %s (FindPkg)" msgstr "Произошла ошибка во время обработки %s (FindPkg)" #: apt-pkg/pkgcachegen.cc:254 #, c-format -msgid "Error occured while processing %s (CollectFileProvides)" +msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Произошла ошибка во время обработки %s (CollectFileProvides)" #: apt-pkg/pkgcachegen.cc:260 diff --git a/po/sk.po b/po/sk.po index 0ff0c8899..c3fc16df9 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: 2005-03-05 22:10+0100\n" +"POT-Creation-Date: 2005-03-29 07:17+0200\n" "PO-Revision-Date: 2005-02-09 11:29+0100\n" "Last-Translator: Peter KLFMANiK Mann <Peter.Mann@tuke.sk>\n" "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n" @@ -322,6 +322,7 @@ msgid "Error processing contents %s" msgstr "Chyba pri spracovávaní obsahu %s" #: ftparchive/apt-ftparchive.cc:551 +#, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -360,7 +361,7 @@ msgid "" " --no-delink Enable delinking debug mode\n" " --contents Control contents file generation\n" " -c=? Read this configuration file\n" -" -o=? Set an arbitary configuration option" +" -o=? Set an arbitrary configuration option" msgstr "" "Použitie: apt-ftparchive [voľby] príkaz\n" "Príkazy: packages binárna_cesta [súbor_override [prefix_cesty]]\n" @@ -1533,7 +1534,7 @@ msgid "Internal error adding a diversion" msgstr "Vnútorná chyba pri pridávaní diverzie" #: apt-inst/deb/dpkgdb.cc:383 -msgid "The pkg cache must be initialize first" +msgid "The pkg cache must be initialized first" msgstr "Vyrovnávacia pamäť balíkov sa najprv musí inicializovať" #: apt-inst/deb/dpkgdb.cc:386 @@ -2358,37 +2359,37 @@ msgstr "Vyrovnávacia pamäť má nezlučiteľný systém na správu verzií" #: apt-pkg/pkgcachegen.cc:117 #, c-format -msgid "Error occured while processing %s (NewPackage)" +msgid "Error occurred while processing %s (NewPackage)" msgstr "Pri spracovaní %s sa objavila chyba (NewPackage)" #: apt-pkg/pkgcachegen.cc:129 #, c-format -msgid "Error occured while processing %s (UsePackage1)" +msgid "Error occurred while processing %s (UsePackage1)" msgstr "Pri spracovaní %s sa objavila chyba (UsePackage1)" #: apt-pkg/pkgcachegen.cc:150 #, c-format -msgid "Error occured while processing %s (UsePackage2)" +msgid "Error occurred while processing %s (UsePackage2)" msgstr "Pri spracovaní %s sa objavila chyba (UsePackage2)" #: apt-pkg/pkgcachegen.cc:154 #, c-format -msgid "Error occured while processing %s (NewFileVer1)" +msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Pri spracovaní %s sa objavila chyba (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:184 #, c-format -msgid "Error occured while processing %s (NewVersion1)" +msgid "Error occurred while processing %s (NewVersion1)" msgstr "Pri spracovaní %s sa objavila chyba (NewVersion1)" #: apt-pkg/pkgcachegen.cc:188 #, c-format -msgid "Error occured while processing %s (UsePackage3)" +msgid "Error occurred while processing %s (UsePackage3)" msgstr "Pri spracovaní %s sa objavila chyba (UsePackage3)" #: apt-pkg/pkgcachegen.cc:192 #, c-format -msgid "Error occured while processing %s (NewVersion2)" +msgid "Error occurred while processing %s (NewVersion2)" msgstr "Pri spracovaní %s sa objavila chyba (NewVersion2)" #: apt-pkg/pkgcachegen.cc:207 @@ -2407,12 +2408,12 @@ msgstr "" #: apt-pkg/pkgcachegen.cc:241 #, c-format -msgid "Error occured while processing %s (FindPkg)" +msgid "Error occurred while processing %s (FindPkg)" msgstr "Chyba pri spracovaní %s (FindPkg)" #: apt-pkg/pkgcachegen.cc:254 #, c-format -msgid "Error occured while processing %s (CollectFileProvides)" +msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Pri spracovaní %s sa objavila chyba (CollectFileProvides)" #: apt-pkg/pkgcachegen.cc:260 diff --git a/po/sl.po b/po/sl.po index 34dc0d6c2..2147c6f53 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: 2005-03-05 22:10+0100\n" +"POT-Creation-Date: 2005-03-29 07:17+0200\n" "PO-Revision-Date: 2005-02-16 22:18+0100\n" "Last-Translator: Jure uhalev <gandalf@owca.info>\n" "Language-Team: Slovenian <sl@li.org>\n" @@ -319,6 +319,7 @@ msgid "Error processing contents %s" msgstr "Napaka pri obdelavi vsebine %s" #: ftparchive/apt-ftparchive.cc:551 +#, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -357,7 +358,7 @@ msgid "" " --no-delink Enable delinking debug mode\n" " --contents Control contents file generation\n" " -c=? Read this configuration file\n" -" -o=? Set an arbitary configuration option" +" -o=? Set an arbitrary configuration option" msgstr "" "Uporaba: apt-ftparchive [monosti] ukaz\n" "Ukazi: packages binarypath [overridefile [pathprefix]]\n" @@ -1532,7 +1533,7 @@ msgid "Internal error adding a diversion" msgstr "Notranja napaka pri dodajanju odklona" #: apt-inst/deb/dpkgdb.cc:383 -msgid "The pkg cache must be initialize first" +msgid "The pkg cache must be initialized first" msgstr "Najprej se mora izvesti predpomnilnik paketov" #: apt-inst/deb/dpkgdb.cc:386 @@ -2358,37 +2359,37 @@ msgstr "Predpomnilnik ima neustrezen sistem razli #: apt-pkg/pkgcachegen.cc:117 #, c-format -msgid "Error occured while processing %s (NewPackage)" +msgid "Error occurred while processing %s (NewPackage)" msgstr "Prilo je do napake pri obdelavi %s (Nov paket)" #: apt-pkg/pkgcachegen.cc:129 #, c-format -msgid "Error occured while processing %s (UsePackage1)" +msgid "Error occurred while processing %s (UsePackage1)" msgstr "Prilo je do napake pri obdelavi %s (Uporabi paket 1)" #: apt-pkg/pkgcachegen.cc:150 #, c-format -msgid "Error occured while processing %s (UsePackage2)" +msgid "Error occurred while processing %s (UsePackage2)" msgstr "Prilo je do napake pri obdelavi %s (Uporabi paket 2)" #: apt-pkg/pkgcachegen.cc:154 #, c-format -msgid "Error occured while processing %s (NewFileVer1)" +msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Prilo je do napake pri obdelavi %s (Nova razliica datoteke 1)" #: apt-pkg/pkgcachegen.cc:184 #, c-format -msgid "Error occured while processing %s (NewVersion1)" +msgid "Error occurred while processing %s (NewVersion1)" msgstr "Prilo je do napake pri obdelavi %s (Nova razliica 1)" #: apt-pkg/pkgcachegen.cc:188 #, c-format -msgid "Error occured while processing %s (UsePackage3)" +msgid "Error occurred while processing %s (UsePackage3)" msgstr "Prilo je do napake pri obdelavi %s (Uporabi paket 3)" #: apt-pkg/pkgcachegen.cc:192 #, c-format -msgid "Error occured while processing %s (NewVersion2)" +msgid "Error occurred while processing %s (NewVersion2)" msgstr "Prilo je do napake pri obdelavi %s (Nova razliica 2)" #: apt-pkg/pkgcachegen.cc:207 @@ -2405,12 +2406,12 @@ msgstr "Uau, presegli ste #: apt-pkg/pkgcachegen.cc:241 #, c-format -msgid "Error occured while processing %s (FindPkg)" +msgid "Error occurred while processing %s (FindPkg)" msgstr "Prilo je do napake pri obdelavi %s (Najdi paket)" #: apt-pkg/pkgcachegen.cc:254 #, c-format -msgid "Error occured while processing %s (CollectFileProvides)" +msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Prilo je do napake pri obdelavi %s (Zberi dobavitelje datotek)" #: apt-pkg/pkgcachegen.cc:260 diff --git a/po/sv.po b/po/sv.po index 0a53c13c6..17827b7cc 100644 --- a/po/sv.po +++ b/po/sv.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-05 22:10+0100\n" +"POT-Creation-Date: 2005-03-29 07:17+0200\n" "PO-Revision-Date: 2005-01-15 15:30+0100\n" "Last-Translator: Peter Karlsson <peterk@debian.org>\n" "Language-Team: Swedish <sv@li.org>\n" @@ -324,6 +324,7 @@ msgid "Error processing contents %s" msgstr "Fel vid behaldning av innehllet %s" #: ftparchive/apt-ftparchive.cc:551 +#, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -362,7 +363,7 @@ msgid "" " --no-delink Enable delinking debug mode\n" " --contents Control contents file generation\n" " -c=? Read this configuration file\n" -" -o=? Set an arbitary configuration option" +" -o=? Set an arbitrary configuration option" msgstr "" "Anvndning: apt-ftparchive [flaggor] kommando\n" "Kommandon: packages binrskvg [sidosttningsfill [skvgsprefix]]\n" @@ -1553,7 +1554,7 @@ msgid "Internal error adding a diversion" msgstr "Internt fel nr en omdirigering skulle lggas till" #: apt-inst/deb/dpkgdb.cc:383 -msgid "The pkg cache must be initialize first" +msgid "The pkg cache must be initialized first" msgstr "Paketcachen mste ha initierats frst" #: apt-inst/deb/dpkgdb.cc:386 @@ -2392,37 +2393,37 @@ msgstr "Cachen har ett inkompatibelt versionssystem" # NewPackage etc. r funktionsnamn #: apt-pkg/pkgcachegen.cc:117 #, c-format -msgid "Error occured while processing %s (NewPackage)" +msgid "Error occurred while processing %s (NewPackage)" msgstr "Fel uppstod vid hantering av %s (NewPackage)" #: apt-pkg/pkgcachegen.cc:129 #, c-format -msgid "Error occured while processing %s (UsePackage1)" +msgid "Error occurred while processing %s (UsePackage1)" msgstr "Fel uppstod vid hantering av %s (UsePackage1)" #: apt-pkg/pkgcachegen.cc:150 #, c-format -msgid "Error occured while processing %s (UsePackage2)" +msgid "Error occurred while processing %s (UsePackage2)" msgstr "Fel uppstod vid hantering av %s (UsePackage2)" #: apt-pkg/pkgcachegen.cc:154 #, c-format -msgid "Error occured while processing %s (NewFileVer1)" +msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Fel uppstod vid hantering av %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:184 #, c-format -msgid "Error occured while processing %s (NewVersion1)" +msgid "Error occurred while processing %s (NewVersion1)" msgstr "Fel uppstod vid hantering av %s (NewVersion1)" #: apt-pkg/pkgcachegen.cc:188 #, c-format -msgid "Error occured while processing %s (UsePackage3)" +msgid "Error occurred while processing %s (UsePackage3)" msgstr "Fel uppstod vid hantering av %s (UsePackage3)" #: apt-pkg/pkgcachegen.cc:192 #, c-format -msgid "Error occured while processing %s (NewVersion2)" +msgid "Error occurred while processing %s (NewVersion2)" msgstr "Fel uppstod vid hantering av %s (NewVersion2)" #: apt-pkg/pkgcachegen.cc:207 @@ -2440,12 +2441,12 @@ msgstr "Grattis, du # NewPackage etc. r funktionsnamn #: apt-pkg/pkgcachegen.cc:241 #, c-format -msgid "Error occured while processing %s (FindPkg)" +msgid "Error occurred while processing %s (FindPkg)" msgstr "Fel uppstod vid hantering av %s (FindPkg)" #: apt-pkg/pkgcachegen.cc:254 #, c-format -msgid "Error occured while processing %s (CollectFileProvides)" +msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Fel uppstod vid hantering av %s (CollectFileProvides)" #: apt-pkg/pkgcachegen.cc:260 diff --git a/po/tl.po b/po/tl.po index a40fe11fa..f4d26b826 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: 2005-03-05 22:10+0100\n" +"POT-Creation-Date: 2005-03-29 07:17+0200\n" "PO-Revision-Date: 2005-02-09 16:36+0800\n" "Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n" "Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n" @@ -329,6 +329,7 @@ msgid "Error processing contents %s" msgstr "Error sa pagproseso ng Contents %s" #: ftparchive/apt-ftparchive.cc:551 +#, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -367,7 +368,7 @@ msgid "" " --no-delink Enable delinking debug mode\n" " --contents Control contents file generation\n" " -c=? Read this configuration file\n" -" -o=? Set an arbitary configuration option" +" -o=? Set an arbitrary configuration option" msgstr "" "Pag-gamit: apt-ftparchive [mga option] utos\n" "Mga utos: packages binarypath [overridefile [pathprefix]]\n" @@ -1551,7 +1552,7 @@ msgid "Internal error adding a diversion" msgstr "Internal error sa pagdagdag ng diversion" #: apt-inst/deb/dpkgdb.cc:383 -msgid "The pkg cache must be initialize first" +msgid "The pkg cache must be initialized first" msgstr "Ang cache ng pkg ay dapat ma-initialize muna" #: apt-inst/deb/dpkgdb.cc:386 @@ -2388,37 +2389,37 @@ msgstr "Hindi akma ang versioning system ng cache" #: apt-pkg/pkgcachegen.cc:117 #, c-format -msgid "Error occured while processing %s (NewPackage)" +msgid "Error occurred while processing %s (NewPackage)" msgstr "May naganap na error habang prinoseso ang %s (NewPackage)" #: apt-pkg/pkgcachegen.cc:129 #, c-format -msgid "Error occured while processing %s (UsePackage1)" +msgid "Error occurred while processing %s (UsePackage1)" msgstr "May naganap na error habang prinoseso ang %s (UsePackage1)" #: apt-pkg/pkgcachegen.cc:150 #, c-format -msgid "Error occured while processing %s (UsePackage2)" +msgid "Error occurred while processing %s (UsePackage2)" msgstr "May naganap na error habang prinoseso ang %s (UsePackage2)" #: apt-pkg/pkgcachegen.cc:154 #, c-format -msgid "Error occured while processing %s (NewFileVer1)" +msgid "Error occurred while processing %s (NewFileVer1)" msgstr "May naganap na error habang prinoseso ang %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:184 #, c-format -msgid "Error occured while processing %s (NewVersion1)" +msgid "Error occurred while processing %s (NewVersion1)" msgstr "May naganap na error habang prinoseso ang %s (NewVersion1)" #: apt-pkg/pkgcachegen.cc:188 #, c-format -msgid "Error occured while processing %s (UsePackage3)" +msgid "Error occurred while processing %s (UsePackage3)" msgstr "May naganap na error habang prinoseso ang %s (UsePackage3)" #: apt-pkg/pkgcachegen.cc:192 #, c-format -msgid "Error occured while processing %s (NewVersion2)" +msgid "Error occurred while processing %s (NewVersion2)" msgstr "May naganap na error habang prinoseso ang %s (NewVersion2)" #: apt-pkg/pkgcachegen.cc:207 @@ -2436,12 +2437,12 @@ msgstr "Wow, nalagpasan niyo ang bilang ng dependensiya na kaya ng APT na ito." #: apt-pkg/pkgcachegen.cc:241 #, c-format -msgid "Error occured while processing %s (FindPkg)" +msgid "Error occurred while processing %s (FindPkg)" msgstr "May naganap na error habang prinoseso ang %s (FindPkg)" #: apt-pkg/pkgcachegen.cc:254 #, c-format -msgid "Error occured while processing %s (CollectFileProvides)" +msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "May naganap na Error habang prinoseso ang %s (CollectFileProvides)" #: apt-pkg/pkgcachegen.cc:260 diff --git a/po/zh_CN.po b/po/zh_CN.po index 163917e05..d6fa9be1d 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: 2005-03-05 22:10+0100\n" +"POT-Creation-Date: 2005-03-29 07:17+0200\n" "PO-Revision-Date: 2005-02-09 17:34+0800\n" "Last-Translator: Tchaikov <chaisave@263.net>\n" "Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n" @@ -322,6 +322,7 @@ msgid "Error processing contents %s" msgstr "处理 Contents %s 时出错" #: ftparchive/apt-ftparchive.cc:551 +#, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -360,7 +361,7 @@ msgid "" " --no-delink Enable delinking debug mode\n" " --contents Control contents file generation\n" " -c=? Read this configuration file\n" -" -o=? Set an arbitary configuration option" +" -o=? Set an arbitrary configuration option" msgstr "" "用法： apt-ftparchive [选项] 命令\n" "命令： packages 二进制软件包搜索路径 [overridefile [路径前缀]]\n" @@ -1523,7 +1524,7 @@ msgid "Internal error adding a diversion" msgstr "添加 diversion 时出现内部错误" #: apt-inst/deb/dpkgdb.cc:383 -msgid "The pkg cache must be initialize first" +msgid "The pkg cache must be initialized first" msgstr "必须首先初始化软件包缓存" #: apt-inst/deb/dpkgdb.cc:386 @@ -2348,37 +2349,37 @@ msgstr "软件包暂存区使用的是不兼容的版本控制系统" #: apt-pkg/pkgcachegen.cc:117 #, c-format -msgid "Error occured while processing %s (NewPackage)" +msgid "Error occurred while processing %s (NewPackage)" msgstr "处理 %s (NewPackage)时出错" #: apt-pkg/pkgcachegen.cc:129 #, c-format -msgid "Error occured while processing %s (UsePackage1)" +msgid "Error occurred while processing %s (UsePackage1)" msgstr "处理 %s (UsePackage1)时出错" #: apt-pkg/pkgcachegen.cc:150 #, c-format -msgid "Error occured while processing %s (UsePackage2)" +msgid "Error occurred while processing %s (UsePackage2)" msgstr "处理 %s (UsePackage2)时出错" #: apt-pkg/pkgcachegen.cc:154 #, c-format -msgid "Error occured while processing %s (NewFileVer1)" +msgid "Error occurred while processing %s (NewFileVer1)" msgstr "处理 %s (NewFileVer1)时出错" #: apt-pkg/pkgcachegen.cc:184 #, c-format -msgid "Error occured while processing %s (NewVersion1)" +msgid "Error occurred while processing %s (NewVersion1)" msgstr "处理 %s (NewVersion1)时出错" #: apt-pkg/pkgcachegen.cc:188 #, c-format -msgid "Error occured while processing %s (UsePackage3)" +msgid "Error occurred while processing %s (UsePackage3)" msgstr "处理 %s (UsePackage3)时出错" #: apt-pkg/pkgcachegen.cc:192 #, c-format -msgid "Error occured while processing %s (NewVersion2)" +msgid "Error occurred while processing %s (NewVersion2)" msgstr "处理 %s (NewVersion2)时出错" #: apt-pkg/pkgcachegen.cc:207 @@ -2395,12 +2396,12 @@ msgstr "糟了，依赖关系的数量超出了本程序的处理能力。" #: apt-pkg/pkgcachegen.cc:241 #, c-format -msgid "Error occured while processing %s (FindPkg)" +msgid "Error occurred while processing %s (FindPkg)" msgstr "处理 %s (FindPkg)时出错" #: apt-pkg/pkgcachegen.cc:254 #, c-format -msgid "Error occured while processing %s (CollectFileProvides)" +msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "处理 %s (CollectFileProvides)时出错" #: apt-pkg/pkgcachegen.cc:260 diff --git a/po/zh_TW.po b/po/zh_TW.po index f8c659000..cafc2bd5f 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: 2005-03-05 22:10+0100\n" +"POT-Creation-Date: 2005-03-29 07:17+0200\n" "PO-Revision-Date: 2005-02-19 22:24+0800\n" "Last-Translator: Asho Yeh <asho@debian.org.tw>\n" "Language-Team: Chinese/Traditional <zh-l10n@linux.org.tw>\n" @@ -323,6 +323,7 @@ msgid "Error processing contents %s" msgstr "處理目錄 %s 時出錯" #: ftparchive/apt-ftparchive.cc:551 +#, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -361,7 +362,7 @@ msgid "" " --no-delink Enable delinking debug mode\n" " --contents Control contents file generation\n" " -c=? Read this configuration file\n" -" -o=? Set an arbitary configuration option" +" -o=? Set an arbitrary configuration option" msgstr "" "用法: apt-ftparchive [選項] 命令\n" "命令: packages 二進制套件搜索路徑 [overridefile [pathprefix]]\n" @@ -1527,7 +1528,7 @@ msgid "Internal error adding a diversion" msgstr "內部錯誤：新增轉移(diversion)失敗" #: apt-inst/deb/dpkgdb.cc:383 -msgid "The pkg cache must be initialize first" +msgid "The pkg cache must be initialized first" msgstr "套件快取必須先初始化" #: apt-inst/deb/dpkgdb.cc:386 @@ -2346,37 +2347,37 @@ msgstr "套件暫存檔使用的是不相容的版本系統。" #: apt-pkg/pkgcachegen.cc:117 #, c-format -msgid "Error occured while processing %s (NewPackage)" +msgid "Error occurred while processing %s (NewPackage)" msgstr "處理『%s』時發生錯誤 (NewPackage)。" #: apt-pkg/pkgcachegen.cc:129 #, c-format -msgid "Error occured while processing %s (UsePackage1)" +msgid "Error occurred while processing %s (UsePackage1)" msgstr "處理『%s』時發生錯誤 (UsePackage1)。" #: apt-pkg/pkgcachegen.cc:150 #, c-format -msgid "Error occured while processing %s (UsePackage2)" +msgid "Error occurred while processing %s (UsePackage2)" msgstr "處理『%s』時發生錯誤 (UsePackage2)。" #: apt-pkg/pkgcachegen.cc:154 #, c-format -msgid "Error occured while processing %s (NewFileVer1)" +msgid "Error occurred while processing %s (NewFileVer1)" msgstr "處理『%s』時發生錯誤 (NewFileVer1)。" #: apt-pkg/pkgcachegen.cc:184 #, c-format -msgid "Error occured while processing %s (NewVersion1)" +msgid "Error occurred while processing %s (NewVersion1)" msgstr "處理『%s』時發生錯誤 (NewVersion1)。" #: apt-pkg/pkgcachegen.cc:188 #, c-format -msgid "Error occured while processing %s (UsePackage3)" +msgid "Error occurred while processing %s (UsePackage3)" msgstr "處理『%s』時發生錯誤 (UsePackage3)。" #: apt-pkg/pkgcachegen.cc:192 #, c-format -msgid "Error occured while processing %s (NewVersion2)" +msgid "Error occurred while processing %s (NewVersion2)" msgstr "處理『%s』時發生錯誤 (NewVersion2)。" #: apt-pkg/pkgcachegen.cc:207 @@ -2393,12 +2394,12 @@ msgstr "依存關係數量超過本程式的能力。" #: apt-pkg/pkgcachegen.cc:241 #, c-format -msgid "Error occured while processing %s (FindPkg)" +msgid "Error occurred while processing %s (FindPkg)" msgstr "處理『%s』時發生錯誤 (FindPkg)。" #: apt-pkg/pkgcachegen.cc:254 #, c-format -msgid "Error occured while processing %s (CollectFileProvides)" +msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "處理『%s』時發生錯誤 (CollectFileProvides)。" #: apt-pkg/pkgcachegen.cc:260 -- cgit v1.2.3 From 2e178d1c3e0035616b338d7597a0c9d33e3bc080 Mon Sep 17 00:00:00 2001 From: Michael Vogt <michael.vogt@ubuntu.com> Date: Thu, 28 Jul 2005 16:25:42 +0000 Subject: * added methods/rred.cc (thanks to robertle) --- methods/makefile | 7 ++ methods/rred.cc | 221 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 228 insertions(+) create mode 100644 methods/rred.cc diff --git a/methods/makefile b/methods/makefile index 089300570..93ad6d875 100644 --- a/methods/makefile +++ b/methods/makefile @@ -59,6 +59,13 @@ LIB_MAKES = apt-pkg/makefile SOURCE = ftp.cc rfc2553emu.cc connect.cc include $(PROGRAM_H) +# The rred method +PROGRAM=rred +SLIBS = -lapt-pkg $(SOCKETLIBS) +LIB_MAKES = apt-pkg/makefile +SOURCE = rred +include $(PROGRAM_H) + # The rsh method PROGRAM=rsh SLIBS = -lapt-pkg diff --git a/methods/rred.cc b/methods/rred.cc new file mode 100644 index 000000000..37faab08a --- /dev/null +++ b/methods/rred.cc @@ -0,0 +1,221 @@ +#include <apt-pkg/fileutl.h> +#include <apt-pkg/error.h> +#include <apt-pkg/acquire-method.h> +#include <apt-pkg/strutl.h> +#include <apt-pkg/hashes.h> + +#include <sys/stat.h> +#include <unistd.h> +#include <utime.h> +#include <stdio.h> +#include <errno.h> +#include <apti18n.h> + +const char *Prog; + +class RredMethod : public pkgAcqMethod +{ + virtual bool Fetch(FetchItem *Itm); + + public: + + RredMethod() : pkgAcqMethod("1.1",SingleInstance | SendConfig) {}; + +}; + +#define BUF_SIZE (1024) + +// XX use enums +#define MODE_CHANGED 0 +#define MODE_DELETED 1 +#define MODE_ADDED 2 + +#define ED_ORDERING 1 +#define ED_PARSER 2 +#define ED_FAILURE 3 + +int ed_rec(FILE *ed_cmds, FILE *in_file, FILE *out_file, int line, + char *buffer, unsigned int bufsize, Hashes *hash) { + int pos; + int startline; + int stopline; + int mode; + int written; + char *idx; + + /* get the current command and parse it*/ + if (fgets(buffer, bufsize, ed_cmds) == NULL) { + return line; + } + startline = strtol(buffer, &idx, 10); + if (startline < line) { + return ED_ORDERING; + } + if (*idx == ',') { + idx++; + stopline = strtol(idx, &idx, 10); + } + else { + stopline = startline; + } + if (*idx == 'c') { + mode = MODE_CHANGED; + } + else if (*idx == 'a') { + mode = MODE_ADDED; + } + else if (*idx == 'd') { + mode = MODE_DELETED; + } + else { + return ED_PARSER; + } + /* get the current position */ + pos = ftell(ed_cmds); + /* if this is add or change then go to the next full stop */ + if ((mode == MODE_CHANGED) || (mode == MODE_ADDED)) { + do { + fgets(buffer, bufsize, ed_cmds); + while ((strlen(buffer) == (bufsize - 1)) + && (buffer[bufsize - 2] != '\n')) { + fgets(buffer, bufsize, ed_cmds); + buffer[0] = ' '; + } + } while (strncmp(buffer, ".", 1) != 0); + } + /* do the recursive call */ + line = ed_rec(ed_cmds, in_file, out_file, line, buffer, bufsize, + hash); + /* pass on errors */ + if (line < 0) { + return line; + } + /* apply our hunk */ + fseek(ed_cmds, pos, SEEK_SET); + /* first wind to the current position */ + if (mode != MODE_ADDED) { + startline -= 1; + } + while (line < startline) { + fgets(buffer, bufsize, in_file); + written = fwrite(buffer, 1, strlen(buffer), out_file); + hash->Add((unsigned char*)buffer, written); + while ((strlen(buffer) == (bufsize - 1)) + && (buffer[bufsize - 2] != '\n')) { + fgets(buffer, bufsize, in_file); + written = fwrite(buffer, 1, strlen(buffer), out_file); + hash->Add((unsigned char*)buffer, written); + } + line++; + } + /* include from ed script */ + if ((mode == MODE_ADDED) || (mode == MODE_CHANGED)) { + do { + fgets(buffer, bufsize, ed_cmds); + if (strncmp(buffer, ".", 1) != 0) { + written = fwrite(buffer, 1, strlen(buffer), out_file); + hash->Add((unsigned char*)buffer, written); + while ((strlen(buffer) == (bufsize - 1)) + && (buffer[bufsize - 2] != '\n')) { + fgets(buffer, bufsize, ed_cmds); + written = fwrite(buffer, 1, strlen(buffer), out_file); + hash->Add((unsigned char*)buffer, written); + } + } + else { + break; + } + } while (1); + } + /* ignore the corresponding number of lines from input */ + if ((mode == MODE_DELETED) || (mode == MODE_CHANGED)) { + while (line < stopline) { + fgets(buffer, bufsize, in_file); + while ((strlen(buffer) == (bufsize - 1)) + && (buffer[bufsize - 2] != '\n')) { + fgets(buffer, bufsize, in_file); + } + line++; + } + } + return line; +} + +int ed_file(FILE *ed_cmds, FILE *in_file, FILE *out_file, Hashes *hash) { + char buffer[BUF_SIZE]; + int result; + int written; + + /* we do a tail recursion to read the commands in the right order */ + result = ed_rec(ed_cmds, in_file, out_file, 0, buffer, BUF_SIZE, + hash); + + /* read the rest from infile */ + if (result > 0) { + while (fgets(buffer, BUF_SIZE, in_file) != NULL) { + written = fwrite(buffer, 1, strlen(buffer), out_file); + // XXX add to hash + // sha_process_bytes(buffer, written, &sha); + } + } + else { + // XXX better error handling + fprintf(stderr, "Error: %i\n", result); + return ED_FAILURE; + } + return 0; +} + + +// XXX do we need modification times as well? +bool RredMethod::Fetch(FetchItem *Itm) +{ + URI Get = Itm->Uri; + string Path = Get.Host + Get.Path; // To account for relative paths + // Path contains the filename to patch + FetchResult Res; + Res.Filename = Itm->DestFile; + URIStart(Res); + // Res.Filename the destination filename + + // Open the source and destination files + FileFd From(Path,FileFd::ReadOnly); + FileFd Patch(Path+".ed",FileFd::ReadOnly); + FileFd To(Itm->DestFile,FileFd::WriteEmpty); + To.EraseOnFailure(); + if (_error->PendingError() == true) + return false; + + Hashes Hash; + FILE* fFrom = fdopen(From.Fd(), "r"); + FILE* fPatch = fdopen(Patch.Fd(), "r"); + FILE* fTo = fdopen(To.Fd(), "w"); + // now do the actual patching + ed_file(fPatch, fFrom, fTo, &Hash); + + // clean up + fclose(fFrom); + fclose(fPatch); + fclose(fTo); + To.Close(); + From.Close(); + Patch.Close(); + + // XXX need to get the size + // Res.Size = Buf.st_size; + Res.TakeHashes(Hash); + URIDone(Res); + + return true; +} + /*}}}*/ + +int main(int argc, char *argv[]) +{ + RredMethod Mth; + + Prog = strrchr(argv[0],'/'); + Prog++; + + return Mth.Run(); +} -- cgit v1.2.3 From 4a0a786f45a78eb8631c0e2d39d804ab9fdea214 Mon Sep 17 00:00:00 2001 From: Michael Vogt <michael.vogt@ubuntu.com> Date: Fri, 19 Aug 2005 15:07:53 +0000 Subject: * use the new cool rred method for the patchting --- apt-pkg/acquire-item.cc | 112 ++++++++++++++++++++++++++++-------------------- apt-pkg/acquire-item.h | 3 +- methods/makefile | 2 +- methods/rred.cc | 2 +- 4 files changed, 69 insertions(+), 50 deletions(-) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 79e0b1898..166845868 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -141,8 +141,9 @@ void pkgAcquire::Item::Rename(string From,string To) */ pkgAcqIndexDiffs::pkgAcqIndexDiffs(pkgAcquire *Owner, string URI,string URIDesc,string ShortDesc, - string ExpectedMD5, vector<DiffInfo> diffs) - : Item(Owner), RealURI(URI), ExpectedMD5(ExpectedMD5), available_patches(diffs) + string ExpectedMD5, vector<DiffInfo> diffs) + : Item(Owner), RealURI(URI), ExpectedMD5(ExpectedMD5), + available_patches(diffs) { DestFile = _config->FindDir("Dir::State::lists") + "partial/"; @@ -171,10 +172,13 @@ pkgAcqIndexDiffs::pkgAcqIndexDiffs(pkgAcquire *Owner, return; } - if(available_patches.size() == 0) + if(available_patches.size() == 0) { + State = StateFetchIndex; QueueDiffIndex(URI); - else + } else { + State = StateFetchDiff; QueueNextDiff(); + } } void pkgAcqIndexDiffs::QueueDiffIndex(string URI) @@ -195,7 +199,8 @@ void pkgAcqIndexDiffs::QueueDiffIndex(string URI) /* The only header we use is the last-modified header. */ string pkgAcqIndexDiffs::Custom600Headers() { - if(DestFile.rfind(".IndexDiff") == string::npos) + // we only care for the IndexDiff file + if(State != StateFetchIndex) return string(""); string Final = _config->FindDir("Dir::State::lists"); @@ -248,33 +253,6 @@ void pkgAcqIndexDiffs::Finish(bool allDone) } -// this needs to be rewriten to not depend on the external ed -bool pkgAcqIndexDiffs::ApplyDiff(string PatchFile) -{ - char *error; - int res=0; - - string FinalFile = _config->FindDir("Dir::State::lists"); - FinalFile += URItoFileName(RealURI); - - int Process = ExecFork(); - if (Process == 0) - { - chdir(_config->FindDir("Dir::State::lists").c_str()); - // for some reason "red" fails with the pdiffs from p.d.o/~aba ?!? - string cmd = "(zcat " + PatchFile + "; echo \"wq\" ) | /bin/ed " + FinalFile + " >/dev/null 2>/dev/null"; - if(Debug) - std::clog << "Runing: " << cmd << std::endl; - res = system(cmd.c_str()); - _exit(WEXITSTATUS(res)); - } - if(!ExecWait(Process, error, true)) { - //_error->Error("Patch failed: %s ", error); - return false; - } - - return true; -} bool pkgAcqIndexDiffs::QueueNextDiff() { @@ -393,13 +371,14 @@ void pkgAcqIndexDiffs::Done(string Message,unsigned long Size,string Md5Hash, Item::Done(Message,Size,Md5Hash,Cnf); - int len = Desc.URI.size(); - // sucess in downloading the index - if(Desc.URI.substr(len-strlen("Index"),len-1) == "Index") { + string FinalFile; + FinalFile = _config->FindDir("Dir::State::lists")+URItoFileName(RealURI); - // rename - string FinalFile = _config->FindDir("Dir::State::lists"); - FinalFile += URItoFileName(RealURI) + string(".IndexDiff"); + // sucess in downloading the index + if(State == StateFetchIndex) + { + // rename the index + FinalFile += string(".IndexDiff"); if(Debug) std::clog << "Renaming: " << DestFile << " -> " << FinalFile << std::endl; @@ -413,21 +392,60 @@ void pkgAcqIndexDiffs::Done(string Message,unsigned long Size,string Md5Hash, return Finish(); } - // sucess in downloading a diff - if(Desc.URI.find(".diff") != string::npos) { - ApplyDiff(DestFile); + // sucess in downloading a diff, enter ApplyDiff state + if(State == StateFetchDiff) + { + + if(Debug) + std::clog << "Sending to gzip method: " << FinalFile << std::endl; + + string FileName = LookupTag(Message,"Filename"); + State = StateUnzipDiff; + Desc.URI = "gzip:" + FileName; + DestFile += ".decomp"; + QueueURI(Desc); + Mode = "gzip"; + return; + } + + // sucess in downloading a diff, enter ApplyDiff state + if(State == StateUnzipDiff) + { + + // rred excepts the patch as $FinalFile.ed + Rename(DestFile,FinalFile+".ed"); + + if(Debug) + std::clog << "Sending to rred method: " << FinalFile << std::endl; + + State = StateApplyDiff; + Desc.URI = "rred:" + FinalFile; + QueueURI(Desc); + Mode = "rred"; + return; + } + + + // success in download/apply a diff, queue next (if needed) + if(State == StateApplyDiff) + { + // remove the just applied patch available_patches.erase(available_patches.begin()); + // move into place + if(Debug) + std::clog << "Moving patched file in place: " << std::endl + << DestFile << " -> " << FinalFile << std::endl; + Rename(DestFile,FinalFile); + + // see if there is more to download if(available_patches.size() > 0) { new pkgAcqIndexDiffs(Owner, RealURI, Description, Desc.ShortDesc, ExpectedMD5, available_patches); - } else { - Finish(true); - return; - } + return Finish(); + } else + return Finish(true); } - - Finish(); } diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h index 8d58a39ba..99629216a 100644 --- a/apt-pkg/acquire-item.h +++ b/apt-pkg/acquire-item.h @@ -90,6 +90,7 @@ class pkgAcqIndexDiffs : public pkgAcquire::Item pkgAcquire::ItemDesc Desc; string RealURI; string ExpectedMD5; + // this is the SHA-1 sum we expect after the patching string ServerSha1; string CurrentPackagesFile; @@ -100,7 +101,7 @@ class pkgAcqIndexDiffs : public pkgAcquire::Item unsigned long size; }; vector<DiffInfo> available_patches; - + enum {StateFetchIndex,StateFetchDiff,StateUnzipDiff,StateApplyDiff} State; public: diff --git a/methods/makefile b/methods/makefile index 93ad6d875..bf8fc0dab 100644 --- a/methods/makefile +++ b/methods/makefile @@ -63,7 +63,7 @@ include $(PROGRAM_H) PROGRAM=rred SLIBS = -lapt-pkg $(SOCKETLIBS) LIB_MAKES = apt-pkg/makefile -SOURCE = rred +SOURCE = rred.cc include $(PROGRAM_H) # The rsh method diff --git a/methods/rred.cc b/methods/rred.cc index 37faab08a..e28dc6855 100644 --- a/methods/rred.cc +++ b/methods/rred.cc @@ -177,7 +177,7 @@ bool RredMethod::Fetch(FetchItem *Itm) Res.Filename = Itm->DestFile; URIStart(Res); // Res.Filename the destination filename - + // Open the source and destination files FileFd From(Path,FileFd::ReadOnly); FileFd Patch(Path+".ed",FileFd::ReadOnly); -- cgit v1.2.3 From 16176b647e76f316ec98f31f6dd806a49d7b8a77 Mon Sep 17 00:00:00 2001 From: Michael Vogt <michael.vogt@ubuntu.com> Date: Fri, 19 Aug 2005 15:30:19 +0000 Subject: * merged with mainline Patches applied: * andrelop@debian.org/apt--translation--0--base-0 tag of apt@packages.debian.org/apt--main--0--patch-79 * andrelop@debian.org/apt--translation--0--patch-1 Sync with Matt version. * andrelop@debian.org/apt--translation--0--patch-2 Update pt_BR translation * andrelop@debian.org/apt--translation--0--patch-3 Sync with bubulle's branch. * apt@packages.debian.org/apt--main--0--patch-88 Change debian/bugscript to use #!/bin/bash (Closes: #313402) * apt@packages.debian.org/apt--main--0--patch-89 Branch for Debian * apt@packages.debian.org/apt--main--0--patch-90 Update version in configure * apt@packages.debian.org/apt--main--0--patch-91 Fix French man page build * apt@packages.debian.org/apt--main--0--patch-92 Add the current Debian archive signing key * apt@packages.debian.org/apt--main--0--patch-93 Merge with mvo * apt@packages.debian.org/apt--main--0--patch-94 Update changelog * apt@packages.debian.org/apt--main--0--patch-95 Merge Christian's branch * apt@packages.debian.org/apt--main--0--patch-96 Update changelog * apt@packages.debian.org/apt--main--0--patch-97 Update priority of apt-utils to important, to match the override file * apt@packages.debian.org/apt--main--0--patch-98 Install only one keyring on each branch (Closes: #316119) * apt@packages.debian.org/apt--main--0--patch-99 Finalize 0.6.39 * apt@packages.debian.org/apt--main--0--patch-100 Use debian.org address in mainline * apt@packages.debian.org/apt--main--0--patch-101 Update pot file * apt@packages.debian.org/apt--main--0--patch-102 Open 0.6.40 * apt@packages.debian.org/apt--main--0--patch-103 Patch from Jordi Mallach to mark some additional strings for translation * apt@packages.debian.org/apt--main--0--patch-104 Updated Catalan translation from Jordi Mallach * apt@packages.debian.org/apt--main--0--patch-105 Merge from bubulle@debian.org--2005/apt--main--0 * apt@packages.debian.org/apt--main--0--patch-106 Restore lost changelog entries * apt@packages.debian.org/apt--main--0--patch-107 Merge michael.vogt@ubuntu.com--2005/apt--progress-reporting--0 * apt@packages.debian.org/apt--main--0--patch-108 Merge michael.vogt@ubuntu.com--2005/apt--progress-reporting--0 * apt@packages.debian.org/apt--main--0--patch-109 Merge michael.vogt@ubuntu.com--2005/apt--progress-reporting--0 * apt@packages.debian.org/apt--main--0--patch-110 Merge michael.vogt@ubuntu.com--2005/apt--progress-reporting--0 * bubulle@debian.org--2005/apt--main--0--patch-82 Fix permissions * bubulle@debian.org--2005/apt--main--0--patch-83 French translation spellchecked * bubulle@debian.org--2005/apt--main--0--patch-84 Spell corrections in German translations * bubulle@debian.org--2005/apt--main--0--patch-85 Correct some file permissions * bubulle@debian.org--2005/apt--main--0--patch-86 Correct Hebrew translation * bubulle@debian.org--2005/apt--main--0--patch-87 Sync Portuguese translation with the POT file * bubulle@debian.org--2005/apt--main--0--patch-88 Updated Danish translation (not yet complete) * bubulle@debian.org--2005/apt--main--0--patch-89 Sync with Andre Luis Lopes and Otavio branches * bubulle@debian.org--2005/apt--main--0--patch-90 Merge with Matt * bubulle@debian.org--2005/apt--main--0--patch-91 Updated Slovak translation * bubulle@debian.org--2005/apt--main--0--patch-92 Add apt-key French man page * bubulle@debian.org--2005/apt--main--0--patch-93 Update Greek translations * bubulle@debian.org--2005/apt--main--0--patch-94 Merge with Matt * bubulle@debian.org--2005/apt--main--0--patch-95 Sync PO files with the POT file/French translation update * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-22 * added myself to uploaders, changelog is signed with mvo@debian.org and in sync with the debian/experimental upload * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-23 * apt-cache show <virtual-pkg> shows all virtual packages instead of nothing (thanks to otavio) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-24 * changelog updated * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-25 * make pinning on component work again (we just use the section, as apt-0.6 don't use per-section Release files anymore) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-27 * updated the changelog * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-28 * merged with my apt--fixes--0 branch * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-29 * added a missing OpProgress::Done() in depCache::Init(), removed the show-virtual-packages patch in apt-cache because matt does not like him :/ * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-30 * fix a stupid bug in the depcache::Init() code * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-31 * merged/removed conflicts with apt--main--0 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-32 * merged apt--main and make sure that the po files come from apt--main (because they are more recent) * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--base-0 tag of apt@packages.debian.org/apt--main--0--patch-85 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-1 * inital proof of concept code, understands what dpkg tells it already * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-2 * progress reporting works now * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-3 * added "APT::Status-Fd" variable * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-4 * do i18n now too * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-5 * define N_(x) if it is not defined already * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-6 * PackageManager::DoInstall(int status_fd) added (does not break the ABI) * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-7 * merged with apt--fixes--0 to make it build again * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-8 * added support for "error" and "conffile-prompt" messages from dpkg * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-9 merge with main * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-10 * use sizeof() for all snprintf() uses; fix a potential line break problem in the status reading code; changed the N_() to _() calls * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-11 * added APT::KeepFDs configuration list for file descriptors that apt should leave open (needed for various frontends like debconf, synaptic) * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-12 * fixed a API breakage * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-13 * doc added, should be releasable now * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-14 * merged with apt--main--0 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-15 * more source comments, added Debug::DpkgPM debug code to inspect the dpkg<->apt communication, broke the abi (ok with matt) * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-16 * the progress reporting has it's own "Debug::pkgDPkgProgressReporting" debug variable now * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-17 * merged PackageOps and TranslatedPackageOps into a single Map with the new DpkgState struct * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-18 * clear the APT::Keep-Fds configuration when it's no longer needed * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-19 * rewrote the reading from dpkg so that it never blocks * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-20 * merged the two status arrays into one * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-21 * added support for download progress reporting too (for Kamion and base-config) * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-22 * ABI break; added Configuration::Clear(string List, {int,string} value) added (to remove a single Value from a list); test/conf_clear.cc added * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-23 * remvoed a debug string * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-24 * soname changed, fixed a bug in the parsing code when dpkg send the same state more than once (at the end) * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-25 * merged with apt@packages.debian.org/apt--main--0, added changelog entry for the 0.6.40.1 upload * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-26 * fix a bug when out-of-order states are send from dpkg * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-27 * changelog update * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-28 * a real changelog entry now * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-29 * changelog finalized * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-30 * propper (and sane) support for pmerror and pmconffile added --- README.progress-reporting | 62 +++ apt-pkg/acquire.cc | 21 + apt-pkg/contrib/configuration.cc | 45 ++- apt-pkg/contrib/configuration.h | 7 +- apt-pkg/contrib/fileutl.cc | 24 +- apt-pkg/contrib/fileutl.h | 2 +- apt-pkg/deb/debindexfile.cc | 4 +- apt-pkg/deb/deblistparser.cc | 11 +- apt-pkg/deb/deblistparser.h | 3 +- apt-pkg/deb/dpkgpm.cc | 242 +++++++++-- apt-pkg/deb/dpkgpm.h | 9 +- apt-pkg/depcache.cc | 3 + apt-pkg/init.h | 2 +- apt-pkg/makefile | 2 +- apt-pkg/packagemanager.cc | 4 +- apt-pkg/packagemanager.h | 2 +- cmdline/apt-get.cc | 22 +- cmdline/apt-key | 6 +- configure.in | 2 +- debian/apt-doc.docs | 1 + debian/apt.manpages | 1 + debian/apt.postinst | 2 +- debian/bugscript | 2 +- debian/changelog | 290 ++++++++++++++ debian/control | 4 +- debian/rules | 2 +- doc/examples/configure-index | 8 + methods/gpgv.cc | 30 +- methods/makefile | 2 +- po/apt-all.pot | 168 ++++---- po/bs.po | 130 +++--- po/ca.po | 295 ++++++++------ po/cs.po | 131 +++--- po/cy.po | 841 +++++++++++++++++++++++---------------- po/da.po | 212 +++++----- po/de.po | 163 ++++---- po/el.po | 157 ++++---- po/en_GB.po | 132 +++--- po/es.po | 131 +++--- po/eu.po | 121 +++--- po/fi.po | 131 +++--- po/fr.po | 383 ++++++++++++++---- po/he.po | 135 ++++--- po/hu.po | 131 +++--- po/it.po | 131 +++--- po/ja.po | 131 +++--- po/ko.po | 131 +++--- po/nb.po | 131 +++--- po/nl.po | 131 +++--- po/nn.po | 131 +++--- po/pl.po | 131 +++--- po/pt.po | 202 +++++----- po/pt_BR.po | 157 ++++---- po/ro.po | 131 +++--- po/ru.po | 131 +++--- po/sk.po | 183 ++++----- po/sl.po | 131 +++--- po/sv.po | 131 +++--- po/tl.po | 131 +++--- po/zh_CN.po | 131 +++--- po/zh_TW.po | 131 +++--- share/debian-archive.gpg | Bin 477 -> 1303 bytes test/conf_clear.cc | 23 ++ test/makefile | 6 + 64 files changed, 3818 insertions(+), 2663 deletions(-) create mode 100644 README.progress-reporting create mode 100644 debian/apt-doc.docs create mode 100644 test/conf_clear.cc diff --git a/README.progress-reporting b/README.progress-reporting new file mode 100644 index 000000000..73fbd8c08 --- /dev/null +++ b/README.progress-reporting @@ -0,0 +1,62 @@ +Install-progress reporting +-------------------------- + +If the apt options: "APT::Status-Fd" is set, apt will send status +reports to that fd. The status information is seperated with a ':', +there are the following status conditions: + +status = {"pmstatus", "dlstatus", "conffile-prompt", "error" } + +The reason for using a fd instead of a OpProgress class is that many +apt frontend fork a (vte) terminal for the actual installation. + +The reason to do the mapping and l10n of the dpkg states to human +readable (and translatable) strings is that this way the translation +needs to be done only once for all frontends. + + +pmstatus +-------- +Status of the package manager (dpkg). This is send when packages +are installed/removed. +pmstatus:pkgname:TotalPercentage:action-description + +PkgName = the name of the package +TotalPercentage = the total progress between [0..100] +description = a i18ned human readable decription of the current action + + +Example: +# ./apt-get install -o APT::Status-Fd=2 3dchess >/dev/null +pmstatus:3dchess:20:Preparing 3dchess +pmstatus:3dchess:40:Unpacking 3dchess +pmstatus:3dchess:60:Preparing to configure 3dchess +pmstatus:3dchess:80:Configuring 3dchess +pmstatus:3dchess:100:Installed 3dchess + +pmerror +------- +pmerror:deb:TotalPercentage:error string + +Example: +pmerror: /var/cache/apt/archives/krecipes_0.8.1-0ubuntu1_i386.deb : 75% : trying to overwrite `/usr/share/doc/kde/HTML/en/krecipes/krectip.png', which is also in package krecipes-data + + +pmconffile +---------- +pmconffile:conffile:percent:'current-conffile' 'new-conffile' useredited distedited + + + +dlstatus +-------- +dlstatus:AlreadDownloaded:TotalPercentage:action-description + +AlreadyDownloaded = the number of already downloaded packages +TotalPercentage = the total progress between [0..100] +description = a i18ned human readable decription of the current action + +Example: +dlstatus:1:9.05654:Downloading file 1 of 3 (4m40s remaining) +dlstatus:1:9.46357:Downloading file 1 of 3 (4m39s remaining) +dlstatus:1:9.61022:Downloading file 1 of 3 (4m38s remaining) \ No newline at end of file diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc index 212c8d52b..47655af80 100644 --- a/apt-pkg/acquire.cc +++ b/apt-pkg/acquire.cc @@ -26,6 +26,7 @@ #include <apti18n.h> #include <iostream> +#include <sstream> #include <dirent.h> #include <sys/time.h> @@ -807,6 +808,26 @@ bool pkgAcquireStatus::Pulse(pkgAcquire *Owner) Time = NewTime; } + int fd = _config->FindI("APT::Status-Fd",-1); + if(fd > 0) + { + ostringstream status; + + char msg[200]; + long i = CurrentItems < TotalItems ? CurrentItems + 1 : CurrentItems; + unsigned long ETA = + (unsigned long)((TotalBytes - CurrentBytes) / CurrentCPS); + + snprintf(msg,sizeof(msg), _("Downloading file %li of %li (%s remaining)"), i, TotalItems, TimeToStr(ETA).c_str()); + + // build the status str + status << "dlstatus:" << i + << ":" << (CurrentBytes/float(TotalBytes)*100.0) + << ":" << msg + << endl; + write(fd, status.str().c_str(), status.str().size()); + } + return true; } /*}}}*/ diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc index 69f8d1dca..09e454be9 100644 --- a/apt-pkg/contrib/configuration.cc +++ b/apt-pkg/contrib/configuration.cc @@ -325,6 +325,47 @@ void Configuration::Set(const char *Name,int Value) char S[300]; snprintf(S,sizeof(S),"%i",Value); Itm->Value = S; +} + /*}}}*/ +// Configuration::Clear - Clear an single value from a list /*{{{*/ +// --------------------------------------------------------------------- +/* */ +void Configuration::Clear(string Name, int Value) +{ + char S[300]; + snprintf(S,sizeof(S),"%i",Value); + Clear(Name, S); +} + /*}}}*/ +// Configuration::Clear - Clear an single value from a list /*{{{*/ +// --------------------------------------------------------------------- +/* */ +void Configuration::Clear(string Name, string Value) +{ + Item *Top = Lookup(Name.c_str(),false); + if (Top == 0 || Top->Child == 0) + return; + + Item *Tmp, *Prev, *I; + Prev = I = Top->Child; + + while(I != NULL) + { + if(I->Value == Value) + { + Tmp = I; + // was first element, point parent to new first element + if(Top->Child == Tmp) + Top->Child = I->Next; + I = I->Next; + Prev->Next = I; + delete Tmp; + } else { + Prev = I; + I = I->Next; + } + } + } /*}}}*/ // Configuration::Clear - Clear an entire tree /*{{{*/ @@ -333,9 +374,9 @@ void Configuration::Set(const char *Name,int Value) void Configuration::Clear(string Name) { Item *Top = Lookup(Name.c_str(),false); - if (Top == 0) + if (Top == 0) return; - + Top->Value = string(); Item *Stop = Top; Top = Top->Child; diff --git a/apt-pkg/contrib/configuration.h b/apt-pkg/contrib/configuration.h index 0ed8f59d3..789bc82cf 100644 --- a/apt-pkg/contrib/configuration.h +++ b/apt-pkg/contrib/configuration.h @@ -87,8 +87,13 @@ class Configuration bool Exists(const char *Name) const; bool ExistsAny(const char *Name) const; + // clear a whole tree void Clear(string Name); - + + // remove a certain value from a list (e.g. the list of "APT::Keep-Fds") + void Clear(string List, string Value); + void Clear(string List, int Value); + inline const Item *Tree(const char *Name) const {return Lookup(Name);}; inline void Dump() { Dump(std::clog); }; diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index 0ce0c9b9d..9fd71728e 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -20,6 +20,7 @@ #include <apt-pkg/fileutl.h> #include <apt-pkg/error.h> #include <apt-pkg/sptr.h> +#include <apt-pkg/configuration.h> #include <apti18n.h> @@ -32,6 +33,7 @@ #include <sys/wait.h> #include <signal.h> #include <errno.h> +#include <set> /*}}}*/ using namespace std; @@ -306,7 +308,7 @@ bool WaitFd(int Fd,bool write,unsigned long timeout) /* This is used if you want to cleanse the environment for the forked child, it fixes up the important signals and nukes all of the fds, otherwise acts like normal fork. */ -pid_t ExecFork(int dontCloseThisFd) +pid_t ExecFork() { // Fork off the process pid_t Process = fork(); @@ -326,11 +328,27 @@ pid_t ExecFork(int dontCloseThisFd) signal(SIGWINCH,SIG_DFL); signal(SIGCONT,SIG_DFL); signal(SIGTSTP,SIG_DFL); - + + set<int> KeepFDs; + Configuration::Item const *Opts = _config->Tree("APT::Keep-Fds"); + if (Opts != 0 && Opts->Child != 0) + { + Opts = Opts->Child; + for (; Opts != 0; Opts = Opts->Next) + { + if (Opts->Value.empty() == true) + continue; + int fd = atoi(Opts->Value.c_str()); + KeepFDs.insert(fd); + } + } + // Close all of our FDs - just in case for (int K = 3; K != 40; K++) - if(K != dontCloseThisFd) + { + if(KeepFDs.find(K) == KeepFDs.end()) fcntl(K,F_SETFD,FD_CLOEXEC); + } } return Process; diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h index 4716e261e..041aa3309 100644 --- a/apt-pkg/contrib/fileutl.h +++ b/apt-pkg/contrib/fileutl.h @@ -87,7 +87,7 @@ string SafeGetCWD(); void SetCloseExec(int Fd,bool Close); void SetNonBlock(int Fd,bool Block); bool WaitFd(int Fd,bool write = false,unsigned long timeout = 0); -pid_t ExecFork(int dontCloseThisFd=-1); +pid_t ExecFork(); bool ExecWait(pid_t Pid,const char *Name,bool Reap = false); // File string manipulators diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc index f26265fff..ff8bce85d 100644 --- a/apt-pkg/deb/debindexfile.cc +++ b/apt-pkg/deb/debindexfile.cc @@ -24,7 +24,7 @@ #include <apt-pkg/strutl.h> #include <apt-pkg/acquire-item.h> #include <apt-pkg/debmetaindex.h> - + #include <sys/stat.h> /*}}}*/ @@ -290,7 +290,7 @@ bool debPackagesIndex::Merge(pkgCacheGenerator &Gen,OpProgress &Prog) const FileFd Rel(ReleaseFile,FileFd::ReadOnly); if (_error->PendingError() == true) return false; - Parser.LoadReleaseInfo(File,Rel); + Parser.LoadReleaseInfo(File,Rel,Section); } return true; diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index 96a80582d..25b533773 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -564,13 +564,20 @@ bool debListParser::Step() // --------------------------------------------------------------------- /* */ bool debListParser::LoadReleaseInfo(pkgCache::PkgFileIterator FileI, - FileFd &File) + FileFd &File, string component) { pkgTagFile Tags(&File, File.Size() + 256); // XXX pkgTagSection Section; if (Tags.Step(Section) == false) return false; + //mvo: I don't think we need to fill that in (it's unused since apt-0.6) + //FileI->Architecture = WriteUniqString(Arch); + + // apt-secure does no longer download individual (per-section) Release + // file. to provide Component pinning we use the section name now + FileI->Component = WriteUniqString(component); + const char *Start; const char *Stop; if (Section.Find("Suite",Start,Stop) == true) @@ -589,7 +596,7 @@ bool debListParser::LoadReleaseInfo(pkgCache::PkgFileIterator FileI, if (Section.FindFlag("NotAutomatic",FileI->Flags, pkgCache::Flag::NotAutomatic) == false) _error->Warning("Bad NotAutomatic flag"); - + return !_error->PendingError(); } /*}}}*/ diff --git a/apt-pkg/deb/deblistparser.h b/apt-pkg/deb/deblistparser.h index 9f305211a..3a0e0421b 100644 --- a/apt-pkg/deb/deblistparser.h +++ b/apt-pkg/deb/deblistparser.h @@ -55,7 +55,8 @@ class debListParser : public pkgCacheGenerator::ListParser virtual bool Step(); - bool LoadReleaseInfo(pkgCache::PkgFileIterator FileI,FileFd &File); + bool LoadReleaseInfo(pkgCache::PkgFileIterator FileI,FileFd &File, + string section); static const char *ParseDepends(const char *Start,const char *Stop, string &Package,string &Ver,unsigned int &Op, diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 61c48dcbb..fe8fbca74 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -25,7 +25,11 @@ #include <signal.h> #include <errno.h> #include <stdio.h> -#include <iostream> +#include <sstream> +#include <map> + +#include <config.h> +#include <apti18n.h> /*}}}*/ using namespace std; @@ -325,8 +329,14 @@ bool pkgDPkgPM::RunScriptsWithPkgs(const char *Cnf) /*}}}*/ // DPkgPM::Go - Run the sequence /*{{{*/ // --------------------------------------------------------------------- -/* This globs the operations and calls dpkg */ -bool pkgDPkgPM::Go(int status_fd) +/* This globs the operations and calls dpkg + * + * If it is called with "OutStatusFd" set to a valid file descriptor + * apt will report the install progress over this fd. It maps the + * dpkg states a package goes through to human readable (and i10n-able) + * names and calculates a percentage for each step. +*/ +bool pkgDPkgPM::Go(int OutStatusFd) { unsigned int MaxArgs = _config->FindI("Dpkg::MaxArgs",8*1024); unsigned int MaxArgBytes = _config->FindI("Dpkg::MaxArgBytes",32*1024); @@ -336,7 +346,66 @@ bool pkgDPkgPM::Go(int status_fd) 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] = { + // Install operation + { + {"half-installed", _("Preparing %s")}, + {"unpacked", _("Unpacking %s") }, + {NULL, NULL} + }, + // Configure operation + { + {"unpacked",_("Preparing to configure %s") }, + {"half-configured", _("Configuring %s") }, + { "installed", _("Installed %s")}, + {NULL, NULL} + }, + // Remove operation + { + {"half-configured", _("Preparing for removal of %s")}, + {"half-installed", _("Removing %s")}, + {"config-files", _("Removed %s")}, + {NULL, NULL} + }, + // Purge operation + { + {"config-files", _("Preparing for remove with config %s")}, + {"not-installed", _("Removed with config %s")}, + {NULL, NULL} + }, + }; + // 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,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) + // and the PackageOpsTranslations (human readable strings) + for (vector<Item>::iterator I = List.begin(); I != List.end();I++) + { + string name = (*I).Pkg.Name(); + PackageOpsDone[name] = 0; + for(int i=0; (DpkgStatesOpMap[(*I).Op][i]).state != NULL; i++) + { + PackageOps[name].push_back(DpkgStatesOpMap[(*I).Op][i]); + Total++; + } + } + + // this loop is runs once per operation for (vector<Item>::iterator I = List.begin(); I != List.end();) { vector<Item>::iterator J = I; @@ -367,16 +436,15 @@ bool pkgDPkgPM::Go(int status_fd) } } - // if we got a status_fd argument, we pass it to apt char status_fd_buf[20]; - if(status_fd > 0) - { - Args[n++] = "--status-fd"; - Size += strlen(Args[n-1]); - snprintf(status_fd_buf,20,"%i",status_fd); - Args[n++] = status_fd_buf; - Size += strlen(Args[n-1]); - } + int fd[2]; + pipe(fd); + + Args[n++] = "--status-fd"; + Size += strlen(Args[n-1]); + snprintf(status_fd_buf,sizeof(status_fd_buf),"%i", fd[1]); + Args[n++] = status_fd_buf; + Size += strlen(Args[n-1]); switch (I->Op) { @@ -449,17 +517,17 @@ bool pkgDPkgPM::Go(int status_fd) 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); - - // Fork dpkg + + // Fork dpkg pid_t Child; - if(status_fd > 0) - Child = ExecFork(status_fd); - else - Child = ExecFork(); + _config->Set("APT::Keep-Fds::",fd[1]); + Child = ExecFork(); // This is the child if (Child == 0) { + close(fd[0]); // close the read end of the pipe + if (chdir(_config->FindDir("DPkg::Run-Directory","/").c_str()) != 0) _exit(100); @@ -487,19 +555,141 @@ bool pkgDPkgPM::Go(int status_fd) _exit(100); } + // clear the Keep-Fd again + _config->Clear("APT::Keep-Fds",fd[1]); + // Wait for dpkg int Status = 0; - while (waitpid(Child,&Status,0) != Child) - { - if (errno == EINTR) + + // 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; + + while ((res=waitpid(Child,&Status, WNOHANG)) != Child) { + if(res < 0) { + // FIXME: move this to a function or something, looks ugly here + // error handling, waitpid returned -1 + if (errno == EINTR) + continue; + RunScripts("DPkg::Post-Invoke"); + + // Restore sig int/quit + signal(SIGQUIT,old_SIGQUIT); + 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; - RunScripts("DPkg::Post-Invoke"); + } + + // sanity check (should never happen) + if(strlen(line) >= sizeof(line)-10) + { + _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[4]; + TokSplitString(':', line, list, 5); + char *pkg = list[1]; + char *action = _strstrip(list[2]); + + 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; - // Restore sig int/quit - signal(SIGQUIT,old_SIGQUIT); - signal(SIGINT,old_SIGINT); - return _error->Errno("waitpid","Couldn't wait for subprocess"); + // reset the line buffer + line[0]=0; } + close(_dpkgin); // Restore sig int/quit signal(SIGQUIT,old_SIGQUIT); diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h index b59b9dc93..2ff8a9ac7 100644 --- a/apt-pkg/deb/dpkgpm.h +++ b/apt-pkg/deb/dpkgpm.h @@ -23,6 +23,13 @@ using std::vector; class pkgDPkgPM : public pkgPackageManager { protected: + + // used for progress reporting + struct DpkgState + { + const char *state; // the dpkg state (e.g. "unpack") + const char *str; // the human readable translation of the state + }; struct Item { @@ -45,7 +52,7 @@ class pkgDPkgPM : public pkgPackageManager virtual bool Install(PkgIterator Pkg,string File); virtual bool Configure(PkgIterator Pkg); virtual bool Remove(PkgIterator Pkg,bool Purge = false); - virtual bool Go(int status_fd=-1); + virtual bool Go(int StatusFd=-1); virtual void Reset(); public: diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index c6bf3185a..dd1c794c9 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -91,6 +91,9 @@ bool pkgDepCache::Init(OpProgress *Prog) } Update(Prog); + + if(Prog != 0) + Prog->Done(); return true; } diff --git a/apt-pkg/init.h b/apt-pkg/init.h index 74ac3a7ca..8255b406a 100644 --- a/apt-pkg/init.h +++ b/apt-pkg/init.h @@ -18,7 +18,7 @@ // See the makefile #define APT_PKG_MAJOR 3 -#define APT_PKG_MINOR 5 +#define APT_PKG_MINOR 11 #define APT_PKG_RELEASE 0 extern const char *pkgVersion; diff --git a/apt-pkg/makefile b/apt-pkg/makefile index 5f48f0f52..0e6aecc65 100644 --- a/apt-pkg/makefile +++ b/apt-pkg/makefile @@ -13,7 +13,7 @@ include ../buildlib/defaults.mak # methods/makefile - FIXME LIBRARY=apt-pkg LIBEXT=$(GLIBC_VER)$(LIBSTDCPP_VER) -MAJOR=3.9 +MAJOR=3.11 MINOR=0 SLIBS=$(PTHREADLIB) $(INTLLIBS) APT_DOMAIN:=libapt-pkg$(MAJOR) diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc index a08ccd602..155408bb4 100644 --- a/apt-pkg/packagemanager.cc +++ b/apt-pkg/packagemanager.cc @@ -631,11 +631,11 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall() // --------------------------------------------------------------------- /* This uses the filenames in FileNames and the information in the DepCache to perform the installation of packages.*/ -pkgPackageManager::OrderResult pkgPackageManager::DoInstall() +pkgPackageManager::OrderResult pkgPackageManager::DoInstall(int status_fd) { OrderResult Res = OrderInstall(); if (Res != Failed) - if (Go() == false) + if (Go(status_fd) == false) return Failed; return Res; } diff --git a/apt-pkg/packagemanager.h b/apt-pkg/packagemanager.h index 43f2c4ace..f64637d03 100644 --- a/apt-pkg/packagemanager.h +++ b/apt-pkg/packagemanager.h @@ -76,7 +76,7 @@ class pkgPackageManager : protected pkgCache::Namespace // Main action members bool GetArchives(pkgAcquire *Owner,pkgSourceList *Sources, pkgRecords *Recs); - OrderResult DoInstall(); + OrderResult DoInstall(int statusFd=-1); bool FixMissing(); pkgPackageManager(pkgDepCache *Cache); diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 316bb7af9..e673e0f5b 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -688,7 +688,7 @@ static bool CheckAuth(pkgAcquire& Fetcher) if (_config->FindB("APT::Get::AllowUnauthenticated",false) == true) { - c2out << "Authentication warning overridden.\n"; + c2out << _("Authentication warning overridden.\n"); return true; } @@ -750,7 +750,7 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true, if (Cache->BrokenCount() != 0) { ShowBroken(c1out,Cache,false); - return _error->Error("Internal error, InstallPackages was called with broken packages!"); + return _error->Error(_("Internal error, InstallPackages was called with broken packages!")); } if (Cache->DelCount() == 0 && Cache->InstCount() == 0 && @@ -765,11 +765,12 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true, if (_config->FindB("APT::Get::Simulate") == true) { pkgSimulate PM(Cache); - pkgPackageManager::OrderResult Res = PM.DoInstall(); + int status_fd = _config->FindI("APT::Status-Fd",-1); + pkgPackageManager::OrderResult Res = PM.DoInstall(status_fd); if (Res == pkgPackageManager::Failed) return false; if (Res != pkgPackageManager::Completed) - return _error->Error("Internal error, Ordering didn't finish"); + return _error->Error(_("Internal error, Ordering didn't finish")); return true; } @@ -810,7 +811,7 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true, if (DebBytes != Cache->DebSize()) { c0out << DebBytes << ',' << Cache->DebSize() << endl; - c0out << "How odd.. The sizes didn't match, email apt@packages.debian.org" << endl; + c0out << _("How odd.. The sizes didn't match, email apt@packages.debian.org") << endl; } // Number of bytes @@ -840,7 +841,7 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true, struct statvfs Buf; string OutputDir = _config->FindDir("Dir::Cache::Archives"); if (statvfs(OutputDir.c_str(),&Buf) != 0) - return _error->Errno("statvfs","Couldn't determine free space in %s", + return _error->Errno("statvfs",_("Couldn't determine free space in %s"), OutputDir.c_str()); if (unsigned(Buf.f_bfree) < (FetchBytes - FetchPBytes)/Buf.f_bsize) return _error->Error(_("You don't have enough free space in %s."), @@ -994,7 +995,8 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true, } _system->UnLock(); - pkgPackageManager::OrderResult Res = PM->DoInstall(); + int status_fd = _config->FindI("APT::Status-Fd",-1); + pkgPackageManager::OrderResult Res = PM->DoInstall(status_fd); if (Res == pkgPackageManager::Failed || _error->PendingError() == true) return false; if (Res == pkgPackageManager::Completed) @@ -1743,7 +1745,7 @@ bool DoDSelectUpgrade(CommandLine &CmdL) if (Fix.Resolve() == false) { ShowBroken(c1out,Cache,false); - return _error->Error("Internal error, problem resolver broke stuff"); + return _error->Error(_("Internal error, problem resolver broke stuff")); } } @@ -1751,7 +1753,7 @@ bool DoDSelectUpgrade(CommandLine &CmdL) if (pkgAllUpgrade(Cache) == false) { ShowBroken(c1out,Cache,false); - return _error->Error("Internal error, problem resolver broke stuff"); + return _error->Error(_("Internal error, problem resolver broke stuff")); } return InstallPackages(Cache,false); @@ -1922,7 +1924,7 @@ bool DoSource(CommandLine &CmdL) struct statvfs Buf; string OutputDir = "."; if (statvfs(OutputDir.c_str(),&Buf) != 0) - return _error->Errno("statvfs","Couldn't determine free space in %s", + return _error->Errno("statvfs",_("Couldn't determine free space in %s"), OutputDir.c_str()); if (unsigned(Buf.f_bfree) < (FetchBytes - FetchPBytes)/Buf.f_bsize) return _error->Error(_("You don't have enough free space in %s"), diff --git a/cmdline/apt-key b/cmdline/apt-key index be2b19a1a..0685e36f7 100755 --- a/cmdline/apt-key +++ b/cmdline/apt-key @@ -9,14 +9,14 @@ GPG_CMD="gpg --no-options --no-default-keyring --secret-keyring /etc/apt/secring GPG="$GPG_CMD --keyring /etc/apt/trusted.gpg" -ARCHIVE_KEYRING=/usr/share/keyrings/ubuntu-archive-keyring.gpg -REMOVED_KEYS=/usr/share/keyrings/ubuntu-archive-removed-keys.gpg +ARCHIVE_KEYRING=/usr/share/keyrings/debian-archive-keyring.gpg +REMOVED_KEYS=/usr/share/keyrings/debian-archive-removed-keys.gpg update() { if [ ! -f $ARCHIVE_KEYRING ]; then echo >&2 "ERROR: Can't find the archive-keyring" - echo >&2 "Is the ubuntu-keyring package installed?" + echo >&2 "Is the debian-keyring package installed?" exit 1 fi diff --git a/configure.in b/configure.in index 767399b52..1ee7e168b 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.6.37") +AC_DEFINE_UNQUOTED(VERSION,"0.6.40.2") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/apt-doc.docs b/debian/apt-doc.docs new file mode 100644 index 000000000..a7507f4e7 --- /dev/null +++ b/debian/apt-doc.docs @@ -0,0 +1 @@ +README.progress-reporting \ No newline at end of file diff --git a/debian/apt.manpages b/debian/apt.manpages index 7a15245d4..e621e1c49 100644 --- a/debian/apt.manpages +++ b/debian/apt.manpages @@ -10,6 +10,7 @@ doc/fr/apt-cache.fr.8 doc/fr/apt-cdrom.fr.8 doc/fr/apt-config.fr.8 doc/fr/apt-get.fr.8 +doc/fr/apt-key.fr.8 doc/fr/apt.conf.fr.5 doc/fr/apt_preferences.fr.5 doc/fr/sources.list.fr.5 diff --git a/debian/apt.postinst b/debian/apt.postinst index df0433057..ae1801198 100644 --- a/debian/apt.postinst +++ b/debian/apt.postinst @@ -17,7 +17,7 @@ case "$1" in configure) if ! test -f /etc/apt/trusted.gpg; then - cp /usr/share/apt/ubuntu-archive.gpg /etc/apt/trusted.gpg + cp /usr/share/apt/debian-archive.gpg /etc/apt/trusted.gpg fi ;; diff --git a/debian/bugscript b/debian/bugscript index 8423e07c2..f5ec9e05d 100755 --- a/debian/bugscript +++ b/debian/bugscript @@ -1,4 +1,4 @@ -#!/bin/sh -e +#!/bin/bash -e # reportbug #169495 if [ -z "$YESNO" ]; then diff --git a/debian/changelog b/debian/changelog index 1ce780163..614041acf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,62 @@ +apt (0.6.40.2) unstable; urgency=low + + * improved the support for "error" and "conffile" reporting from + dpkg, added the format to README.progress-reporting + * added README.progress-reporting to the apt-doc package + + -- + +apt (0.6.40.1) unstable; urgency=low + + * bugfix in the parsing code for the apt<->dpkg communication. apt + crashed when dpkg sends the same state more than once under certain + conditions + * 0.6.40 breaks the ABI but I accidentally didn't change the soname :/ + + -- Michael Vogt <mvo@debian.org> Fri, 5 Aug 2005 13:24:58 +0200 + +apt (0.6.40) unstable; urgency=low + + * Patch from Jordi Mallach to mark some additional strings for translation + * Updated Catalan translation from Jordi Mallach + * Merge from bubulle@debian.org--2005/apt--main--0: + - Update pot and merge with *.po + - Updated French translation, including apt-key.fr.8 + * Restore changelog entries from the 0.6.x series that went to Debian + experimental + * Merge michael.vogt@ubuntu.com--2005/apt--progress-reporting--0 + - Provide an interface for progress reporting which can be used by + (e.g.) base-config + + -- Matt Zimmerman <mdz@debian.org> Thu, 28 Jul 2005 11:57:32 -0700 + +apt (0.6.39) unstable; urgency=low + + * Welsh translation update: daf@muse.19inch.net--2005/apt--main--0--patch-6 + * Merge mvo's changes from 0.6.36ubuntu1: + michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-32 + * Merge aggregated translation updates: + bubulle@debian.org--2005/apt--main--0 + * Update priority of apt-utils to important, to match the override file + * Install only one keyring on each branch (Closes: #316119) + + -- Matt Zimmerman <mdz@debian.org> Tue, 28 Jun 2005 11:51:09 -0700 + +apt (0.6.38) unstable; urgency=low + + * Merge michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-6, a workaround + for the French man pages' failure to build + * Branch Debian and Ubuntu + - apt.postinst, apt-key: use the appropriate keyring + - debian/rules: install all keyrings + * Add the current Debian archive signing key (4F368D5D) to + debian-archive.gpg + * make pinning on the "component" work again (using the section of the + archive, we don't use per-section Release files anymore with apt-0.6) + (closes ubuntu #9935) + + -- Matt Zimmerman <mdz@debian.org> Sat, 25 Jun 2005 09:51:00 -0700 + apt (0.6.37) breezy; urgency=low * Merge bubulle@debian.org--2005/apt--main--0 up to patch-81 @@ -12,6 +71,7 @@ apt (0.6.37) breezy; urgency=low * Fix build of French man pages (now using XML, not SGML) * Add Welsh translation from Dafydd Harries (daf@muse.19inch.net--2005/apt--main--0--patch-1) + * Change debian/bugscript to use #!/bin/bash (Closes: #313402) -- Matt Zimmerman <mdz@ubuntu.com> Tue, 24 May 2005 14:38:25 -0700 @@ -175,6 +235,236 @@ apt (0.6.27) hoary; urgency=low -- Matt Zimmerman <mdz@canonical.com> Mon, 13 Dec 2004 01:03:11 -0800 +apt (0.6.25) experimental; urgency=low + + * Fix handling of two-part sources for sources.list deb-src entries in + the same way that deb entries were fixed + + -- Matt Zimmerman <mdz@debian.org> Wed, 9 Jun 2004 05:29:50 -0700 + +apt (0.6.24) experimental; urgency=low + + * YnPrompt fixes were inadvertently left out, include them (Closes: + #249251) + + -- Matt Zimmerman <mdz@debian.org> Sun, 16 May 2004 14:18:53 -0700 + +apt (0.6.23) experimental; urgency=low + + * Remove obsolete pkgIterator::TargetVer() (Closes: #230159) + * Reverse test in CheckAuth to match new prompt (Closes: #248211) + + -- Matt Zimmerman <mdz@debian.org> Sun, 9 May 2004 21:01:58 -0700 + +apt (0.6.22) experimental; urgency=low + + * Merge 0.5.25 + * Make the unauthenticated packages prompt more intuitive (yes to + continue, default no), but require --force-yes in addition to + --assume-yes in order to override + + -- Matt Zimmerman <mdz@debian.org> Fri, 19 Mar 2004 13:55:35 -0800 + +apt (0.6.21) experimental; urgency=low + + * Merge 0.5.24 + + -- Matt Zimmerman <mdz@debian.org> Tue, 16 Mar 2004 22:52:34 -0800 + +apt (0.6.20) experimental; urgency=low + + * Merge 0.5.23 + + -- Matt Zimmerman <mdz@debian.org> Thu, 26 Feb 2004 17:17:02 -0800 + +apt (0.6.19) experimental; urgency=low + + * Merge 0.5.22 + * Convert apt-key(8) to docbook XML + + -- Matt Zimmerman <mdz@debian.org> Mon, 9 Feb 2004 15:44:49 -0800 + +apt (0.6.18) experimental; urgency=low + + * Add new Debian Archive Automatic Signing Key to the default keyring + (existing keyrings are not updated; do that yourself) + + -- Matt Zimmerman <mdz@debian.org> Sat, 17 Jan 2004 17:04:30 -0800 + +apt (0.6.17) experimental; urgency=low + + * Merge 0.5.21 + * Handle more IMS stuff correctly + + -- Matt Zimmerman <mdz@debian.org> Fri, 16 Jan 2004 10:54:25 -0800 + +apt (0.6.16) experimental; urgency=low + + * Fix some cases where the .gpg file could be left in place when it is + invalid + + -- Matt Zimmerman <mdz@debian.org> Fri, 9 Jan 2004 09:22:15 -0800 + +apt (0.6.15) experimental; urgency=low + + * s/Debug::Acquire::gpg/&v/ + * Honor the [vendor] syntax in sources.list again (though it is not + presently used for anything) + * Don't ship vendors.list(5) since it isn't used yet + * Revert change from 0.6.10; it was right in the first place and the + problem was apparently something else. Archive = Suite. + + -- Matt Zimmerman <mdz@debian.org> Mon, 5 Jan 2004 17:43:01 -0800 + +apt (0.6.14) experimental; urgency=low + + * Merge 0.5.20 + + -- Matt Zimmerman <mdz@debian.org> Sun, 4 Jan 2004 11:09:21 -0800 + +apt (0.6.13) experimental; urgency=low + + * Merge 0.5.19 + + -- Matt Zimmerman <mdz@debian.org> Sat, 3 Jan 2004 16:22:31 -0800 + +apt (0.6.12) experimental; urgency=low + + * Have pkgAcquireIndex calculate an MD5 sum if one is not provided by + the method (as with file: and copy:). Local repositories + * Fix warning about dist name mismatch to actually print what it was + expecting + * Don't expect any particular distribution name for two-part + sources.list entries + * Merge 0.5.18 + + -- Matt Zimmerman <mdz@debian.org> Fri, 2 Jan 2004 13:59:00 -0800 + +apt (0.6.11) experimental; urgency=low + + * Support IMS requests of Release.gpg and Release + * This required API changes, bump the libapt-pkg version + * Copy local Release files into Dir::State::Lists + * Set IndexFile attribute when retrieving Release and Release.gpg so + that the appropriate Cache-Control headers are sent + + -- Matt Zimmerman <mdz@debian.org> Fri, 2 Jan 2004 10:46:17 -0800 + +apt (0.6.10) experimental; urgency=low + + * Use "Codename" (woody, sarge, etc.) to supply the value of the + "Archive" package file attribute, used to match "release a=" type + pins, rather than "Suite" (stable, testing, etc.) + + -- Matt Zimmerman <mdz@debian.org> Thu, 1 Jan 2004 16:56:47 -0800 + +apt (0.6.9) experimental; urgency=low + + * Another tagfile workaround + + -- Matt Zimmerman <mdz@debian.org> Thu, 1 Jan 2004 13:56:08 -0800 + +apt (0.6.8) experimental; urgency=low + + * Add a config option and corresponding command line option + (--allow-unauthenticated) to apt-get, to make buildd operators happy + (Closes: #225648) + + -- Matt Zimmerman <mdz@debian.org> Wed, 31 Dec 2003 08:28:04 -0800 + +apt (0.6.7) experimental; urgency=low + + * Forgot to revert part of the changes to tagfile in 0.6.4. Hopefully + will fix segfaults for some folks. + + -- Matt Zimmerman <mdz@debian.org> Wed, 31 Dec 2003 08:01:28 -0800 + +apt (0.6.6) experimental; urgency=low + + * Restore the ugly hack I removed from indexRecords::Load which set the + pkgTagFile buffer size to (file size)+256. This is concealing a bug, + but I can't fix it right now. This should fix the segfaults that + folks are seeing with 0.6.[45]. + + -- Matt Zimmerman <mdz@debian.org> Mon, 29 Dec 2003 18:11:13 -0800 + +apt (0.6.5) experimental; urgency=low + + * Move the authentication check into a separate function in apt-get + * Fix display of unauthenticated packages when they are in the cache + (Closes: #225336) + + -- Matt Zimmerman <mdz@debian.org> Sun, 28 Dec 2003 16:47:57 -0800 + +apt (0.6.4) experimental; urgency=low + + * Use the top-level Release file in LoadReleaseInfo, rather than looking + for the per-section ones (which aren't downloaded anymore). This + unbreaks release pinning, including the NotAutomatic bit used by + project/experimental + * Use FileFd::Size() rather than a separate stat() call in + LoadReleaseInfo + * Fix pkgTagFile to leave a little extra room at the end of the buffer + to append the record separator if it isn't present + * Change LoadReleaseInfo to use "Suite" rather than "Archive", to match + the Debian archive's dist-level Release files + + -- Matt Zimmerman <mdz@debian.org> Sun, 28 Dec 2003 15:55:55 -0800 + +apt (0.6.3) experimental; urgency=low + + * Fix MetaIndexURI for flat ("foo/") sources + + -- Matt Zimmerman <mdz@debian.org> Sun, 28 Dec 2003 12:11:56 -0800 + +apt (0.6.2) experimental; urgency=low + + * Add space between package names when multiple unauthenticated packages + are being installed (Closes: #225212) + * Provide apt-key with a secret keyring and a trustdb, even though we + would never use them, because it blows up if it doesn't have them + * Fix typo in apt-key(8) (standard input is '-', not '/') + + -- Matt Zimmerman <mdz@debian.org> Sat, 27 Dec 2003 13:01:40 -0800 + +apt (0.6.1) experimental; urgency=low + + * Merge apt 0.5.17 + * Rearrange Release file authentication code to be more clear + * If Release is present, but Release.gpg is not, don't forget to still + queue Packages files + * Convert distribution "../project/experimental" to "experimental" for + comparison purposes + * Make a number of Release file errors into warnings; for now, it is OK + not to have a codename, for example. We mostly care about checksums + for now + + -- Matt Zimmerman <mdz@debian.org> Fri, 26 Dec 2003 15:12:47 -0800 + +apt (0.6.0) experimental; urgency=low + + * Signature verification support patch ("apt-secure") from Colin Walters + <walters@debian.org> and Isaac Jones <ijones@syntaxpolice.org>. This + implements: + - Release signature verification (Release.gpg) + - Packages, Sources md5sum verification against Release + - Closes: #203741 + * Make some modifications to signature verification support: + - Release.gpg is always retrieved and verified if present, rather than + requiring that sources be configured as secure + - Print a hint about installing gnupg if exec(gpgv) fails + - Remove obsolete pkgAcqIndexRel + - Move vendors.list stuff into a separate module (vendorlist.{h,cc}) + - If any files about to be retrieved are not authenticated, issue a + warning to the user and require confirmation + - Fix a heap corruption bug in pkgSrcRecords::pkgSrcRecords() + * Suggests: gnupg + * Install a keyring in /usr/share/apt/debian-archive.gpg containing an + initial set of Debian archive signing keys to seed /etc/apt/trusted.gpg + * Add a new tool, apt-key(8) used to manage the keyring + + -- Matt Zimmerman <mdz@debian.org> Fri, 26 Dec 2003 08:27:19 -0800 + apt (0.5.32) hoary; urgency=low * Call setlocale in the methods, so that the messages are properly diff --git a/debian/control b/debian/control index b7c430997..6d9418a46 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> +Uploaders: Jason Gunthorpe <jgg@debian.org>, Adam Heath <doogie@debian.org>, Matt Zimmerman <mdz@debian.org>, Michael Vogt <mvo@debian.org> Standards-Version: 3.6.1 Build-Depends: debhelper (>= 4.1.62), libdb4.2-dev, gettext (>= 0.12) Build-Depends-Indep: debiandoc-sgml, docbook-utils (>= 0.6.12-1) @@ -53,7 +53,7 @@ Description: Documentation for APT development Package: apt-utils Architecture: any Depends: ${shlibs:Depends} -Priority: optional +Priority: important Provides: ${libapt-inst:provides} Replaces: apt (<< 0.5.9) Section: admin diff --git a/debian/rules b/debian/rules index fdae46352..25e4d4d1f 100755 --- a/debian/rules +++ b/debian/rules @@ -209,7 +209,7 @@ apt: build debian/shlibs.local cp debian/bugscript debian/$@/usr/share/bug/apt/script - cp share/ubuntu-archive.gpg debian/$@/usr/share/$@ + cp share/debian-archive.gpg debian/$@/usr/share/$@ # head -n 500 ChangeLog > debian/ChangeLog diff --git a/doc/examples/configure-index b/doc/examples/configure-index index a09ea0c37..dee0c06ff 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -84,6 +84,13 @@ APT Force-LoopBreak "false"; // DO NOT turn this on, see the man page Cache-Limit "4194304"; Default-Release ""; + + + // Write progress messages on this fd (for stuff like base-config) + Status-Fd "-1"; + // Keep the list of FDs open (normally apt closes all fds when it + // does a ExecFork) + Keep-Fds {}; }; // Options for the downloading routines @@ -234,6 +241,7 @@ Debug pkgAcquire "false"; pkgAcquire::Worker "false"; pkgDPkgPM "false"; + pkgDPkgProgressReporting "false"; pkgOrderList "false"; pkgInitialize "false"; // This one will dump the configuration space diff --git a/methods/gpgv.cc b/methods/gpgv.cc index 24e945b2c..5cb154f66 100644 --- a/methods/gpgv.cc +++ b/methods/gpgv.cc @@ -1,6 +1,7 @@ #include <apt-pkg/error.h> #include <apt-pkg/acquire-method.h> #include <apt-pkg/strutl.h> +#include <apti18n.h> #include <sys/stat.h> #include <unistd.h> @@ -88,7 +89,7 @@ const char *GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, continue; Args[i++] = Opts->Value.c_str(); if(i >= 395) { - std::cerr << "E: Argument list from Acquire::gpgv::Options too long. Exiting." << std::endl; + std::cerr << _("E: Argument list from Acquire::gpgv::Options too long. Exiting.") << std::endl; exit(111); } } @@ -181,27 +182,28 @@ const char *GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, waitpid(pid, &status, 0); if (_config->FindB("Debug::Acquire::gpgv", false)) { - std::cerr <<"gpgv exited\n"; + std::cerr << "gpgv exited\n"; } if (WEXITSTATUS(status) == 0) { if (GoodSigners.empty()) - return "Internal error: Good signature, but could not determine key fingerprint?!"; + return _("Internal error: Good signature, but could not determine key fingerprint?!"); return NULL; } else if (WEXITSTATUS(status) == 1) { - return "At least one invalid signature was encountered."; + return _("At least one invalid signature was encountered."); } else if (WEXITSTATUS(status) == 111) { - return (string("Could not execute ") + gpgvpath + - string(" to verify signature (is gnupg installed?)")).c_str(); + // FIXME String concatenation considered harmful. + return (string(_("Could not execute ")) + gpgvpath + + string(_(" to verify signature (is gnupg installed?)"))).c_str(); } else { - return "Unknown error executing gpgv"; + return _("Unknown error executing gpgv"); } } @@ -232,14 +234,14 @@ bool GPGVMethod::Fetch(FetchItem *Itm) { if (!BadSigners.empty()) { - errmsg += "The following signatures were invalid:\n"; + errmsg += _("The following signatures were invalid:\n"); for (vector<string>::iterator I = BadSigners.begin(); I != BadSigners.end(); I++) errmsg += (*I + "\n"); } if (!NoPubKeySigners.empty()) { - errmsg += "The following signatures couldn't be verified because the public key is not available:\n"; + errmsg += _("The following signatures couldn't be verified because the public key is not available:\n"); for (vector<string>::iterator I = NoPubKeySigners.begin(); I != NoPubKeySigners.end(); I++) errmsg += (*I + "\n"); @@ -251,16 +253,16 @@ bool GPGVMethod::Fetch(FetchItem *Itm) // Transfer the modification times struct stat Buf; if (stat(Path.c_str(),&Buf) != 0) - return _error->Errno("stat","Failed to stat %s", Path.c_str()); + return _error->Errno("stat",_("Failed to stat %s"), Path.c_str()); struct utimbuf TimeBuf; TimeBuf.actime = Buf.st_atime; TimeBuf.modtime = Buf.st_mtime; if (utime(Itm->DestFile.c_str(),&TimeBuf) != 0) - return _error->Errno("utime","Failed to set modification time"); + return _error->Errno("utime",_("Failed to set modification time")); if (stat(Itm->DestFile.c_str(),&Buf) != 0) - return _error->Errno("stat","Failed to stat"); + return _error->Errno("stat",_("Failed to stat")); // Return a Done response Res.LastModified = Buf.st_mtime; @@ -275,7 +277,7 @@ bool GPGVMethod::Fetch(FetchItem *Itm) if (_config->FindB("Debug::Acquire::gpgv", false)) { - std::cerr <<"gpgv suceeded\n"; + std::cerr << "gpgv succeeded\n"; } return true; @@ -284,6 +286,8 @@ bool GPGVMethod::Fetch(FetchItem *Itm) int main() { + setlocale(LC_ALL, ""); + GPGVMethod Mth; return Mth.Run(); diff --git a/methods/makefile b/methods/makefile index bf8fc0dab..d0b5a28c0 100644 --- a/methods/makefile +++ b/methods/makefile @@ -7,7 +7,7 @@ include ../buildlib/defaults.mak BIN := $(BIN)/methods # FIXME.. -LIB_APT_PKG_MAJOR = 3.5 +LIB_APT_PKG_MAJOR = 3.11 APT_DOMAIN := libapt-pkg$(LIB_APT_PKG_MAJOR) # The file method diff --git a/po/apt-all.pot b/po/apt-all.pot index ad94b8a39..d06c14ce1 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: 2005-05-07 16:22+0200\n" +"POT-Creation-Date: 2005-06-06 14:00+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" @@ -148,7 +148,7 @@ msgstr "" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545 -#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "" @@ -523,7 +523,7 @@ msgstr "" msgid "Y" msgstr "" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 #, c-format msgid "Regex compilation error - %s" msgstr "" @@ -593,7 +593,7 @@ msgstr "" #: cmdline/apt-get.cc:544 msgid "" -"WARNING: The following essential packages will be removed\n" +"WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" @@ -670,11 +670,11 @@ msgstr "" msgid "Packages need to be removed but remove is disabled." msgstr "" -#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802 +#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 msgid "Unable to lock the download directory" msgstr "" -#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061 +#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "" @@ -715,7 +715,7 @@ msgstr "" #: cmdline/apt-get.cc:865 #, c-format msgid "" -"You are about to do something potentially harmful\n" +"You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" " ?] " msgstr "" @@ -728,7 +728,7 @@ msgstr "" msgid "Do you want to continue [Y/n]? " msgstr "" -#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959 +#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" @@ -737,7 +737,7 @@ msgstr "" msgid "Some files failed to download" msgstr "" -#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 msgid "Download complete and in download only mode" msgstr "" @@ -833,7 +833,7 @@ msgstr "" msgid "The update command takes no arguments" msgstr "" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "" @@ -847,27 +847,27 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498 +#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 #, c-format msgid "Couldn't find package %s" msgstr "" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1524 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" -#: cmdline/apt-get.cc:1518 +#: cmdline/apt-get.cc:1527 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -#: cmdline/apt-get.cc:1530 +#: cmdline/apt-get.cc:1539 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -875,149 +875,149 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1538 +#: cmdline/apt-get.cc:1547 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" "that package should be filed." msgstr "" -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "" -#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99 +#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 msgid "Failed" msgstr "" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:1872 cmdline/apt-get.cc:2079 +#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, c-format msgid "You don't have enough free space in %s" msgstr "" -#: cmdline/apt-get.cc:1924 +#: cmdline/apt-get.cc:1933 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2084 +#: cmdline/apt-get.cc:2093 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2156 +#: cmdline/apt-get.cc:2165 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2208 +#: cmdline/apt-get.cc:2217 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:2243 +#: cmdline/apt-get.cc:2252 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:2359 +#: cmdline/apt-get.cc:2368 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1215,7 +1215,7 @@ msgstr "" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 #, c-format -msgid "Failed write file %s" +msgid "Failed to write file %s" msgstr "" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1271,7 +1271,7 @@ msgid "File %s/%s overwrites the one in the package %s" msgstr "" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:420 apt-pkg/clean.cc:38 +#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "" @@ -1358,7 +1358,7 @@ msgid "Internal error adding a diversion" msgstr "" #: apt-inst/deb/dpkgdb.cc:383 -msgid "The pkg cache must be initialize first" +msgid "The pkg cache must be initialized first" msgstr "" #: apt-inst/deb/dpkgdb.cc:386 @@ -1561,7 +1561,7 @@ msgstr "" msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:864 methods/http.cc:953 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" @@ -1655,76 +1655,76 @@ msgstr "" msgid "Read error from %s process" msgstr "" -#: methods/http.cc:381 +#: methods/http.cc:344 msgid "Waiting for headers" msgstr "" -#: methods/http.cc:527 +#: methods/http.cc:490 #, c-format msgid "Got a single header line over %u chars" msgstr "" -#: methods/http.cc:535 +#: methods/http.cc:498 msgid "Bad header line" msgstr "" -#: methods/http.cc:554 methods/http.cc:561 +#: methods/http.cc:517 methods/http.cc:524 msgid "The HTTP server sent an invalid reply header" msgstr "" -#: methods/http.cc:590 +#: methods/http.cc:553 msgid "The HTTP server sent an invalid Content-Length header" msgstr "" -#: methods/http.cc:605 +#: methods/http.cc:568 msgid "The HTTP server sent an invalid Content-Range header" msgstr "" -#: methods/http.cc:607 +#: methods/http.cc:570 msgid "This HTTP server has broken range support" msgstr "" -#: methods/http.cc:631 +#: methods/http.cc:594 msgid "Unknown date format" msgstr "" -#: methods/http.cc:774 +#: methods/http.cc:741 msgid "Select failed" msgstr "" -#: methods/http.cc:779 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "" -#: methods/http.cc:802 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "" -#: methods/http.cc:830 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "" -#: methods/http.cc:855 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:869 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:871 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "" -#: methods/http.cc:1102 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "" -#: methods/http.cc:1119 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "" -#: methods/http.cc:1210 +#: methods/http.cc:1177 msgid "Internal error" msgstr "" @@ -1862,7 +1862,7 @@ msgstr "" msgid "Unable to stat the mount point %s" msgstr "" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:426 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:422 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "" @@ -2173,37 +2173,37 @@ msgstr "" #: apt-pkg/pkgcachegen.cc:117 #, c-format -msgid "Error occured while processing %s (NewPackage)" +msgid "Error occurred while processing %s (NewPackage)" msgstr "" #: apt-pkg/pkgcachegen.cc:129 #, c-format -msgid "Error occured while processing %s (UsePackage1)" +msgid "Error occurred while processing %s (UsePackage1)" msgstr "" #: apt-pkg/pkgcachegen.cc:150 #, c-format -msgid "Error occured while processing %s (UsePackage2)" +msgid "Error occurred while processing %s (UsePackage2)" msgstr "" #: apt-pkg/pkgcachegen.cc:154 #, c-format -msgid "Error occured while processing %s (NewFileVer1)" +msgid "Error occurred while processing %s (NewFileVer1)" msgstr "" #: apt-pkg/pkgcachegen.cc:184 #, c-format -msgid "Error occured while processing %s (NewVersion1)" +msgid "Error occurred while processing %s (NewVersion1)" msgstr "" #: apt-pkg/pkgcachegen.cc:188 #, c-format -msgid "Error occured while processing %s (UsePackage3)" +msgid "Error occurred while processing %s (UsePackage3)" msgstr "" #: apt-pkg/pkgcachegen.cc:192 #, c-format -msgid "Error occured while processing %s (NewVersion2)" +msgid "Error occurred while processing %s (NewVersion2)" msgstr "" #: apt-pkg/pkgcachegen.cc:207 @@ -2220,12 +2220,12 @@ msgstr "" #: apt-pkg/pkgcachegen.cc:241 #, c-format -msgid "Error occured while processing %s (FindPkg)" +msgid "Error occurred while processing %s (FindPkg)" msgstr "" #: apt-pkg/pkgcachegen.cc:254 #, c-format -msgid "Error occured while processing %s (CollectFileProvides)" +msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "" #: apt-pkg/pkgcachegen.cc:260 @@ -2246,36 +2246,36 @@ msgstr "" msgid "IO Error saving source cache" msgstr "" -#: apt-pkg/acquire-item.cc:129 +#: apt-pkg/acquire-item.cc:126 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "" -#: apt-pkg/acquire-item.cc:537 apt-pkg/acquire-item.cc:1202 +#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 msgid "MD5Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:1016 +#: apt-pkg/acquire-item.cc:714 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -#: apt-pkg/acquire-item.cc:1069 +#: apt-pkg/acquire-item.cc:767 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" -#: apt-pkg/acquire-item.cc:1105 +#: apt-pkg/acquire-item.cc:803 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:1192 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "" diff --git a/po/bs.po b/po/bs.po index d4f9b1f66..806c1204d 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: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\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" @@ -147,7 +147,7 @@ msgstr "" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545 -#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "" @@ -535,7 +535,7 @@ msgstr "" msgid "Y" msgstr "" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 #, c-format msgid "Regex compilation error - %s" msgstr "" @@ -606,7 +606,7 @@ msgstr "" #: cmdline/apt-get.cc:544 msgid "" -"WARNING: The following essential packages will be removed\n" +"WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" @@ -684,11 +684,11 @@ msgstr "" msgid "Packages need to be removed but remove is disabled." msgstr "" -#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802 +#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 msgid "Unable to lock the download directory" msgstr "" -#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061 +#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "" @@ -729,7 +729,7 @@ msgstr "Da, uradi kako kažem!" #: cmdline/apt-get.cc:865 #, c-format msgid "" -"You are about to do something potentially harmful\n" +"You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" " ?] " msgstr "" @@ -743,7 +743,7 @@ msgstr "Odustani." msgid "Do you want to continue [Y/n]? " msgstr "Da li želite nastaviti? [Y/n]" -#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959 +#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" @@ -752,7 +752,7 @@ msgstr "" msgid "Some files failed to download" msgstr "" -#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 msgid "Download complete and in download only mode" msgstr "" @@ -848,7 +848,7 @@ msgstr "" msgid "The update command takes no arguments" msgstr "" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "" @@ -862,27 +862,27 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498 +#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 #, c-format msgid "Couldn't find package %s" msgstr "" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1524 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" -#: cmdline/apt-get.cc:1518 +#: cmdline/apt-get.cc:1527 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -#: cmdline/apt-get.cc:1530 +#: cmdline/apt-get.cc:1539 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -890,149 +890,149 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1538 +#: cmdline/apt-get.cc:1547 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" "that package should be filed." msgstr "" -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "Oštećeni paketi" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "Slijedeći dodatni paketi će biti instalirani:" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "Predloženi paketi:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "Preporučeni paketi:" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "Računam nadogradnju..." -#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99 +#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 msgid "Failed" msgstr "Neuspješno" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "Urađeno" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:1872 cmdline/apt-get.cc:2079 +#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, c-format msgid "You don't have enough free space in %s" msgstr "" -#: cmdline/apt-get.cc:1924 +#: cmdline/apt-get.cc:1933 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2084 +#: cmdline/apt-get.cc:2093 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2156 +#: cmdline/apt-get.cc:2165 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2208 +#: cmdline/apt-get.cc:2217 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:2243 +#: cmdline/apt-get.cc:2252 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "Podržani moduli:" -#: cmdline/apt-get.cc:2359 +#: cmdline/apt-get.cc:2368 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1229,9 +1229,9 @@ msgid "Duplicate conf file %s/%s" msgstr "" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" -msgstr "" +#, fuzzy, c-format +msgid "Failed to write file %s" +msgstr "Ne mogu ukloniti %s" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 #, c-format @@ -1578,7 +1578,7 @@ msgstr "" msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:864 methods/http.cc:916 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" @@ -1705,43 +1705,43 @@ msgstr "" msgid "Unknown date format" msgstr "Nepoznat oblik datuma" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "" -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:834 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "" -#: methods/http.cc:1065 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "Povezivanje neuspješno" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "Unutrašnja greška" @@ -2269,31 +2269,31 @@ msgstr "" msgid "rename failed, %s (%s -> %s)." msgstr "" -#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:894 +#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 msgid "MD5Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:708 +#: apt-pkg/acquire-item.cc:714 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -#: apt-pkg/acquire-item.cc:761 +#: apt-pkg/acquire-item.cc:767 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" -#: apt-pkg/acquire-item.cc:797 +#: apt-pkg/acquire-item.cc:803 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "" diff --git a/po/ca.po b/po/ca.po index 980c2ec42..7fe93910e 100644 --- a/po/ca.po +++ b/po/ca.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-29 07:17+0200\n" -"PO-Revision-Date: 2005-02-15 18:53+0100\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" +"PO-Revision-Date: 2005-07-19 01:31+0200\n" "Last-Translator: Jordi Mallach <jordi@debian.org>\n" "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n" "MIME-Version: 1.0\n" @@ -150,7 +150,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545 -#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s per a %s %s compilat el %s %s\n" @@ -325,7 +325,6 @@ msgid "Error processing contents %s" msgstr "S'ha produït un error en processar el fitxer de continguts %s" #: ftparchive/apt-ftparchive.cc:551 -#, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -378,13 +377,13 @@ msgstr "" "Gestiona molts estils per a generar-los, des dels completament automàtics\n" "als substituts funcionals per dpkg-scanpackages i dpkg-scansources.\n" "\n" -"apt-ftparchive genera fitxers Package des d'un arbre de .debs. El\n" +"apt-ftparchive genera fitxers Package des d'un arbre de .deb. El\n" "fitxer Package conté tots els camps de control de cada paquet així com\n" "la suma MD5 i la mida del fitxer. Es suporten els fitxers de substitució\n" "per a forçar el valor de Prioritat i Secció.\n" "\n" -"D'un mode semblant apt-ftparchive genera fitxers Sources des d'un arbre\n" -"de .dscs. Es pot utilitzar l'opció --source-override per a especificar un\n" +"D'un mode semblant, apt-ftparchive genera fitxers Sources des d'un arbre\n" +"de .dsc. Es pot utilitzar l'opció --source-override per a especificar un\n" "fitxer de substitucions de src.\n" "\n" "L'ordre «packages» i «sources» hauria d'executar-se en l'arrel de\n" @@ -468,7 +467,7 @@ msgstr "E: Els errors s'apliquen al fitxer " #: ftparchive/writer.cc:152 ftparchive/writer.cc:182 #, c-format msgid "Failed to resolve %s" -msgstr "Falla al resoldre %s" +msgstr "No s'ha pogut resoldre %s" #: ftparchive/writer.cc:164 msgid "Tree walking failed" @@ -477,7 +476,7 @@ msgstr "L'arbre està fallant" #: ftparchive/writer.cc:189 #, c-format msgid "Failed to open %s" -msgstr "Falla a l'obrir %s" +msgstr "No s'ha pogut obrir %s" #: ftparchive/writer.cc:246 #, c-format @@ -487,17 +486,17 @@ msgstr " DeLink %s [%s]\n" #: ftparchive/writer.cc:254 #, c-format msgid "Failed to readlink %s" -msgstr "Falla al llegir l'enllaç %s" +msgstr "No s'ha pogut llegir l'enllaç %s" #: ftparchive/writer.cc:258 #, c-format msgid "Failed to unlink %s" -msgstr "Falla a l'alliberar %s" +msgstr "No s'ha pogut alliberar %s" #: ftparchive/writer.cc:265 #, c-format msgid "*** Failed to link %s to %s" -msgstr "*** Falla a l'enllaçar %s a %s" +msgstr "*** No s'ha pogut enllaçar %s a %s" #: ftparchive/writer.cc:275 #, c-format @@ -531,7 +530,7 @@ msgstr "Error intern, no s'ha pogut localitzar al membre %s" #: ftparchive/contents.cc:353 ftparchive/contents.cc:384 msgid "realloc - Failed to allocate memory" -msgstr "realloc - Falla a l'assignar espai en memòria" +msgstr "realloc - No s'ha pogut assignar espai en memòria" #: ftparchive/override.cc:38 ftparchive/override.cc:146 #, c-format @@ -556,7 +555,7 @@ msgstr "Línia predominant %s línia malformada %lu núm 3" #: ftparchive/override.cc:131 ftparchive/override.cc:205 #, c-format msgid "Failed to read the override file %s" -msgstr "Falla al llegir la línia predominant del fitxer %s" +msgstr "No s'ha pogut llegir la línia predominant del fitxer %s" #: ftparchive/multicompress.cc:75 #, c-format @@ -587,15 +586,15 @@ msgstr "Comprimeix el fil" #: ftparchive/multicompress.cc:238 #, c-format msgid "Internal error, failed to create %s" -msgstr "Error intern, falla al crear %s" +msgstr "S'ha produït un error intern, no s'ha pogut crear %s" #: ftparchive/multicompress.cc:289 msgid "Failed to create subprocess IPC" -msgstr "Falla al crear el subprocés IPC" +msgstr "No s'ha pogut crear el subprocés IPC" #: ftparchive/multicompress.cc:324 msgid "Failed to exec compressor " -msgstr "Falla a l'executar el compressor " +msgstr "No s'ha pogut executar el compressor " #: ftparchive/multicompress.cc:363 msgid "decompressor" @@ -603,11 +602,11 @@ msgstr "decompressor" #: ftparchive/multicompress.cc:406 msgid "IO to subprocess/file failed" -msgstr "Falla l'E/S del subprocés sobre el fitxer" +msgstr "Ha fallat l'E/S del subprocés sobre el fitxer" #: ftparchive/multicompress.cc:458 msgid "Failed to read while computing MD5" -msgstr "Falla al llegir mentre es càlculava la suma MD5" +msgstr "No s'ha pogut llegir mentre es calculava la suma MD5" #: ftparchive/multicompress.cc:475 #, c-format @@ -617,16 +616,16 @@ msgstr "S'ha trobat un problema treient l'enllaç %s" #: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 #, c-format msgid "Failed to rename %s to %s" -msgstr "Ha fallat el reomenament de %s a %s" +msgstr "No s'ha pogut canviar el nom de %s a %s" #: cmdline/apt-get.cc:118 msgid "Y" msgstr "S" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 #, c-format msgid "Regex compilation error - %s" -msgstr "Error de compilació de l'expressió regular - %s" +msgstr "S'ha produït un error de compilació de l'expressió regular - %s" #: cmdline/apt-get.cc:235 msgid "The following packages have unmet dependencies:" @@ -693,10 +692,10 @@ msgstr "%s (per %s) " #: cmdline/apt-get.cc:544 msgid "" -"WARNING: The following essential packages will be removed\n" +"WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" -"ATENCIÓ: Els següents paquets essencials seran eliminats\n" +"AVÍS: Els següents paquets essencials seran eliminats.\n" "Això NO s'ha de fer a menys que sapigueu exactament el que esteu fent!" #: cmdline/apt-get.cc:575 @@ -730,7 +729,7 @@ msgstr "S'estan corregint les dependències..." #: cmdline/apt-get.cc:650 msgid " failed." -msgstr " falla." +msgstr " ha fallat." #: cmdline/apt-get.cc:653 msgid "Unable to correct dependencies" @@ -758,7 +757,7 @@ msgstr "AVÍS: No es poden autenticar els següents paquets!" #: cmdline/apt-get.cc:698 msgid "Install these packages without verification [y/N]? " -msgstr "Voleu instal·lar aquestas paquets sense verificar-los [y/N]? " +msgstr "Voleu instal·lar aquests paquets sense verificar-los [s/N]? " #: cmdline/apt-get.cc:700 msgid "Some packages could not be authenticated" @@ -766,17 +765,17 @@ msgstr "No s'ha pogut autenticar alguns paquets" #: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855 msgid "There are problems and -y was used without --force-yes" -msgstr "Hi ha problemes i -y fou usat sense --force-yes" +msgstr "Hi ha problemes i s'ha usat -y sense --force-yes" #: cmdline/apt-get.cc:762 msgid "Packages need to be removed but remove is disabled." msgstr "Els paquets necessiten ser eliminats però Remove està inhabilitat." -#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802 +#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 msgid "Unable to lock the download directory" msgstr "No és possible blocar el directori de descàrrega" -#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061 +#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "No s'ha pogut llegir la llista de les fonts." @@ -817,12 +816,12 @@ msgstr "Sí, fes el que et dic!" #: cmdline/apt-get.cc:865 #, c-format msgid "" -"You are about to do something potentially harmful\n" +"You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" " ?] " msgstr "" -"Esteu a punt de fer quelcom potencialment nociu\n" -"Per a continuar escriviu en la frase «%s»\n" +"Esteu a punt de fer quelcom potencialment nociu.\n" +"Per a continuar escriviu la frase «%s»\n" " ?] " #: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890 @@ -833,7 +832,7 @@ msgstr "Avortat." msgid "Do you want to continue [Y/n]? " msgstr "Voleu continuar [S/n]? " -#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959 +#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 #, c-format msgid "Failed to fetch %s %s\n" msgstr "No s'ha pogut obtenir %s %s\n" @@ -842,9 +841,9 @@ 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:977 cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 msgid "Download complete and in download only mode" -msgstr "Descàrrega completa i en mode de sols descàrrega" +msgstr "Descàrrega completa i en mode de només descàrrega" #: cmdline/apt-get.cc:983 msgid "" @@ -869,14 +868,13 @@ msgstr "S'està avortant la instal·lació." #: cmdline/apt-get.cc:1026 #, c-format msgid "Note, selecting %s instead of %s\n" -msgstr "Nota: s'ha seleccionant %s en comptes de %s\n" +msgstr "Nota: s'està seleccionant %s en comptes de %s\n" #: cmdline/apt-get.cc:1036 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" -"S'està ometent a %s, ja està instal·lat i l'actualització no està " -"establerta.\n" +"S'està ometent %s, ja està instal·lat i l'actualització no està establerta.\n" #: cmdline/apt-get.cc:1054 #, c-format @@ -946,7 +944,7 @@ msgstr "Versió seleccionada %s (%s) per a %s\n" msgid "The update command takes no arguments" msgstr "L'ordre update no pren arguments" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "No es pot blocar el directori de la llista" @@ -962,21 +960,21 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "Error intern, AllUpgrade ha trencat coses" -#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498 +#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 #, c-format msgid "Couldn't find package %s" msgstr "No s'ha pogut trobar el paquet %s" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, 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:1515 +#: cmdline/apt-get.cc:1524 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:1518 +#: cmdline/apt-get.cc:1527 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -984,7 +982,7 @@ msgstr "" "Dependències insatisfetes. Intenteu 'apt-get -f install' sense paquets (o " "especifiqueu una solució)." -#: cmdline/apt-get.cc:1530 +#: cmdline/apt-get.cc:1539 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -996,7 +994,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:1538 +#: cmdline/apt-get.cc:1547 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1006,109 +1004,109 @@ 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:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "La següent informació pot ajudar-vos a resoldre la situació:" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "Paquets trencats" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "S'instal·laran els següents paquets extres:" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "Paquets suggerits:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "Paquets recomanats:" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "S'està calculant l'actualització... " -#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99 +#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 msgid "Failed" msgstr "Ha fallat" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "Fet" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 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:1872 cmdline/apt-get.cc:2079 +#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 #, c-format msgid "Unable to find a source package for %s" msgstr "No es pot trobar un paquet de fonts per a %s" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, c-format msgid "You don't have enough free space in %s" msgstr "No teniu prou espai lliure en %s" -#: cmdline/apt-get.cc:1924 +#: cmdline/apt-get.cc:1933 #, 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:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Es necessita descarregar %sB d'arxius font.\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "Font descarregada %s\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "No s'ha pogut descarregar alguns arxius." -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, 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:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "L'ordre de desempaquetar «%s» ha fallat.\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "L'ordre de construir «%s» ha fallat.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "Ha fallat el procés fill" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 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:2084 +#: cmdline/apt-get.cc:2093 #, 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:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "%s no té dependències de construcció.\n" -#: cmdline/apt-get.cc:2156 +#: cmdline/apt-get.cc:2165 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1117,7 +1115,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:2208 +#: cmdline/apt-get.cc:2217 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1126,32 +1124,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:2243 +#: cmdline/apt-get.cc:2252 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -"Falla al satisfer la dependència %s per a %s: El paquet instal·lat %s és " -"massa nou" +"No s'ha pogut satisfer la dependència %s per a %s: El paquet instal·lat %s " +"és massa nou" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" -msgstr "Falla al satisfer la dependència %s per a %s: %s" +msgstr "No s'ha pogut satisfer la dependència %s per a %s: %s" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2291 #, 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:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "No es poden processar les dependències de construcció" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "Mòduls suportats:" -#: cmdline/apt-get.cc:2359 +#: cmdline/apt-get.cc:2368 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1379,15 +1377,15 @@ msgstr "DropNode crida a un node que encara està enllaçat" #: apt-inst/filelist.cc:416 msgid "Failed to locate the hash element!" -msgstr "Falla al localitzar l'element diseminat!" +msgstr "No s'ha trobat l'element diseminat!" #: apt-inst/filelist.cc:463 msgid "Failed to allocate diversion" -msgstr "Falla al localitzar la desviació" +msgstr "No s'ha pogut assignar la desviació" #: apt-inst/filelist.cc:468 msgid "Internal error in AddDiversion" -msgstr "Error intern en AddDiversion" +msgstr "S'ha produït un error intern en AddDiversion" #: apt-inst/filelist.cc:481 #, c-format @@ -1406,8 +1404,8 @@ msgstr "Fitxer de conf. duplicat %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 #, c-format -msgid "Failed write file %s" -msgstr "Ha fallat l'escriptura del fitxer %s" +msgid "Failed to write file %s" +msgstr "No s'ha pogut escriure el fitxer %s" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 #, c-format @@ -1445,7 +1443,7 @@ msgstr "El directori %s està sent reemplaçat per un no-directori" #: apt-inst/extract.cc:283 msgid "Failed to locate node in its hash bucket" -msgstr "Falla al localitzar el node dins la taula" +msgstr "No s'ha trobat el node dins de la taula" #: apt-inst/extract.cc:287 msgid "The path is too long" @@ -1485,7 +1483,7 @@ msgstr "No es pot crear %s" #: apt-inst/deb/dpkgdb.cc:118 #, c-format msgid "Failed to stat %sinfo" -msgstr "Falla al comprovar l'estat de %sinfo" +msgstr "No s'ha pogut fer «stat» de %sinfo" #: apt-inst/deb/dpkgdb.cc:123 msgid "The info and temp directories need to be on the same filesystem" @@ -1503,12 +1501,12 @@ msgstr "S'està llegint la llista de paquets" #: apt-inst/deb/dpkgdb.cc:180 #, c-format msgid "Failed to change to the admin dir %sinfo" -msgstr "Falla al canviar pel directori de gestió %sinfo" +msgstr "No s'ha pogut canviar al directori d'admininstració %sinfo" #: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 #: apt-inst/deb/dpkgdb.cc:448 msgid "Internal error getting a package name" -msgstr "Error intern obtenint un nom de paquet" +msgstr "S'ha produït un error intern en obtenir un nom de paquet" #: apt-inst/deb/dpkgdb.cc:205 msgid "Reading file listing" @@ -1521,23 +1519,23 @@ msgid "" "then make it empty and immediately re-install the same version of the " "package!" msgstr "" -"Falla a l'obrir la llista del fitxer '%sinfo/%s'. Si no podeu restaurar " -"aquest fitxer llavores marqueu-lo amb empty i torneu a instal·lar " -"immediatament la mateixa versió del paquet!" +"No s'ha pogut obrir la llista del fitxer «%sinfo/%s». Si no podeu restaurar " +"aquest fitxer, creeu-lo buit i torneu a instal·lar immediatament la mateixa " +"versió del paquet!" #: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 #, c-format msgid "Failed reading the list file %sinfo/%s" -msgstr "Falla al llegir la llista del fitxer %sinfo/%s" +msgstr "No s'ha pogut llegir la llista del fitxer %sinfo/%s" #: apt-inst/deb/dpkgdb.cc:266 msgid "Internal error getting a node" -msgstr "Error intern obtinguen un node" +msgstr "S'ha produït un error en obtenir un node" #: apt-inst/deb/dpkgdb.cc:309 #, c-format msgid "Failed to open the diversions file %sdiversions" -msgstr "Falla a l'obrir el fitxer de desviació %sdiversions" +msgstr "S'ha produït un error en obrir el fitxer de desviació %sdiversions" #: apt-inst/deb/dpkgdb.cc:324 msgid "The diversion file is corrupted" @@ -1551,7 +1549,7 @@ msgstr "Línia no vàlida en el fitxer de desviació: %s" #: apt-inst/deb/dpkgdb.cc:362 msgid "Internal error adding a diversion" -msgstr "Error intern afegint una desviació" +msgstr "S'ha produït un error intern en afegir una desviació" #: apt-inst/deb/dpkgdb.cc:383 msgid "The pkg cache must be initialized first" @@ -1564,7 +1562,7 @@ msgstr "S'està llegint la llista de fitxers" #: apt-inst/deb/dpkgdb.cc:443 #, c-format msgid "Failed to find a Package: header, offset %lu" -msgstr "Falla al cercar un paquet: Capçalera, desplaçament %lu" +msgstr "No s'ha trobat una capçalera Package:, desplaçament %lu" #: apt-inst/deb/dpkgdb.cc:465 #, c-format @@ -1574,12 +1572,12 @@ msgstr "Secció ConfFile dolenta en el fitxer d'estat. Desplaçament %lu" #: apt-inst/deb/dpkgdb.cc:470 #, c-format msgid "Error parsing MD5. Offset %lu" -msgstr "Error analitzant la suma MD5. Desplaçament %lu" +msgstr "S'ha produït un error en analitzar la suma MD5. Desplaçament %lu" #: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" -msgstr "Aquest no és un arxiu DEB vàlid, falta el membre '%s'" +msgstr "Aquest no és un arxiu DEB vàlid, falta el membre «%s»" #: apt-inst/deb/debfile.cc:52 #, c-format @@ -1593,15 +1591,15 @@ msgstr "No s'ha pogut canviar a %s" #: apt-inst/deb/debfile.cc:138 msgid "Internal error, could not locate member" -msgstr "Error intern, no s'ha pogut localitzar al membre" +msgstr "S'ha produït un error intern, no s'ha trobat el membre" #: apt-inst/deb/debfile.cc:171 msgid "Failed to locate a valid control file" -msgstr "S'ha fallat en localitzar un fitxer de control vàlid" +msgstr "No s'ha trobat un fitxer de control vàlid" #: apt-inst/deb/debfile.cc:256 msgid "Unparsable control file" -msgstr "Fitxer de control incoherent" +msgstr "El fitxer de control no es pot analitzar" #: methods/cdrom.cc:113 #, c-format @@ -1635,7 +1633,7 @@ msgstr "L'estat ha fallat" #: methods/copy.cc:79 methods/gzip.cc:139 msgid "Failed to set modification time" -msgstr "Falla a l'establir la modificació de temps" +msgstr "No s'ha pogut establir el temps de modificació" #: methods/file.cc:42 msgid "Invalid URI, local URIS must not start with //" @@ -1762,7 +1760,7 @@ msgstr "S'ha esgotat el temps de connexió al sòcol de dades" msgid "Unable to accept connection" msgstr "No es pot acceptar la connexió" -#: methods/ftp.cc:864 methods/http.cc:916 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problema escollint el fitxer" @@ -1889,43 +1887,43 @@ msgstr "Aquest servidor http té el suport d'abast trencat" msgid "Unknown date format" msgstr "Format de la data desconegut" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "Ha fallat la selecció" -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "Connexió finalitzada" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "Error escrivint en el fitxer d'eixida" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "Error escrivint en el fitxer" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "Error escrivint en el fitxer" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "Error llegint, el servidor remot ha tancat la connexió" -#: methods/http.cc:834 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "Error llegint des del servidor" -#: methods/http.cc:1065 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "Capçalera de dades no vàlida" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "Ha fallat la connexió" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "Error intern" @@ -2070,7 +2068,7 @@ msgstr "No es pot canviar a %s" #: apt-pkg/contrib/cdromutl.cc:190 msgid "Failed to stat the cdrom" -msgstr "Falla al examinar el cdrom" +msgstr "No s'ha pogut fer «stat» del cdrom" #: apt-pkg/contrib/fileutl.cc:80 #, c-format @@ -2100,7 +2098,7 @@ msgstr "Esperava %s però no hi era" #: apt-pkg/contrib/fileutl.cc:369 #, c-format msgid "Sub-process %s received a segmentation fault." -msgstr "Sub-procés %s ha rebut una falla de segmentació." +msgstr "Sub-procés %s ha rebut una violació de segment." #: apt-pkg/contrib/fileutl.cc:372 #, c-format @@ -2465,13 +2463,13 @@ msgstr "Error d'E/S en desar la memòria cau de la font" #: apt-pkg/acquire-item.cc:126 #, c-format msgid "rename failed, %s (%s -> %s)." -msgstr "falla de renomenat, %s (%s -> %s)." +msgstr "no s'ha pogut canviar el nom, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:894 +#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 msgid "MD5Sum mismatch" msgstr "Suma MD5 diferent" -#: apt-pkg/acquire-item.cc:708 +#: apt-pkg/acquire-item.cc:714 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2481,7 +2479,7 @@ msgstr "" "significar que haureu d'arreglar aquest paquet manualment (segons " "arquitectura)." -#: apt-pkg/acquire-item.cc:761 +#: apt-pkg/acquire-item.cc:767 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2490,7 +2488,7 @@ msgstr "" "No ha estat possible localitzar un fitxer pel paquet %s. Això podria " "significar que haureu d'arreglar aquest paquet manualment." -#: apt-pkg/acquire-item.cc:797 +#: apt-pkg/acquire-item.cc:803 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2498,7 +2496,7 @@ msgstr "" "L'índex dels fitxers en el paquet està corromput. Fitxer no existent: camp " "per al paquet %s." -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "Mida diferent" @@ -2603,6 +2601,63 @@ msgstr "" "S'han escrit %i registres, on falten %i fitxers i hi ha %i fitxers no " "coincidents\n" +#~ msgid "Authentication warning overridden.\n" +#~ msgstr "S'ha descartat l'avís d'autenticació.\n" + +#~ msgid "Internal error, InstallPackages was called with broken packages!" +#~ msgstr "" +#~ "S'ha produït un error intern, s'ha cridat a InstallPackages amb paquets " +#~ "trencats!" + +#~ msgid "Internal error, Ordering didn't finish" +#~ msgstr "S'ha produït un error intern, l'ordenació no ha acabat" + +#~ msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" +#~ msgstr "" +#~ "Què estrany... les mides no coincideixen, informeu a apt@packages.debian." +#~ "org" + +#~ msgid "Couldn't determine free space in %s" +#~ msgstr "No s'ha pogut determinar l'espai lliure en %s" + +#~ msgid "Internal error, problem resolver broke stuff" +#~ msgstr "" +#~ "S'ha produït un error intern, el solucionador de problemes ha trencat " +#~ "coses" + +#~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." +#~ msgstr "" +#~ "E: La llista d'arguments d'Acquire::gpgv::Options és massa llarga. S'està " +#~ "sortint." + +#~ msgid "" +#~ "Internal error: Good signature, but could not determine key fingerprint?!" +#~ msgstr "" +#~ "Error intern: La signatura és correcta, però no s'ha pogut determinar " +#~ "l'emprempta digital de la clau!" + +#~ msgid "At least one invalid signature was encountered." +#~ msgstr "S'ha trobat almenys una signatura invàlida." + +#~ msgid "Could not execute " +#~ msgstr "No s'ha pogut executar " + +#~ msgid " to verify signature (is gnupg installed?)" +#~ msgstr " per a verificar la signatura (està instal·lat el gnupg?)" + +#~ msgid "Unknown error executing gpgv" +#~ msgstr "S'ha produït un error desconegut en executar el gpgv" + +#~ msgid "The following signatures were invalid:\n" +#~ msgstr "Les següents signatures són invàlides:\n" + +#~ msgid "" +#~ "The following signatures couldn't be verified because the public key is " +#~ "not available:\n" +#~ msgstr "" +#~ "Les següents signatures no s'han pogut verificar perquè la clau pública " +#~ "no està disponible:\n" + #~ msgid "Unknown vendor ID '%s' in line %u of source list %s" #~ msgstr "" #~ "ID del proveïdor '%s' desconeguda en la línia %u de la llista de fonts %s" diff --git a/po/cs.po b/po/cs.po index 7dceb8c07..28f683d1a 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" "PO-Revision-Date: 2005-02-11 16:14+0100\n" "Last-Translator: Miroslav Kure <kurem@debian.cz>\n" "Language-Team: Czech <provoz@debian.cz>\n" @@ -147,7 +147,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545 -#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s pro %s %s zkompilován na %s %s\n" @@ -617,7 +617,7 @@ msgstr "Selhalo přejmenování %s na %s" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 #, c-format msgid "Regex compilation error - %s" msgstr "Chyba při kompilaci regulárního výrazu - %s" @@ -686,8 +686,9 @@ msgid "%s (due to %s) " msgstr "%s (kvůli %s) " #: cmdline/apt-get.cc:544 +#, fuzzy msgid "" -"WARNING: The following essential packages will be removed\n" +"WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" "VAROVÁNÍ: Následující nezbytné balíky budou odstraněny.\n" @@ -766,11 +767,11 @@ msgstr "Vyskytly se problémy a -y bylo použito bez --force-yes" msgid "Packages need to be removed but remove is disabled." msgstr "Balík je potřeba odstranit ale funkce Odstranit je vypnuta." -#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802 +#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 msgid "Unable to lock the download directory" msgstr "Nemohu zamknout adresář pro stahování" -#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061 +#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Nelze přečíst seznam zdrojů." @@ -809,9 +810,9 @@ msgid "Yes, do as I say!" msgstr "Ano, udělej to tak, jak říkám!" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, c-format msgid "" -"You are about to do something potentially harmful\n" +"You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" " ?] " msgstr "" @@ -827,7 +828,7 @@ msgstr "Přerušeno." msgid "Do you want to continue [Y/n]? " msgstr "Chcete pokračovat [Y/n]? " -#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959 +#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Selhalo stažení %s %s\n" @@ -836,7 +837,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:977 cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 msgid "Download complete and in download only mode" msgstr "Stahování dokončeno v režimu pouze stáhnout" @@ -937,7 +938,7 @@ msgstr "Vybraná verze %s (%s) pro %s\n" msgid "The update command takes no arguments" msgstr "Příkaz update neakceptuje žádné argumenty" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "Nemohu uzamknout list adresář" @@ -953,21 +954,21 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "Vnitřní chyba, AllUpgrade pokazil věci" -#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498 +#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 #, c-format msgid "Couldn't find package %s" msgstr "Nemohu najít balík %s" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, 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:1515 +#: cmdline/apt-get.cc:1524 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:1518 +#: cmdline/apt-get.cc:1527 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -975,7 +976,7 @@ msgstr "" "Nesplněné závislosti. Zkuste zpustit 'apt-get -f install' bez balíků (nebo " "navrhněte řešení)." -#: cmdline/apt-get.cc:1530 +#: cmdline/apt-get.cc:1539 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -986,7 +987,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:1538 +#: cmdline/apt-get.cc:1547 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -996,114 +997,114 @@ msgstr "" "balík není instalovatelný a měl byste o tom zaslat hlášení o chybě\n" "(bug report)." -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "Následující informace vám mohou pomoci vyřešit tuto situaci:" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "Poškozené balíky" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "Následujcící extra balíky budou instalovány:" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "Navrhované balíky:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "Doporučované balíky:" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "Propočítávám aktualizaci..." -#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99 +#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 msgid "Failed" msgstr "Selhalo" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "Hotovo" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 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:1872 cmdline/apt-get.cc:2079 +#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 #, c-format msgid "Unable to find a source package for %s" msgstr "Nemohu najít zdrojový balík pro %s" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, 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:1924 +#: cmdline/apt-get.cc:1933 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Potřebuji stáhnout %sB/%sB zdrojových archívů.\n" -#: cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Potřebuji stáhnout %sB zdrojových archívů.\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "Stáhnout zdroj %s\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "Stažení některých archívů selhalo." -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, 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:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Příkaz pro rozbalení '%s' selhal.\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "Příkaz pro sestavení '%s' selhal.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "Synovský proces selhal" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 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:2084 +#: cmdline/apt-get.cc:2093 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nemohu získat závislosti pro sestavení %s" -#: cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "%s nemá žádné závislosti pro sestavení.\n" -#: cmdline/apt-get.cc:2156 +#: cmdline/apt-get.cc:2165 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%s závislost pro %s nemůže být splněna, protože balík %s nebyl nalezen" -#: cmdline/apt-get.cc:2208 +#: cmdline/apt-get.cc:2217 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1112,31 +1113,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:2243 +#: cmdline/apt-get.cc:2252 #, 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:2268 +#: cmdline/apt-get.cc:2277 #, 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:2282 +#: cmdline/apt-get.cc:2291 #, 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:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "Chyba při zpracování závislostí pro sestavení" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "Podporované moduly:" -#: cmdline/apt-get.cc:2359 +#: cmdline/apt-get.cc:2368 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1383,8 +1384,8 @@ msgid "Duplicate conf file %s/%s" msgstr "Duplicitní konfigurační soubor %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "Selhal zápis do souboru %s" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1737,7 +1738,7 @@ msgstr "Spojení datového socketu vypršelo" msgid "Unable to accept connection" msgstr "Nemohu přijmout spojení" -#: methods/ftp.cc:864 methods/http.cc:916 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problém s hashováním souboru" @@ -1864,43 +1865,43 @@ msgstr "Tento HTTP server má porouchanou podporu rozsahů" msgid "Unknown date format" msgstr "Neznámý formát data" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "Výběr selhal" -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "Čas spojení vypršel" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "Chyba zápisu do výstupního souboru" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "Chyba zápisu do souboru" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "Chyba zápisu do souboru" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "Chyba čtení ze serveru. Druhá strana zavřela spojení" -#: methods/http.cc:834 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "Chyba čtení ze serveru" -#: methods/http.cc:1065 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "Špatné datové záhlaví" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "Spojení selhalo" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "Vnitřní chyba" @@ -2436,11 +2437,11 @@ 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:235 apt-pkg/acquire-item.cc:894 +#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 msgid "MD5Sum mismatch" msgstr "Neshoda MD5 součtů" -#: apt-pkg/acquire-item.cc:708 +#: apt-pkg/acquire-item.cc:714 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2449,7 +2450,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:761 +#: apt-pkg/acquire-item.cc:767 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2458,14 +2459,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:797 +#: apt-pkg/acquire-item.cc:803 #, 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:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "Velikosti nesouhlasí" diff --git a/po/cy.po b/po/cy.po index d8360fc3f..219125086 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: 2004-04-29 21:56-0700\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\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" @@ -14,145 +14,163 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:133 +#: cmdline/apt-cache.cc:135 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Mae gan y pecyn %s fersiwn %s ddibyniaeth heb ei gwrdd:\n" -#: cmdline/apt-cache.cc:173 cmdline/apt-cache.cc:525 cmdline/apt-cache.cc:613 -#: cmdline/apt-cache.cc:769 cmdline/apt-cache.cc:987 cmdline/apt-cache.cc:1355 -#: cmdline/apt-cache.cc:1506 +#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 +#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 +#: cmdline/apt-cache.cc:1508 #, c-format msgid "Unable to locate package %s" msgstr "Ni ellir lleoli'r pecyn %s" -#: cmdline/apt-cache.cc:230 -msgid "Total Package Names : " +#: cmdline/apt-cache.cc:232 +#, fuzzy +msgid "Total package names : " msgstr "Cyfanswm Enwau Pecynnau : " -#: cmdline/apt-cache.cc:270 -msgid " Normal Packages: " +#: cmdline/apt-cache.cc:272 +#, fuzzy +msgid " Normal packages: " msgstr " Pecynnau Normal: " -#: cmdline/apt-cache.cc:271 -msgid " Pure Virtual Packages: " +#: cmdline/apt-cache.cc:273 +#, fuzzy +msgid " Pure virtual packages: " msgstr " Pecynnau Cwbl Rhithwir: " -#: cmdline/apt-cache.cc:272 -msgid " Single Virtual Packages: " +#: cmdline/apt-cache.cc:274 +#, fuzzy +msgid " Single virtual packages: " msgstr " Pecynnau Rhithwir Sengl: " -#: cmdline/apt-cache.cc:273 -msgid " Mixed Virtual Packages: " +#: cmdline/apt-cache.cc:275 +#, fuzzy +msgid " Mixed virtual packages: " msgstr " Pecynnau Rhithwir Cymysg: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:276 msgid " Missing: " msgstr " Ar Goll: " -#: cmdline/apt-cache.cc:276 -msgid "Total Distinct Versions: " +#: cmdline/apt-cache.cc:278 +#, fuzzy +msgid "Total distinct versions: " msgstr "Cyfanswm Fersiynau Gwahanol: " -#: cmdline/apt-cache.cc:278 -msgid "Total Dependencies: " +#: cmdline/apt-cache.cc:280 +#, fuzzy +msgid "Total dependencies: " msgstr "Cyfanswm Dibyniaethau: " -#: cmdline/apt-cache.cc:281 -msgid "Total Ver/File relations: " +#: cmdline/apt-cache.cc:283 +#, fuzzy +msgid "Total ver/file relations: " msgstr "Cyfanswm perthyniadau fersiwn/ffeil: " -#: cmdline/apt-cache.cc:283 -msgid "Total Provides Mappings: " +#: cmdline/apt-cache.cc:285 +#, fuzzy +msgid "Total Provides mappings: " msgstr "Cyfanswm Mapiau Darpariath: " -#: cmdline/apt-cache.cc:295 -msgid "Total Globbed Strings: " +#: cmdline/apt-cache.cc:297 +#, fuzzy +msgid "Total globbed strings: " msgstr "Cyfanswm Llinynau Glob: " -#: cmdline/apt-cache.cc:309 -msgid "Total Dependency Version space: " +#: cmdline/apt-cache.cc:311 +#, fuzzy +msgid "Total dependency version space: " msgstr "Cyfanswm gofod Fersiwn Dibyniaeth: " -#: cmdline/apt-cache.cc:314 -msgid "Total Slack space: " +#: cmdline/apt-cache.cc:316 +#, fuzzy +msgid "Total slack space: " msgstr "Cyfanswm gofod Slac: " -#: cmdline/apt-cache.cc:322 -msgid "Total Space Accounted for: " +#: cmdline/apt-cache.cc:324 +#, fuzzy +msgid "Total space accounted for: " msgstr "Cyfanswm Gofod Cyfrifwyd: " -#: cmdline/apt-cache.cc:444 cmdline/apt-cache.cc:1187 +#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 #, c-format msgid "Package file %s is out of sync." msgstr "Nid yw'r ffeil pecyn %s yn gydamseredig." -#: cmdline/apt-cache.cc:1229 +#: cmdline/apt-cache.cc:1231 msgid "You must give exactly one pattern" msgstr "Rhaid i chi ddarparu un patrwm yn union" -#: cmdline/apt-cache.cc:1383 +#: cmdline/apt-cache.cc:1385 msgid "No packages found" msgstr "Canfuwyd dim pecyn" -#: cmdline/apt-cache.cc:1460 -msgid "Package Files:" +#: cmdline/apt-cache.cc:1462 +#, fuzzy +msgid "Package files:" msgstr "Ffeiliau Pecynnau:" -#: cmdline/apt-cache.cc:1467 cmdline/apt-cache.cc:1553 +#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Nid yw'r storfa yn gydamserol, ni ellir croesgyfeirio ffeil pecym" -#: cmdline/apt-cache.cc:1468 +#: cmdline/apt-cache.cc:1470 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1480 -msgid "Pinned Packages:" +#: cmdline/apt-cache.cc:1482 +#, fuzzy +msgid "Pinned packages:" msgstr "Pecynnau wedi eu Pinio:" -#: cmdline/apt-cache.cc:1492 cmdline/apt-cache.cc:1533 +#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 msgid "(not found)" msgstr "(heb ganfod)" #. Installed version -#: cmdline/apt-cache.cc:1513 +#: cmdline/apt-cache.cc:1515 msgid " Installed: " msgstr " Wedi Sefydlu: " -#: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1523 +#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 msgid "(none)" msgstr "(dim)" #. Candidate Version -#: cmdline/apt-cache.cc:1520 +#: cmdline/apt-cache.cc:1522 msgid " Candidate: " msgstr " Ymgeisydd: " -#: cmdline/apt-cache.cc:1530 -msgid " Package Pin: " +#: cmdline/apt-cache.cc:1532 +#, fuzzy +msgid " Package pin: " msgstr " Pin Pecyn: " #. Show the priority tables -#: cmdline/apt-cache.cc:1539 -msgid " Version Table:" +#: cmdline/apt-cache.cc:1541 +#, fuzzy +msgid " Version table:" msgstr " Tabl Fersiynnau:" -#: cmdline/apt-cache.cc:1554 +#: cmdline/apt-cache.cc:1556 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1581 cmdline/apt-cdrom.cc:731 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545 -#: cmdline/apt-get.cc:2299 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s ar gyfer %s %s wedi ei grynhow ar %s %s\n" -#: cmdline/apt-cache.cc:1588 +#: cmdline/apt-cache.cc:1658 +#, fuzzy msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -187,7 +205,7 @@ msgid "" " -q Disable progress indicator.\n" " -i Show only important deps for the unmet command.\n" " -c=? Read this configuration file\n" -" -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\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 "" "Defnydd: apt-cache [opsiynnau] gorchymyn\n" @@ -231,6 +249,7 @@ msgid "Arguments not in pairs" msgstr "Nid yw ymresymiadau mewn parau" #: cmdline/apt-config.cc:76 +#, fuzzy msgid "" "Usage: apt-config [options] command\n" "\n" @@ -243,8 +262,9 @@ msgid "" "Options:\n" " -h This help text.\n" " -c=? Read this configuration file\n" -" -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n" -msgstr "Defnydd: apt-config [opsiynnau] gorchymyn\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" +"Defnydd: apt-config [opsiynnau] gorchymyn\n" "\n" "Mae apt-config yn erfyn syml sy'n darllen ffeil cyfluniad APT\n" "\n" @@ -264,6 +284,7 @@ msgstr "Nid yw %s yn becyn DEB dilys." # FIXME: "debian" #: cmdline/apt-extracttemplates.cc:232 +#, fuzzy msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -274,7 +295,7 @@ msgid "" " -h This help text\n" " -t Set the temp dir\n" " -c=? Read this configuration file\n" -" -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" "Defnydd: apt-extracttemplates ffeil1 [ffeil2 ...]\n" "\n" @@ -303,8 +324,8 @@ msgstr "Mae'r rhestr estyniad pecyn yn rhy hir." #: ftparchive/apt-ftparchive.cc:165 ftparchive/apt-ftparchive.cc:179 #: ftparchive/apt-ftparchive.cc:202 ftparchive/apt-ftparchive.cc:252 #: ftparchive/apt-ftparchive.cc:266 ftparchive/apt-ftparchive.cc:288 -#, c-format -msgid "Error Processing directory %s" +#, fuzzy, c-format +msgid "Error processing directory %s" msgstr "Gwall wrth brosesu'r cyfeiriadur %s" #: ftparchive/apt-ftparchive.cc:250 @@ -316,12 +337,13 @@ msgid "Error writing header to contents file" msgstr "Gwall wrth ysgrifennu pennawd i'r ffeil cynnwys" #: ftparchive/apt-ftparchive.cc:397 -#, c-format -msgid "Error Processing Contents %s" +#, fuzzy, c-format +msgid "Error processing contents %s" msgstr "Gwall wrth Brosesu Cynnwys %s" # FIXME: full stops #: ftparchive/apt-ftparchive.cc:551 +#, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -360,7 +382,7 @@ msgid "" " --no-delink Enable delinking debug mode\n" " --contents Control contents file generation\n" " -c=? Read this configuration file\n" -" -o=? Set an arbitary configuration option" +" -o=? Set an arbitrary configuration option" msgstr "" "Defnydd: apt-ftparchive [opsiynnau] gorchymyn\n" "Gorchmynion: packages llwybrdeuol [ffeilgwrthwneud [cynddodiadllwybr]]\n" @@ -372,8 +394,7 @@ msgstr "" "\n" "Mae apt-ftparchive yn cynhyrchu ffeiliau mynegai ar gyfer archifau Debian.\n" "Mae'n cynnal nifer o arddulliau o gynhyrchiad, yn cynnwys modd wedi\n" -"awtomeiddio'n llwyr a modd yn debyg i dpkg-scanpackages a " -"dpkg-scansources.\n" +"awtomeiddio'n llwyr a modd yn debyg i dpkg-scanpackages a dpkg-scansources.\n" "\n" "Gall apt-ftparchive gynhyrchu ffeil Package o goeden o ffeiliau .deb.\n" "Mae'r ffeil Package yn cynnwys yr holl feysydd rheoli o bob pecyn yn\n" @@ -502,27 +523,32 @@ msgstr "*** Methwyd cysylltu %s at %s" msgid " DeLink limit of %sB hit.\n" msgstr " Tarwyd y terfyn cyswllt %sB.\n" -#: ftparchive/writer.cc:352 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 #: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 #, c-format msgid "Failed to stat %s" msgstr "Methodd stat() o %s" -#: ftparchive/writer.cc:372 +#: ftparchive/writer.cc:378 msgid "Archive had no package field" msgstr "Doedd dim maes pecyn gan yr archif" -#: ftparchive/writer.cc:380 ftparchive/writer.cc:589 +#: ftparchive/writer.cc:386 ftparchive/writer.cc:595 #, c-format msgid " %s has no override entry\n" msgstr " Does dim cofnod gwrthwneud gan %s\n" -#: ftparchive/writer.cc:423 ftparchive/writer.cc:671 +#: ftparchive/writer.cc:429 ftparchive/writer.cc:677 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " Cynaliwr %s yw %s nid %s\n" -#: ftparchive/contents.cc:346 ftparchive/contents.cc:377 +#: ftparchive/contents.cc:317 +#, fuzzy, c-format +msgid "Internal error, could not locate member %s" +msgstr "Gwall Mewnol, methwyd lleoli aelod %s" + +#: ftparchive/contents.cc:353 ftparchive/contents.cc:384 msgid "realloc - Failed to allocate memory" msgstr "realloc - Methwyd neilltuo cof" @@ -552,8 +578,8 @@ msgid "Failed to read the override file %s" msgstr "Methwydd darllen y ffeil dargyfeirio %s" #: ftparchive/multicompress.cc:75 -#, c-format -msgid "Unknown Compresison Algorithm '%s'" +#, fuzzy, c-format +msgid "Unknown compression algorithm '%s'" msgstr "Dull Cywasgu Anhysbys '%s'" #: ftparchive/multicompress.cc:105 @@ -574,12 +600,13 @@ msgid "Failed to fork" msgstr "Methodd fork()" #: ftparchive/multicompress.cc:215 -msgid "Compress Child" +#, fuzzy +msgid "Compress child" msgstr "Plentyn Cywasgu" #: ftparchive/multicompress.cc:238 -#, c-format -msgid "Internal Error, Failed to create %s" +#, fuzzy, c-format +msgid "Internal error, failed to create %s" msgstr "Gwall Mewnol, Methwyd creu %s" #: ftparchive/multicompress.cc:289 @@ -616,7 +643,7 @@ msgstr "Methwyd ailenwi %s at %s" msgid "Y" msgstr "I" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1466 +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 #, c-format msgid "Regex compilation error - %s" msgstr "Gwall crynhoi patrwm - %s" @@ -664,15 +691,18 @@ msgid "The following packages will be REMOVED:" msgstr "Caiff y pecynnau canlynol eu TYNNU:" #: cmdline/apt-get.cc:421 -msgid "The following packages have been kept back" +#, fuzzy +msgid "The following packages have been kept back:" msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl" #: cmdline/apt-get.cc:442 -msgid "The following packages will be upgraded" +#, fuzzy +msgid "The following packages will be upgraded:" msgstr "Caiff y pecynnau canlynol eu uwchraddio" #: cmdline/apt-get.cc:463 -msgid "The following packages will be DOWNGRADED" +#, fuzzy +msgid "The following packages will be DOWNGRADED:" msgstr "Caiff y pecynnau canlynol eu ISRADDIO" #: cmdline/apt-get.cc:483 @@ -685,8 +715,9 @@ msgid "%s (due to %s) " msgstr "%s (oherwydd %s) " #: cmdline/apt-get.cc:544 +#, fuzzy msgid "" -"WARNING: The following essential packages will be removed\n" +"WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" "RHYBUDD: Caiff y pecynnau hanfodol canlynol eu tynnu\n" @@ -747,67 +778,74 @@ msgid "Unmet dependencies. Try using -f." msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio -f." #: cmdline/apt-get.cc:687 -msgid "WARNING: The following packages cannot be securely authenticated!" +#, fuzzy +msgid "WARNING: The following packages cannot be authenticated!" msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!" #: cmdline/apt-get.cc:698 -msgid "Abort? [Y/n] " -msgstr "Erthylu? [I/n] " +msgid "Install these packages without verification [y/N]? " +msgstr "" + +#: cmdline/apt-get.cc:700 +#, fuzzy +msgid "Some packages could not be authenticated" +msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!" -#: cmdline/apt-get.cc:755 -msgid "Packages need to be removed but Remove is disabled." +#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855 +msgid "There are problems and -y was used without --force-yes" +msgstr "Mae problemau a defnyddwyd -y heb --force-yes" + +#: cmdline/apt-get.cc:762 +#, fuzzy +msgid "Packages need to be removed but remove is disabled." msgstr "Rhaid tynnu pecynnau on mae Tynnu wedi ei analluogi." -#: cmdline/apt-get.cc:781 cmdline/apt-get.cc:1755 cmdline/apt-get.cc:1788 +#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 msgid "Unable to lock the download directory" msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1836 cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Methwyd darllen y rhestr ffynhonellau." -#: cmdline/apt-get.cc:811 +#: cmdline/apt-get.cc:818 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Mae angeyn cyrchu %sB/%sB o archifau.\n" -#: cmdline/apt-get.cc:814 +#: cmdline/apt-get.cc:821 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Mae angen cyrchu %sB o archifau.\n" -#: cmdline/apt-get.cc:819 +#: cmdline/apt-get.cc:826 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Ar ôl dadbacio defnyddir %sB o ofod disg ychwanegol.\n" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:829 #, c-format 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:839 +#: cmdline/apt-get.cc:846 #, c-format msgid "You don't have enough free space in %s." msgstr "Does dim digon o le rhydd gennych yn %s." -#: cmdline/apt-get.cc:848 -msgid "There are problems and -y was used without --force-yes" -msgstr "Mae problemau a defnyddwyd -y heb --force-yes" - -#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Penodwyd Syml Yn Unig ond nid yw hyn yn weithred syml." -#: cmdline/apt-get.cc:856 +#: cmdline/apt-get.cc:863 msgid "Yes, do as I say!" msgstr "Ie, gwna fel rydw i'n dweud!" -#: cmdline/apt-get.cc:858 -#, c-format +#: cmdline/apt-get.cc:865 +#, fuzzy, c-format msgid "" -"You are about to do something potentially harmful\n" +"You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" " ?] " msgstr "" @@ -815,28 +853,29 @@ msgstr "" "Er mwyn mynd ymlaen, teipiwch y frawddeg '%s'\n" " ?]" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890 msgid "Abort." msgstr "Erthylu." -#: cmdline/apt-get.cc:879 -msgid "Do you want to continue? [Y/n] " +#: cmdline/apt-get.cc:886 +#, fuzzy +msgid "Do you want to continue [Y/n]? " msgstr "Ydych chi eisiau mynd ymlaen? [Y/n] " -#: cmdline/apt-get.cc:954 cmdline/apt-get.cc:1325 cmdline/apt-get.cc:1945 +#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Methwyd cyrchu %s %s\n" -#: cmdline/apt-get.cc:972 +#: cmdline/apt-get.cc:976 msgid "Some files failed to download" msgstr "Methodd rhai ffeiliau lawrlwytho" -#: cmdline/apt-get.cc:973 cmdline/apt-get.cc:1954 +#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 msgid "Download complete and in download only mode" msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:983 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -844,103 +883,103 @@ msgstr "" "Ni ellir cyrchu rhai archifau, efallai dylwch rhedeg apt-get update, neu " "geidio defnyddio --fix-missing?" -#: cmdline/apt-get.cc:983 +#: cmdline/apt-get.cc:987 msgid "--fix-missing and media swapping is not currently supported" msgstr "Ni chynhelir cyfnewid cyfrwng efo --fix-missing ar hyn o bryd" -#: cmdline/apt-get.cc:988 +#: cmdline/apt-get.cc:992 msgid "Unable to correct missing packages." msgstr "Ni ellir cywiro pecynnau ar goll." -#: cmdline/apt-get.cc:989 -msgid "Aborting Install." +#: cmdline/apt-get.cc:993 +#, fuzzy +msgid "Aborting install." msgstr "Yn Erthylu'r Sefydliad." -#: cmdline/apt-get.cc:1022 +#: cmdline/apt-get.cc:1026 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Sylwer, yn dewis %s yn hytrach na %s\n" -#: cmdline/apt-get.cc:1032 +#: cmdline/apt-get.cc:1036 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Yn hepgor %s, mae wedi ei sefydlu a nid yw uwchraddio wedi ei osod.\n" -#: cmdline/apt-get.cc:1050 +#: cmdline/apt-get.cc:1054 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Nid yw'r pecyn %s wedi ei sefydlu, felly ni chaif ei dynnu\n" -#: cmdline/apt-get.cc:1061 +#: cmdline/apt-get.cc:1065 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Mae'r pecyn %s yn becyn rhithwir a ddarparir gan:\n" -#: cmdline/apt-get.cc:1073 +#: cmdline/apt-get.cc:1077 msgid " [Installed]" msgstr " [Sefydliwyd]" -#: cmdline/apt-get.cc:1078 +#: cmdline/apt-get.cc:1082 msgid "You should explicitly select one to install." msgstr "Dylech ddewis un yn benodol i'w sefydlu." # FIXME: punctuation -#: cmdline/apt-get.cc:1083 -#, c-format +#: cmdline/apt-get.cc:1087 +#, fuzzy, c-format msgid "" -"Package %s has no available version, but exists in the database.\n" -"This typically means that the package was mentioned in a dependency and\n" -"never uploaded, has been obsoleted or is not available with the contents\n" -"of sources.list\n" +"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 "" "Does dim fersiwn gan y pecyn %s, ond mae'n bodoli yn y cronfa data.\n" "Mae hyn fel arfer yn golygu y crybwyllwyd y pecyn mewn dibyniaeth ond heb\n" "gael ei uwchlwytho, cafodd ei ddarfod neu nid yw ar gael drwy gynnwys y\n" "ffeil sources.list.\n" -#: cmdline/apt-get.cc:1103 +#: cmdline/apt-get.cc:1106 msgid "However the following packages replace it:" msgstr "Fodd bynnag, mae'r pecynnau canlynol yn cymryd ei le:" -#: cmdline/apt-get.cc:1106 +#: cmdline/apt-get.cc:1109 #, c-format msgid "Package %s has no installation candidate" msgstr "Does dim ymgeisydd sefydlu gan y pecyn %s" -#: cmdline/apt-get.cc:1126 +#: cmdline/apt-get.cc:1129 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Nid yw ailsefydlu %s yn bosib, gan ni ellir ei lawrlwytho.\n" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1137 #, c-format msgid "%s is already the newest version.\n" msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n" -#: cmdline/apt-get.cc:1161 +#: cmdline/apt-get.cc:1164 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'" -#: cmdline/apt-get.cc:1163 +#: cmdline/apt-get.cc:1166 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Ni chanfuwyd y fersiwn '%s' o '%s' " -#: cmdline/apt-get.cc:1169 +#: cmdline/apt-get.cc:1172 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n" -#: cmdline/apt-get.cc:1279 +#: cmdline/apt-get.cc:1282 msgid "The update command takes no arguments" msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau" -#: cmdline/apt-get.cc:1292 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "Ni ellir cloi'r cyfeiriadur rhestr" -#: cmdline/apt-get.cc:1344 +#: cmdline/apt-get.cc:1353 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -948,26 +987,27 @@ msgstr "" "Methwodd rhai ffeiliau mynegai lawrlwytho: maent wedi eu anwybyddu, neu hen " "rai eu defnyddio yn lle." -#: cmdline/apt-get.cc:1363 -msgid "Internal Error, AllUpgrade broke stuff" +#: cmdline/apt-get.cc:1372 +#, fuzzy +msgid "Internal error, AllUpgrade broke stuff" msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" -#: cmdline/apt-get.cc:1453 cmdline/apt-get.cc:1489 +#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 #, c-format msgid "Couldn't find package %s" msgstr "Methwyd canfod pecyn %s" -#: cmdline/apt-get.cc:1476 +#: cmdline/apt-get.cc:1494 #, 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:1506 +#: cmdline/apt-get.cc:1524 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:1509 +#: cmdline/apt-get.cc:1527 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -976,7 +1016,7 @@ msgstr "" "pecyn (neu penodwch ddatrys)" # FIXME: needs commas -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1539 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -989,7 +1029,7 @@ msgstr "" "heb gael eu symud allan o Incoming." # FIXME: commas, wrapping -#: cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1547 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -998,147 +1038,153 @@ 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:1534 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:" -#: cmdline/apt-get.cc:1537 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "Pecynnau wedi torri" -#: cmdline/apt-get.cc:1563 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:" -#: cmdline/apt-get.cc:1629 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "Pecynnau a awgrymmir:" -#: cmdline/apt-get.cc:1630 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "Pecynnau a argymhellir:" -#: cmdline/apt-get.cc:1650 -msgid "Calculating Upgrade... " +#: cmdline/apt-get.cc:1673 +#, fuzzy +msgid "Calculating upgrade... " msgstr "Yn Cyfrifo'r Uwchraddiad... " -#: cmdline/apt-get.cc:1653 methods/ftp.cc:702 methods/connect.cc:99 +#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 msgid "Failed" msgstr "Methwyd" -#: cmdline/apt-get.cc:1658 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "Wedi Gorffen" -#: cmdline/apt-get.cc:1831 +#: cmdline/apt-get.cc:1854 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:1858 cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 #, c-format msgid "Unable to find a source package for %s" msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s" -#: cmdline/apt-get.cc:1905 +#: cmdline/apt-get.cc:1928 #, 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:1910 +#: cmdline/apt-get.cc:1933 #, 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:1913 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n" -#: cmdline/apt-get.cc:1919 -#, c-format -msgid "Fetch Source %s\n" +#: cmdline/apt-get.cc:1942 +#, fuzzy, c-format +msgid "Fetch source %s\n" msgstr "Cyrchu Ffynhonell %s\n" -#: cmdline/apt-get.cc:1950 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "Methwyd cyrchu rhai archifau." -#: cmdline/apt-get.cc:1978 +#: cmdline/apt-get.cc:2001 #, 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:1990 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Methodd y gorchymyn dadbacio '%s'.\n" -#: cmdline/apt-get.cc:2007 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "Methodd y gorchymyn adeiladu '%s'.\n" -#: cmdline/apt-get.cc:2026 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "Methodd proses plentyn" -#: cmdline/apt-get.cc:2042 +#: cmdline/apt-get.cc:2065 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" +msgstr "" +"Rhaid penodi o leiaf un pecyn i wirio dibyniaethau adeiladu ar eu cyfer" -#: cmdline/apt-get.cc:2070 +#: cmdline/apt-get.cc:2093 #, 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:2090 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "Nid oes dibyniaethau adeiladu gan %s.\n" -#: cmdline/apt-get.cc:2142 +#: cmdline/apt-get.cc:2165 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn " -"%s" +"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn %" +"s" -#: cmdline/apt-get.cc:2194 +#: cmdline/apt-get.cc:2217 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" -"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" +"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:2229 +#: cmdline/apt-get.cc:2252 #, 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" +msgstr "" +"Methwyd bodloni dibynniaeth %s am %s: Mae'r pecyn sefydliedig %s yn rhy " +"newydd" -#: cmdline/apt-get.cc:2254 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Methwyd bodloni dibyniaeth %s am %s: %s" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s." -#: cmdline/apt-get.cc:2272 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "Methwyd prosesu dibyniaethau adeiladu" -#: cmdline/apt-get.cc:2304 -msgid "Supported Modules:" +#: cmdline/apt-get.cc:2327 +#, fuzzy +msgid "Supported modules:" msgstr "Modylau a Gynhelir:" # FIXME: split -#: cmdline/apt-get.cc:2345 +#: cmdline/apt-get.cc:2368 +#, fuzzy msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1174,7 +1220,7 @@ msgid "" " -b Build the source package after fetching it\n" " -V Show verbose version numbers\n" " -c=? Read this configuration file\n" -" -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\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" @@ -1242,13 +1288,14 @@ msgid "Fetched %sB in %s (%sB/s)\n" msgstr "Cyrchwyd %sB yn %s (%sB/s)\n" #: cmdline/acqprogress.cc:225 +#, c-format msgid " [Working]" msgstr " [Gweithio]" #: cmdline/acqprogress.cc:271 -#, c-format +#, fuzzy, c-format msgid "" -"Media Change: Please insert the disc labeled\n" +"Media change: please insert the disc labeled\n" " '%s'\n" "in the drive '%s' and press enter\n" msgstr "" @@ -1261,6 +1308,7 @@ msgid "Unknown package record!" msgstr "Cofnod pecyn anhysbys!" #: cmdline/apt-sortpkgs.cc:150 +#, fuzzy msgid "" "Usage: apt-sortpkgs [options] file1 [file2 ...]\n" "\n" @@ -1271,7 +1319,7 @@ msgid "" " -h This help text\n" " -s Use source file sorting\n" " -c=? Read this configuration file\n" -" -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" "Defnydd: apt-sortpkgs [opsiynnau] ffeil1 [ffeil2 ...]\n" "\n" @@ -1313,26 +1361,28 @@ msgstr "" "eto." #: dselect/update:30 -msgid "Merging Available information" +#, fuzzy +msgid "Merging available information" msgstr "Yn cyfuno manylion Ar Gael" -#: apt-inst/contrib/extracttar.cc:115 +#: apt-inst/contrib/extracttar.cc:117 msgid "Failed to create pipes" msgstr "Methwyd creu pibau" -#: apt-inst/contrib/extracttar.cc:140 +#: apt-inst/contrib/extracttar.cc:143 msgid "Failed to exec gzip " msgstr "Methwyd gweithredu gzip" -#: apt-inst/contrib/extracttar.cc:177 apt-inst/contrib/extracttar.cc:203 +#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 msgid "Corrupted archive" msgstr "Archif llygredig" -#: apt-inst/contrib/extracttar.cc:192 -msgid "Tar Checksum failed, archive corrupted" +#: apt-inst/contrib/extracttar.cc:195 +#, fuzzy +msgid "Tar checksum failed, archive corrupted" msgstr "Methodd swm gwirio Tar, archif llygredig" -#: apt-inst/contrib/extracttar.cc:295 +#: apt-inst/contrib/extracttar.cc:298 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Math pennawd TAR anhysbys %u, aelod %s" @@ -1370,7 +1420,8 @@ msgid "Failed to allocate diversion" msgstr "Methwyd neilltuo dargyfeiriad" #: apt-inst/filelist.cc:468 -msgid "Internal Error in AddDiversion" +#, fuzzy +msgid "Internal error in AddDiversion" msgstr "Gwall Mewnol yn AddDiversion" #: apt-inst/filelist.cc:481 @@ -1390,8 +1441,8 @@ msgid "Duplicate conf file %s/%s" msgstr "Ffeil cyfluniad dyblyg %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "Methwyd ysgrifennu ffeil %s" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1426,7 +1477,8 @@ msgstr "Mae llwybr y dargyfeiriad yn rhy hir" #: apt-inst/extract.cc:243 #, c-format msgid "The directory %s is being replaced by a non-directory" -msgstr "Mae'r cyfeiriadur %s yn cael ei amnewid efo rhywbeth nid cyfeiriadur ydyw" +msgstr "" +"Mae'r cyfeiriadur %s yn cael ei amnewid efo rhywbeth nid cyfeiriadur ydyw" #: apt-inst/extract.cc:283 msgid "Failed to locate node in its hash bucket" @@ -1481,7 +1533,8 @@ msgstr "Rhaid i'r cyfeiriaduron 'info' a 'temp' for ar yr un system ffeiliau" #: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 #: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 #: apt-pkg/pkgcachegen.cc:840 -msgid "Reading Package Lists" +#, fuzzy +msgid "Reading package lists" msgstr "Yn Darllen Rhestrau Pecynnau" #: apt-inst/deb/dpkgdb.cc:180 @@ -1492,11 +1545,13 @@ msgstr "Methwyd newid i'r cyfeiriadur gweinyddiaeth %sinfo" # FIXME #: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 #: apt-inst/deb/dpkgdb.cc:448 -msgid "Internal Error getting a Package Name" +#, fuzzy +msgid "Internal error getting a package name" msgstr "Gwall mewnol wrth gyrchu enw pecyn" #: apt-inst/deb/dpkgdb.cc:205 -msgid "Reading File Listing" +#, fuzzy +msgid "Reading file listing" msgstr "Yn Darllen Rhestr Ffeiliau" #: apt-inst/deb/dpkgdb.cc:216 @@ -1516,7 +1571,8 @@ msgid "Failed reading the list file %sinfo/%s" msgstr "Methwyd darllen y ffeil rhestr %sinfo/%s" #: apt-inst/deb/dpkgdb.cc:266 -msgid "Internal Error getting a Node" +#, fuzzy +msgid "Internal error getting a node" msgstr "Gwall Mewnol wrth gael Nôd" # FIXME: literal @@ -1536,20 +1592,23 @@ msgid "Invalid line in the diversion file: %s" msgstr "Llinell annilys yn y ffeil dargyfeirio: %s" #: apt-inst/deb/dpkgdb.cc:362 -msgid "Internal Error adding a diversion" +#, fuzzy +msgid "Internal error adding a diversion" msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad" #: apt-inst/deb/dpkgdb.cc:383 -msgid "The pkg cache must be initialize first" +#, fuzzy +msgid "The pkg cache must be initialized first" msgstr "Rhaid i'r storfa pecynnau gael ei ymgychwyn yn gyntaf" #: apt-inst/deb/dpkgdb.cc:386 -msgid "Reading File List" +#, fuzzy +msgid "Reading file list" msgstr "Yn Darllen Rhestr Ffeiliau" #: apt-inst/deb/dpkgdb.cc:443 -#, c-format -msgid "Failed to find a Package: Header, offset %lu" +#, fuzzy, c-format +msgid "Failed to find a Package: header, offset %lu" msgstr "Methwyd canfod pennawd \"Package:\". Atred: %lu" #: apt-inst/deb/dpkgdb.cc:465 @@ -1562,31 +1621,33 @@ msgstr "Adrean \"ConfFile\" gwael yn y ffeil statws. Atred: %lu" msgid "Error parsing MD5. Offset %lu" msgstr "Gwall wrth ramadegu MD5. Atred: %lu" -#: apt-inst/deb/debfile.cc:55 +#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Nid yw hyn yn archif DEB dilys, aelod '%s' ar goll" -#: apt-inst/deb/debfile.cc:72 -#, c-format -msgid "Internal Error, could not locate member %s" -msgstr "Gwall Mewnol, methwyd lleoli aelod %s" +#: apt-inst/deb/debfile.cc:52 +#, fuzzy, c-format +msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" +msgstr "Nid yw hyn yn archif DEB dilys, aelod '%s' ar goll" -#: apt-inst/deb/debfile.cc:104 +#: apt-inst/deb/debfile.cc:112 #, c-format msgid "Couldn't change to %s" msgstr "Methwyd newid i %s" -#: apt-inst/deb/debfile.cc:125 -msgid "Internal Error, could not locate member" +#: apt-inst/deb/debfile.cc:138 +#, fuzzy +msgid "Internal error, could not locate member" msgstr "Gwall Methwyd, methwyd lleoli aelod" -#: apt-inst/deb/debfile.cc:158 +#: apt-inst/deb/debfile.cc:171 msgid "Failed to locate a valid control file" msgstr "Methwyd lleoli ffeil rheoli dilys" -#: apt-inst/deb/debfile.cc:243 -msgid "Unparsible control file" +#: apt-inst/deb/debfile.cc:256 +#, fuzzy +msgid "Unparsable control file" msgstr "Ffeil rheoli ni ellir ei ramadegu" #: methods/cdrom.cc:113 @@ -1595,24 +1656,26 @@ msgid "Unable to read the cdrom database %s" msgstr "Methwyd darllen y cronfa ddata CD-ROM %s" #: methods/cdrom.cc:122 +#, fuzzy msgid "" -"Please use apt-cdrom to make this CD recognized by APT. apt-get update " -"cannot be used to add new CDs" +"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " +"cannot be used to add new CD-ROMs" msgstr "" -"Defnyddiwch apt-cdrom fel bo APT yn adnabod y CD hwn. Ni ellir defnyddio " -"apt-get update i ychwanegu CDau newydd." +"Defnyddiwch apt-cdrom fel bo APT yn adnabod y CD hwn. Ni ellir defnyddio apt-" +"get update i ychwanegu CDau newydd." #: methods/cdrom.cc:130 methods/cdrom.cc:168 -msgid "Wrong CD" +#, fuzzy +msgid "Wrong CD-ROM" msgstr "CD Anghywir" #: methods/cdrom.cc:163 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." -msgstr "Ni ellir datglymu'r CD-ROM yn %s. Efallai ei fod e'n cael ei " -"ddefnyddio." +msgstr "" +"Ni ellir datglymu'r CD-ROM yn %s. Efallai ei fod e'n cael ei ddefnyddio." -#: methods/cdrom.cc:177 methods/file.cc:77 +#: methods/cdrom.cc:177 methods/file.cc:77 methods/rsh.cc:264 msgid "File not found" msgstr "Ffeil heb ei ganfod" @@ -1642,8 +1705,8 @@ msgid "Unable to determine the local name" msgstr "Ni ellir darganfod yr enw lleol" #: methods/ftp.cc:204 methods/ftp.cc:232 -#, c-format -msgid "Server refused our connection and said: %s" +#, fuzzy, c-format +msgid "The server refused the connection and said: %s" msgstr "Gwrthodwyd y gweinydd ein cysyllriad, a dwedodd: %s" #: methods/ftp.cc:210 @@ -1661,8 +1724,8 @@ msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." msgstr "" -"Penodwyd gweinydd dirprwy ond dim sgript mengofnodi. (Mae " -"Acquire::ftp::ProxyLogin yn wag.)" +"Penodwyd gweinydd dirprwy ond dim sgript mengofnodi. (Mae Acquire::ftp::" +"ProxyLogin yn wag.)" # FIXME #: methods/ftp.cc:265 @@ -1683,7 +1746,7 @@ msgstr "Goramser cysylltu" msgid "Server closed the connection" msgstr "Caeodd y gweinydd y cysylltiad" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:452 methods/rsh.cc:190 +#: methods/ftp.cc:338 methods/rsh.cc:190 apt-pkg/contrib/fileutl.cc:453 msgid "Read error" msgstr "Gwall darllen" @@ -1695,9 +1758,9 @@ msgstr "Gorlifodd ateb y byffer." msgid "Protocol corruption" msgstr "Llygr protocol" -#: methods/ftp.cc:446 methods/rsh.cc:232 -msgid "Write Error" -msgstr "Gwall Ysgrifennu" +#: methods/ftp.cc:446 methods/rsh.cc:232 apt-pkg/contrib/fileutl.cc:492 +msgid "Write error" +msgstr "Gwall ysgrifennu" #: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729 msgid "Could not create a socket" @@ -1708,7 +1771,8 @@ msgid "Could not connect data socket, connection timed out" msgstr "Methwyd cysylltu soced data, goramserodd y cyslltiad" #: methods/ftp.cc:704 -msgid "Could not connect passive socket" +#, fuzzy +msgid "Could not connect passive socket." msgstr "Methwyd cysylltu soced goddefol" # FIXME @@ -1750,7 +1814,7 @@ msgstr "Goramserodd cysylltiad y soced data" msgid "Unable to accept connection" msgstr "Methwyd derbyn cysylltiad" -#: methods/ftp.cc:864 methods/http.cc:912 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem wrth stwnshio ffeil" @@ -1774,7 +1838,7 @@ msgid "Query" msgstr "Ymholiad" # FIXME -#: methods/ftp.cc:1104 +#: methods/ftp.cc:1106 msgid "Unable to invoke " msgstr "Methwyd gweithredu " @@ -1845,79 +1909,89 @@ msgstr "Methwyd agor pibell ar gyfer %s" msgid "Read error from %s process" msgstr "Gwall darllen o broses %s" -#: methods/http.cc:340 +#: methods/http.cc:344 msgid "Waiting for headers" msgstr "Yn aros am benawdau" -#: methods/http.cc:486 +#: methods/http.cc:490 #, c-format msgid "Got a single header line over %u chars" msgstr "Derbynnwyd llinell pennaws sengl dros %u nod" -#: methods/http.cc:494 +#: methods/http.cc:498 msgid "Bad header line" msgstr "Llinell pennawd gwael" -#: methods/http.cc:513 methods/http.cc:520 -msgid "The http server sent an invalid reply header" +#: methods/http.cc:517 methods/http.cc:524 +#, fuzzy +msgid "The HTTP server sent an invalid reply header" msgstr "Danfonodd y gweinydd HTTP bennawd ateb annilys" -#: methods/http.cc:549 -msgid "The http server sent an invalid Content-Length header" +#: methods/http.cc:553 +#, fuzzy +msgid "The HTTP server sent an invalid Content-Length header" msgstr "Danfonodd y gweinydd HTTP bennawd Content-Length annilys" -#: methods/http.cc:564 -msgid "The http server sent an invalid Content-Range header" +#: methods/http.cc:568 +#, fuzzy +msgid "The HTTP server sent an invalid Content-Range header" msgstr "Danfonodd y gweinydd HTTP bennawd Content-Range annilys" -#: methods/http.cc:566 -msgid "This http server has broken range support" +#: methods/http.cc:570 +#, fuzzy +msgid "This HTTP server has broken range support" msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri" -#: methods/http.cc:590 +#: methods/http.cc:594 msgid "Unknown date format" msgstr "Fformat dyddiad anhysbys" -#: methods/http.cc:733 +#: methods/http.cc:741 msgid "Select failed" msgstr "Methwyd dewis" -#: methods/http.cc:738 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "Goramserodd y cysylltiad" -#: methods/http.cc:761 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "Gwall wrth ysgrifennu i ffeil allbwn" -#: methods/http.cc:789 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "Gwall wrth ysgrifennu at ffeil" -#: methods/http.cc:814 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "Gwall wrth ysgrifennu at y ffeil" -#: methods/http.cc:828 -msgid "Error reading from server Remote end closed connection" +#: methods/http.cc:836 +#, fuzzy +msgid "Error reading from server. Remote end closed connection" msgstr "Gwall wrth ddarllen o'r gweinydd: caeodd yr ochr pell y cysylltiad" -#: methods/http.cc:830 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "Gwall wrth ddarllen o'r gweinydd" -#: methods/http.cc:1061 -msgid "Bad header Data" +#: methods/http.cc:1069 +#, fuzzy +msgid "Bad header data" msgstr "Data pennawd gwael" -#: methods/http.cc:1078 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "Methodd y cysylltiad" -#: methods/http.cc:1169 +#: methods/http.cc:1177 msgid "Internal error" msgstr "Gwall mewnol" +#: methods/rsh.cc:330 +msgid "Connection closed prematurely" +msgstr "Caewyd y cysylltiad yn gynnar" + #: apt-pkg/contrib/mmap.cc:82 msgid "Can't mmap an empty file" msgstr "Ni ellir defnyddio mmap() ar ffeil gwag" @@ -1954,8 +2028,8 @@ msgstr "Gwall cystrawen %s:%u: Mae bloc yn cychwyn efo dim enw." # FIXME #: apt-pkg/contrib/configuration.cc:586 -#, c-format -msgid "Syntax error %s:%u: Malformed Tag" +#, fuzzy, c-format +msgid "Syntax error %s:%u: Malformed tag" msgstr "Gwall cystrawen %s:%u: Tag wedi camffurfio" #: apt-pkg/contrib/configuration.cc:603 @@ -1966,7 +2040,8 @@ msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ôl y gwerth" #: apt-pkg/contrib/configuration.cc:643 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" -msgstr "Gwall cystrawen %s:%u: Ceir defnyddio cyfarwyddyd ar y lefel dop yn unig" +msgstr "" +"Gwall cystrawen %s:%u: Ceir defnyddio cyfarwyddyd ar y lefel dop yn unig" #: apt-pkg/contrib/configuration.cc:650 #, c-format @@ -2051,7 +2126,7 @@ msgstr "Gweithred annilys %s" msgid "Unable to stat the mount point %s" msgstr "Ni ellir gwneud stat() o'r pwynt clymu %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:418 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:422 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "Ni ellir newid i %s" @@ -2080,56 +2155,52 @@ msgstr "Ddim yn cloi'r ffeil clo ar NFS %s" msgid "Could not get lock %s" msgstr "Methwyd cael y clo %s" -#: apt-pkg/contrib/fileutl.cc:358 -#, c-format -msgid "Waited, for %s but it wasn't there" +#: apt-pkg/contrib/fileutl.cc:359 +#, fuzzy, c-format +msgid "Waited for %s but it wasn't there" msgstr "Arhoswyd am %s ond nid oedd e yna" -#: apt-pkg/contrib/fileutl.cc:368 +#: apt-pkg/contrib/fileutl.cc:369 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Derbyniodd is-broses %s wall segmentu." -#: apt-pkg/contrib/fileutl.cc:371 +#: apt-pkg/contrib/fileutl.cc:372 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Dychwelodd is-broses %s gôd gwall (%u)" -#: apt-pkg/contrib/fileutl.cc:373 +#: apt-pkg/contrib/fileutl.cc:374 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Gorffenodd is-broses %s yn annisgwyl" -#: apt-pkg/contrib/fileutl.cc:417 +#: apt-pkg/contrib/fileutl.cc:418 #, c-format msgid "Could not open file %s" msgstr "Methwyd agor ffeil %s" # FIXME -#: apt-pkg/contrib/fileutl.cc:473 +#: apt-pkg/contrib/fileutl.cc:474 #, c-format msgid "read, still have %lu to read but none left" msgstr "o hyd %lu i ddarllen ond dim ar ôl" -#: apt-pkg/contrib/fileutl.cc:491 -msgid "Write error" -msgstr "Gwall ysgrifennu" - # FIXME -#: apt-pkg/contrib/fileutl.cc:503 +#: apt-pkg/contrib/fileutl.cc:504 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "o hyd %lu i ysgrifennu ond methwyd" -#: apt-pkg/contrib/fileutl.cc:578 +#: apt-pkg/contrib/fileutl.cc:579 msgid "Problem closing the file" msgstr "Gwall wrth gau'r ffeil" -#: apt-pkg/contrib/fileutl.cc:584 +#: apt-pkg/contrib/fileutl.cc:585 msgid "Problem unlinking the file" msgstr "Gwall wrth dadgysylltu'r ffeil" -#: apt-pkg/contrib/fileutl.cc:595 +#: apt-pkg/contrib/fileutl.cc:596 msgid "Problem syncing the file" msgstr "Gwall wrth gyfamseru'r ffeil" @@ -2147,8 +2218,8 @@ msgstr "Mae'r ffeil storfa pecyn yn fersiwn anghyflawn" # FIXME: capitalisation? #: apt-pkg/pkgcache.cc:142 -#, c-format -msgid "This APT does not support the Versioning System '%s'" +#, fuzzy, c-format +msgid "This APT does not support the versioning system '%s'" msgstr "Nid yw'r APT yma yn cefnogi'r system fersiwn '%s'" #: apt-pkg/pkgcache.cc:147 @@ -2204,15 +2275,18 @@ msgid "extra" msgstr "ychwanegol" #: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 -msgid "Building Dependency Tree" +#, fuzzy +msgid "Building dependency tree" msgstr "Yn Aideladu Coeden Dibyniaeth" #: apt-pkg/depcache.cc:61 -msgid "Candidate Versions" +#, fuzzy +msgid "Candidate versions" msgstr "Fersiynau Posib" #: apt-pkg/depcache.cc:90 -msgid "Dependency Generation" +#, fuzzy +msgid "Dependency generation" msgstr "Cynhyrchaid Dibyniaeth" # FIXME: number? @@ -2242,14 +2316,15 @@ msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)" #: apt-pkg/sourcelist.cc:98 -#, c-format -msgid "Malformed line %lu in source list %s (Absolute dist)" +#, fuzzy, c-format +msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad llwyr)" #: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" -msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)" +msgstr "" +"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)" #: apt-pkg/sourcelist.cc:156 #, c-format @@ -2267,10 +2342,15 @@ msgid "Malformed line %u in source list %s (type)" msgstr "Llinell camffurfiol %u yn y rhestr ffynhonell %s (math)" #: apt-pkg/sourcelist.cc:191 -#, c-format -msgid "Type '%s' is not known in on line %u in source list %s" +#, fuzzy, c-format +msgid "Type '%s' is not known on line %u in source list %s" msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s" +#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 +#, fuzzy, c-format +msgid "Malformed line %u in source list %s (vendor id)" +msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)" + # FIXME: %s may have an arbirrary length #: apt-pkg/packagemanager.cc:402 #, c-format @@ -2280,33 +2360,34 @@ msgid "" "you really want to do it, activate the APT::Force-LoopBreak option." msgstr "" "Bydd y rhediad sefydlu hwn yn gorfodi tynnu'r pecyn angenrheidiol %s " -"oherwydd lŵp gwrthdaro/cynddibynu. Mae hyn yn aml yn wael, ond os ydych " -"wir eisiau ei wneud ef, gweithredwch yr opsiwn APT::Force-LoopBreak." +"oherwydd lŵp gwrthdaro/cynddibynu. Mae hyn yn aml yn wael, ond os ydych wir " +"eisiau ei wneud ef, gweithredwch yr opsiwn APT::Force-LoopBreak." #: apt-pkg/pkgrecords.cc:37 #, c-format msgid "Index file type '%s' is not supported" msgstr "Ni chynhelir y math ffeil mynegai '%s'" -#: apt-pkg/algorithms.cc:238 +#: apt-pkg/algorithms.cc:241 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" -"Mae angen ailsefydlu'r pecyn %s, ond dydw i ddim yn gallu canfod archif ar ei " -"gyfer." +"Mae angen ailsefydlu'r pecyn %s, ond dydw i ddim yn gallu canfod archif ar " +"ei gyfer." -#: apt-pkg/algorithms.cc:1056 +#: apt-pkg/algorithms.cc:1059 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" -"Gwall: Cynhyrchodd pkgProblemResolver::Resolve doriadau. Fe all hyn fod " -"wedi ei achosi gan pecynnau wedi eu dal." +"Gwall: Cynhyrchodd pkgProblemResolver::Resolve doriadau. Fe all hyn fod wedi " +"ei achosi gan pecynnau wedi eu dal." -#: apt-pkg/algorithms.cc:1058 +#: apt-pkg/algorithms.cc:1061 msgid "Unable to correct problems, you have held broken packages." -msgstr "Ni ellir cywiro'r problemau gan eich bod chi wedi dal pecynnau torredig." +msgstr "" +"Ni ellir cywiro'r problemau gan eich bod chi wedi dal pecynnau torredig." #: apt-pkg/acquire.cc:61 #, c-format @@ -2334,7 +2415,8 @@ msgid "Packaging system '%s' is not supported" msgstr "Ni chynhelir y system pecynnu '%s'" #: apt-pkg/init.cc:135 -msgid "Unable to determine a suitable system type" +#, fuzzy +msgid "Unable to determine a suitable packaging system type" msgstr "Ni ellir canfod math system addas" #: apt-pkg/clean.cc:61 @@ -2375,44 +2457,44 @@ msgid "Cache has an incompatible versioning system" msgstr "Mae can y storfa system fersiwn anghyfaddas" #: apt-pkg/pkgcachegen.cc:117 -#, c-format -msgid "Error occured while processing %s (NewPackage)" +#, fuzzy, c-format +msgid "Error occurred while processing %s (NewPackage)" msgstr "Digwyddod gwall wrth brosesu %s (NewPackage)" #: apt-pkg/pkgcachegen.cc:129 -#, c-format -msgid "Error occured while processing %s (UsePackage1)" +#, fuzzy, c-format +msgid "Error occurred while processing %s (UsePackage1)" msgstr "Digwyddod gwall wrth brosesu %s (UsePackage1)" #: apt-pkg/pkgcachegen.cc:150 -#, c-format -msgid "Error occured while processing %s (UsePackage2)" +#, fuzzy, c-format +msgid "Error occurred while processing %s (UsePackage2)" msgstr "Digwyddod gwall wrth brosesu %s (UsePackage2)" #: apt-pkg/pkgcachegen.cc:154 -#, c-format -msgid "Error occured while processing %s (NewFileVer1)" +#, fuzzy, c-format +msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:184 -#, c-format -msgid "Error occured while processing %s (NewVersion1)" +#, fuzzy, c-format +msgid "Error occurred while processing %s (NewVersion1)" msgstr "Digwyddod gwall wrth brosesu %s (NewVersion1)" #: apt-pkg/pkgcachegen.cc:188 -#, c-format -msgid "Error occured while processing %s (UsePackage3)" +#, fuzzy, c-format +msgid "Error occurred while processing %s (UsePackage3)" msgstr "Digwyddod gwall wrth brosesu %s (UsePackage3)" #: apt-pkg/pkgcachegen.cc:192 -#, c-format -msgid "Error occured while processing %s (NewVersion2)" +#, fuzzy, c-format +msgid "Error occurred while processing %s (NewVersion2)" msgstr "Digwyddod gwall wrth brosesu %s (NewVersion2)" #: apt-pkg/pkgcachegen.cc:207 msgid "Wow, you exceeded the number of package names this APT is capable of." -msgstr "Jiw, rhagoroch chi'r nifer o enwau pecyn mae'r APT hwn yn gallu ei " -" drin." +msgstr "" +"Jiw, rhagoroch chi'r nifer o enwau pecyn mae'r APT hwn yn gallu ei drin." #: apt-pkg/pkgcachegen.cc:210 msgid "Wow, you exceeded the number of versions this APT is capable of." @@ -2420,16 +2502,17 @@ msgstr "Jiw, rhagoroch chi'r nifer o fersiynau mae'r APT hwn yn gallu ei drin." #: apt-pkg/pkgcachegen.cc:213 msgid "Wow, you exceeded the number of dependencies this APT is capable of." -msgstr "Jiw, rhagoroch chi'r nifer o ddibyniaethau mae'r APT hwn yn gallu ei drin." +msgstr "" +"Jiw, rhagoroch chi'r nifer o ddibyniaethau mae'r APT hwn yn gallu ei drin." #: apt-pkg/pkgcachegen.cc:241 -#, c-format -msgid "Error occured while processing %s (FindPkg)" +#, fuzzy, c-format +msgid "Error occurred while processing %s (FindPkg)" msgstr "Digwyddod gwall wrth brosesu %s (FindPkg)" #: apt-pkg/pkgcachegen.cc:254 -#, c-format -msgid "Error occured while processing %s (CollectFileProvides)" +#, fuzzy, c-format +msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Digwyddod gwall wrth brosesu %s (CollectFileProvides)" #: apt-pkg/pkgcachegen.cc:260 @@ -2455,12 +2538,12 @@ 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:205 apt-pkg/acquire-item.cc:817 +#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 msgid "MD5Sum mismatch" msgstr "Camgyfatebiaeth swm MD5" # FIXME: case -#: apt-pkg/acquire-item.cc:654 +#: apt-pkg/acquire-item.cc:714 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2469,7 +2552,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:689 +#: apt-pkg/acquire-item.cc:767 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2478,14 +2561,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:720 +#: apt-pkg/acquire-item.cc:803 #, 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:807 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "Camgyfatebiaeth maint" @@ -2494,10 +2577,104 @@ msgstr "Camgyfatebiaeth maint" msgid "Vendor block %s contains no fingerprint" msgstr "Nid yw'r bloc darparwr %s yn cynnwys ôl bys" -#: methods/rsh.cc:264 -msgid "File Not Found" -msgstr "Ni Chanfuwyd Y Ffeil" +#: apt-pkg/cdrom.cc:504 +#, c-format +msgid "" +"Using CD-ROM mount point %s\n" +"Mounting CD-ROM\n" +msgstr "" + +#: apt-pkg/cdrom.cc:513 apt-pkg/cdrom.cc:595 +msgid "Identifying.. " +msgstr "" -#: methods/rsh.cc:330 -msgid "Connection closed prematurely" -msgstr "Caewyd y cysylltiad yn gynnar" +#: apt-pkg/cdrom.cc:538 +#, c-format +msgid "Stored label: %s \n" +msgstr "" + +#: apt-pkg/cdrom.cc:558 +#, c-format +msgid "Using CD-ROM mount point %s\n" +msgstr "" + +#: apt-pkg/cdrom.cc:576 +msgid "Unmounting CD-ROM\n" +msgstr "" + +#: apt-pkg/cdrom.cc:580 +#, fuzzy +msgid "Waiting for disc...\n" +msgstr "Yn aros am benawdau" + +#. Mount the new CDROM +#: apt-pkg/cdrom.cc:588 +msgid "Mounting CD-ROM...\n" +msgstr "" + +#: apt-pkg/cdrom.cc:606 +msgid "Scanning disc for index files..\n" +msgstr "" + +#: apt-pkg/cdrom.cc:644 +#, c-format +msgid "Found %i package indexes, %i source indexes and %i signatures\n" +msgstr "" + +#: apt-pkg/cdrom.cc:701 +msgid "That is not a valid name, try again.\n" +msgstr "" + +#: apt-pkg/cdrom.cc:717 +#, c-format +msgid "" +"This disc is called: \n" +"'%s'\n" +msgstr "" + +#: apt-pkg/cdrom.cc:721 +#, fuzzy +msgid "Copying package lists..." +msgstr "Yn Darllen Rhestrau Pecynnau" + +#: apt-pkg/cdrom.cc:745 +#, fuzzy +msgid "Writing new source list\n" +msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s." + +#: apt-pkg/cdrom.cc:754 +msgid "Source list entries for this disc are:\n" +msgstr "" + +#: apt-pkg/cdrom.cc:788 +msgid "Unmounting CD-ROM..." +msgstr "" + +#: apt-pkg/indexcopy.cc:261 +#, c-format +msgid "Wrote %i records.\n" +msgstr "" + +#: apt-pkg/indexcopy.cc:263 +#, c-format +msgid "Wrote %i records with %i missing files.\n" +msgstr "" + +#: apt-pkg/indexcopy.cc:266 +#, c-format +msgid "Wrote %i records with %i mismatched files\n" +msgstr "" + +#: apt-pkg/indexcopy.cc:269 +#, c-format +msgid "Wrote %i records with %i missing files and %i mismatched files\n" +msgstr "" + +#~ msgid "Abort? [Y/n] " +#~ msgstr "Erthylu? [I/n] " + +#~ msgid "Write Error" +#~ msgstr "Gwall Ysgrifennu" + +#~ msgid "File Not Found" +#~ msgstr "Ni Chanfuwyd Y Ffeil" diff --git a/po/da.po b/po/da.po index feade5c60..44cf0337a 100644 --- a/po/da.po +++ b/po/da.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: apt-da\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-29 07:17+0200\n" -"PO-Revision-Date: 2005-02-10 20:50+0100\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" +"PO-Revision-Date: 2005-06-23 10:46+0200\n" "Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n" "Language-Team: Danish <dansk@klid.dk>\n" "MIME-Version: 1.0\n" @@ -44,7 +44,7 @@ msgstr " Rene virtuelle pakker: " #: cmdline/apt-cache.cc:274 msgid " Single virtual packages: " -msgstr " Enkelt-virtuelle pakker: " +msgstr " Enkelte virtuelle pakker: " #: cmdline/apt-cache.cc:275 msgid " Mixed virtual packages: " @@ -153,7 +153,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545 -#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s for %s %s oversat p %s %s\n" @@ -259,7 +259,7 @@ msgstr "" " shell - Skal-tilstand\n" " dump - Vis opstningen\n" "\n" -"Options:\n" +"Tilvalg:\n" " -h Denne hjlpetekst.\n" " -c=? Ls denne opstningsfil\n" " -o=? Angiv et opstningstilvalg. F.eks. -o dir::cache=/tmp\n" @@ -287,7 +287,7 @@ msgstr "" "apt-extracttemplates er et vrktj til at uddrage opstnings- og skabelon-" "oplysninger fra Debianpakker\n" "\n" -"Options:\n" +"Tilvalg:\n" " -h Denne hjlpetekst\n" " -t Angiv temp-mappe\n" " -c=? Ls denne opstningsfil\n" @@ -327,7 +327,6 @@ msgid "Error processing contents %s" msgstr "Fejl under behandling af indhold %s" #: ftparchive/apt-ftparchive.cc:551 -#, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -400,10 +399,10 @@ msgstr "" " -h Denne hjlpetekst\n" " --md5 Styr generering af MD5\n" " -s=? Kilde-tvangsfil\n" -" -q Stille (vis frre statusbeskeder)\n" +" -q Stille\n" " -d=? Vlg den valgfrie mellemlager-database\n" -" --no-delink Aktivr \"delinking\" fejlsporingstilstand\n" -" --contents Bestem generering af inholdsfil\n" +" --no-delink Aktivr \"delinking\"-fejlsporingstilstand\n" +" --contents Bestem generering af indholdsfil\n" " -c=? Ls denne opstningsfil\n" " -o=? St en opstnings-indstilling" @@ -600,7 +599,7 @@ msgstr "Kunne ikke udf #: ftparchive/multicompress.cc:363 msgid "decompressor" -msgstr "dekompressions-program" +msgstr "dekomprimerings-program" #: ftparchive/multicompress.cc:406 msgid "IO to subprocess/file failed" @@ -624,7 +623,7 @@ msgstr "Kunne ikke omd msgid "Y" msgstr "J" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 #, c-format msgid "Regex compilation error - %s" msgstr "Fejl ved tolkning af regulrt udtryk - %s" @@ -669,7 +668,7 @@ msgstr "F #: cmdline/apt-get.cc:399 msgid "The following packages will be REMOVED:" -msgstr "Flgende pakker vil blive FJERNET:" +msgstr "Flgende pakker vil blive AFINSTALLERET:" #: cmdline/apt-get.cc:421 msgid "The following packages have been kept back:" @@ -693,37 +692,38 @@ msgid "%s (due to %s) " msgstr "%s (grundet %s) " #: cmdline/apt-get.cc:544 +#, fuzzy msgid "" -"WARNING: The following essential packages will be removed\n" +"WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" -"ADVARSEL: Flgende essentielle pakker vil blive fjernet\n" +"ADVARSEL: Flgende essentielle pakker vil blive afinstalleret\n" "Dette br IKKE ske medmindre du er helt klar over, hvad du laver!" #: cmdline/apt-get.cc:575 #, c-format msgid "%lu upgraded, %lu newly installed, " -msgstr "%lu opgraderede, %lu netop installerede, " +msgstr "%lu opgraderes, %lu nyinstalleres, " #: cmdline/apt-get.cc:579 #, c-format msgid "%lu reinstalled, " -msgstr "%lu geninstallerede, " +msgstr "%lu geninstalleres, " #: cmdline/apt-get.cc:581 #, c-format msgid "%lu downgraded, " -msgstr "%lu nedgraderede, " +msgstr "%lu nedgraderes, " #: cmdline/apt-get.cc:583 #, c-format msgid "%lu to remove and %lu not upgraded.\n" -msgstr "%lu at fjerne og %lu ikke opgraderede.\n" +msgstr "%lu afinstalleres og %lu opgraderes ikke.\n" #: cmdline/apt-get.cc:587 #, c-format msgid "%lu not fully installed or removed.\n" -msgstr "%lu ikke fuldstndigt installerede eller fjernede.\n" +msgstr "%lu ikke fuldstndigt installerede eller afinstallerede.\n" #: cmdline/apt-get.cc:647 msgid "Correcting dependencies..." @@ -771,13 +771,13 @@ msgstr "Der er problemer og -y blev brugt uden --force-yes" #: cmdline/apt-get.cc:762 msgid "Packages need to be removed but remove is disabled." -msgstr "Pakker skal fjernes, men Remove er deaktiveret." +msgstr "Pakker skal afinstalleres, men Remove er deaktiveret." -#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802 +#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 msgid "Unable to lock the download directory" msgstr "Kunne ikke lse nedhentningsmappen" -#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061 +#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Listen med kilder kunne ikke lses." @@ -816,9 +816,9 @@ msgid "Yes, do as I say!" msgstr "Ja, gr som jeg siger!" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, c-format msgid "" -"You are about to do something potentially harmful\n" +"You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" " ?] " msgstr "" @@ -834,7 +834,7 @@ msgstr "Afbryder." msgid "Do you want to continue [Y/n]? " msgstr "Vil du fortstte [J/n]? " -#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959 +#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Kunne ikke hente %s %s\n" @@ -843,7 +843,7 @@ msgstr "Kunne ikke hente %s %s\n" msgid "Some files failed to download" msgstr "Nedhentningen af filer mislykkedes" -#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 msgid "Download complete and in download only mode" msgstr "Nedhentning afsluttet i 'hent-kun'-tilstand" @@ -882,7 +882,7 @@ msgstr "" #: cmdline/apt-get.cc:1054 #, c-format msgid "Package %s is not installed, so not removed\n" -msgstr "Pakken %s er ikke installeret, s den fjernes ikke\n" +msgstr "Pakken %s er ikke installeret, s den afinstalleres ikke\n" #: cmdline/apt-get.cc:1065 #, c-format @@ -946,7 +946,7 @@ msgstr "Valgte version %s (%s) af %s\n" msgid "The update command takes no arguments" msgstr "'update'-kommandoen benytter ingen parametre" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "Kunne ikke lse listemappen" @@ -962,21 +962,21 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "Intern fejl, AllUpgrade delagde noget" -#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498 +#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 #, c-format msgid "Couldn't find package %s" msgstr "Kunne ikke finde pakken %s" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Bemrk, vlger %s som regulrt udtryk '%s'\n" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1524 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Du kan muligvis rette det ved at kre 'apt-get -f install':" -#: cmdline/apt-get.cc:1518 +#: cmdline/apt-get.cc:1527 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -984,7 +984,7 @@ msgstr "" "Uopfyldte afhngigheder. Prv 'apt-get -f install' uden pakker (eller angiv " "en lsning)." -#: cmdline/apt-get.cc:1530 +#: cmdline/apt-get.cc:1539 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -995,7 +995,7 @@ msgstr "" "en umulig situation eller bruger den ustabile distribution, hvor enkelte\n" "pakker endnu ikke er lavet eller gjort tilgngelige." -#: cmdline/apt-get.cc:1538 +#: cmdline/apt-get.cc:1547 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1004,105 +1004,105 @@ msgstr "" "Siden du kan bad om en enkelt handling, kan pakken hjst sandsynligt slet\n" "ikke installeres og du br indsende en fejlrapport for denne pakke." -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "Flgende oplysninger kan hjlpe dig med at klare situationen:" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "delagte pakker" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "Flgende yderligere pakker vil blive installeret:" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "Foreslede pakker:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "Anbefalede pakker:" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "Beregner opgraderingen... " -#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99 +#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 msgid "Failed" msgstr "Mislykkedes" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "Frdig" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 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:1872 cmdline/apt-get.cc:2079 +#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 #, c-format msgid "Unable to find a source package for %s" msgstr "Kunne ikke finde kildetekstpakken for %s" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, 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:1924 +#: cmdline/apt-get.cc:1933 #, 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:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "%sB skal hentes fra kildetekst-arkiverne.\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "Henter kildetekst %s\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "Nogle arkiver kunne ikke hentes." -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, 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:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Udpakningskommandoen '%s' fejlede.\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "Opbygningskommandoen '%s' fejlede.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "Barneprocessen fejlede" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 msgid "Must specify at least one package to check builddeps for" msgstr "Skal angive mindst n pakke at tjekke opbygningsafhngigheder for" -#: cmdline/apt-get.cc:2084 +#: cmdline/apt-get.cc:2093 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Kunne ikke hente oplysninger om opbygningsafhngigheder for %s" -#: cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "%s har ingen opbygningsafhngigheder.\n" -#: cmdline/apt-get.cc:2156 +#: cmdline/apt-get.cc:2165 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1110,7 +1110,7 @@ msgid "" msgstr "" "%s-afhngigheden for %s kan ikke opfyldes, da pakken %s ikke blev fundet" -#: cmdline/apt-get.cc:2208 +#: cmdline/apt-get.cc:2217 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1119,32 +1119,32 @@ msgstr "" "%s-afhngigheden for %s kan ikke opfyldes, da ingen af de tilgngelige " "udgaver af pakken %s kan tilfredsstille versions-kravene" -#: cmdline/apt-get.cc:2243 +#: cmdline/apt-get.cc:2252 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Kunne ikke opfylde %s-afhngigheden for %s: Den installerede pakke %s er for " "ny" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Kunne ikke opfylde %s-afhngigheden for %s: %s" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Opbygningsafhngigheden for %s kunne ikke opfyldes." -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "Kunne ikke behandler opbygningsafhngighederne" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "Understttede moduler:" -#: cmdline/apt-get.cc:2359 +#: cmdline/apt-get.cc:2368 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1197,13 +1197,13 @@ msgstr "" " update - Hent nye lister over pakker\n" " upgrade - Udfr en opgradering\n" " install - Installr nye pakker (pakke er libc6, ikke libc6.deb)\n" -" remove - Fjern pakker\n" +" remove - Afinstallr pakker\n" " source - Hent kildetekstarkiver\n" " build-dep - St opbygningsafhngigheder op for kildetekstpakker\n" " dist-upgrade - Distributionsopgradering, se apt-get(8)\n" " dselect-upgrade - Flg valgene fra dselect\n" -" clean - Fjern hentede arkivfiler\n" -" autoclean - Fjern gamle hentede arkivfiler\n" +" clean - Slet hentede arkivfiler\n" +" autoclean - Slet gamle hentede arkivfiler\n" " check - Tjek at der ikke er uopfyldte afhngigheder\n" "\n" "Tilvalg:\n" @@ -1283,7 +1283,7 @@ msgstr "" "apt-sortpkgs er et simpelt vrktj til at sortere pakkefiler. Tilvalget -s\n" "bruges til at angive filens type.\n" "\n" -"Options:\n" +"Tilvalg:\n" " -h Denne hjlpetekst\n" " -s Benyt kildefils-sortering\n" " -c=? Ls denne opstningsfil\n" @@ -1367,7 +1367,7 @@ msgstr "Kunne ikke l #: apt-inst/filelist.cc:384 msgid "DropNode called on still linked node" -msgstr "DropNode kaldt med endnu-forbundet knude" +msgstr "DropNode kaldt med endnu forbundet knude" #: apt-inst/filelist.cc:416 msgid "Failed to locate the hash element!" @@ -1397,8 +1397,8 @@ msgid "Duplicate conf file %s/%s" msgstr "Dobbelt opstningsfil %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "Kunne ikke skrive filen %s" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1467,7 +1467,7 @@ msgstr "Kunne ikke finde %s" #: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 #, c-format msgid "Failed to remove %s" -msgstr "Kunne ikke fjerne %s" +msgstr "Kunne ikke slette %s" #: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 #, c-format @@ -1544,6 +1544,7 @@ msgid "Internal error adding a diversion" msgstr "Intern fejl under tilfjelse af omrokering" #: apt-inst/deb/dpkgdb.cc:383 +#, fuzzy msgid "The pkg cache must be initialized first" msgstr "pkg-mellemlageret skal initialiseres frst" @@ -1752,7 +1753,7 @@ msgstr "Tidsudl msgid "Unable to accept connection" msgstr "Kunne ikke acceptere forbindelse" -#: methods/ftp.cc:864 methods/http.cc:916 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem ved \"hashing\" af fil" @@ -1880,43 +1881,43 @@ msgstr "" msgid "Unknown date format" msgstr "Ukendt datoformat" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "Valg mislykkedes" -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "Tidsudlb p forbindelsen" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "Fejl ved skrivning af uddatafil" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "Fejl ved skrivning til fil" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "Fejl ved skrivning til filen" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "Fejl ved lsning fra serveren. Den fjerne ende lukkede forbindelsen" -#: methods/http.cc:834 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "Fejl ved lsning fra server" -#: methods/http.cc:1065 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "Ugyldige hoved-data" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "Forbindelsen mislykkedes" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "Intern fejl" @@ -2234,17 +2235,17 @@ msgstr "Ugyldig linje %lu i kildelisten %s (dist)" #: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" -msgstr "Ugyldig linje %lu i kildelisten %s (URI parse)" +msgstr "Ugyldig linje %lu i kildelisten %s (tolkning af URI)" #: apt-pkg/sourcelist.cc:98 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" -msgstr "Ugyldig linje %lu i kildelisten %s (absolute dist)" +msgstr "Ugyldig linje %lu i kildelisten %s (absolut dist)" #: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" -msgstr "Ugyldig linje %lu i kildelisten %s (dist parse)" +msgstr "Ugyldig linje %lu i kildelisten %s (tolkning af dist)" #: apt-pkg/sourcelist.cc:156 #, c-format @@ -2269,7 +2270,7 @@ msgstr "Typen '%s' er ukendt p #: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %u in source list %s (vendor id)" -msgstr "Ugyldig linje %u i kildelisten %s (vendor id)" +msgstr "Ugyldig linje %u i kildelisten %s (producent-id)" #: apt-pkg/packagemanager.cc:402 #, c-format @@ -2278,9 +2279,10 @@ 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 "" -"Krsel af denne installation krver midlertidig fjernelse af den essentielle " -"pakke %s grundet en afhngighedslkke. Det er ofte en drlig id, men hvis " -"du virkelig vil gre det, kan du aktivere valget 'APT::Force-LoopBreak'." +"Krsel af denne installation krver midlertidig afinstallation af den " +"essentielle pakke %s grundet en afhngighedslkke. Det er ofte en drlig " +"id, men hvis du virkelig vil gre det, kan du aktivere valget 'APT::Force-" +"LoopBreak'." #: apt-pkg/pkgrecords.cc:37 #, c-format @@ -2371,37 +2373,37 @@ msgid "Cache has an incompatible versioning system" msgstr "Mellemlageret benytter en inkompatibel versionsstyring" #: apt-pkg/pkgcachegen.cc:117 -#, c-format +#, fuzzy, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Der skete en fejl under behandlingen af %s (NewPackage)" #: apt-pkg/pkgcachegen.cc:129 -#, c-format +#, fuzzy, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Der skete en fejl under behandlingen af %s (UsePackage1)" #: apt-pkg/pkgcachegen.cc:150 -#, c-format +#, fuzzy, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Der skete en fejl under behandlingen af %s (UsePackage2)" #: apt-pkg/pkgcachegen.cc:154 -#, c-format +#, fuzzy, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Der skete en fejl under behandlingen af %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:184 -#, c-format +#, fuzzy, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Der skete en fejl under behandlingen af %s (NewVersion1)" #: apt-pkg/pkgcachegen.cc:188 -#, c-format +#, fuzzy, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Der skete en fejl under behandlingen af %s (UsePackage3)" #: apt-pkg/pkgcachegen.cc:192 -#, c-format +#, fuzzy, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Der skete en fejl under behandlingen af %s (NewVersion2)" @@ -2420,12 +2422,12 @@ msgstr "" "Hold da op! Du nede over det antal afhngigheder, denne APT kan hndtere." #: apt-pkg/pkgcachegen.cc:241 -#, c-format +#, fuzzy, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Der skete en fejl under behandlingen af %s (FindPkg)" #: apt-pkg/pkgcachegen.cc:254 -#, c-format +#, fuzzy, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Der skete en fejl under behandlingen af %s (CollectfileProvides)" @@ -2452,11 +2454,11 @@ msgstr "IO-fejl ved gemning af kilde-mellemlageret" msgid "rename failed, %s (%s -> %s)." msgstr "omdbning mislykkedes, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:894 +#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 msgid "MD5Sum mismatch" msgstr "MD5Sum stemmer ikke" -#: apt-pkg/acquire-item.cc:708 +#: apt-pkg/acquire-item.cc:714 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2465,7 +2467,7 @@ msgstr "" "Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er " "ndt til manuelt at reparere denne pakke. (grundet manglende arch)" -#: apt-pkg/acquire-item.cc:761 +#: apt-pkg/acquire-item.cc:767 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2474,13 +2476,13 @@ msgstr "" "Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er " "ndt til manuelt at reparere denne pakke." -#: apt-pkg/acquire-item.cc:797 +#: apt-pkg/acquire-item.cc:803 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Pakkeindeksfilerne er i stykker. Intet 'Filename:'-felt for pakken %s." -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "Strrelsen stemmer ikke" diff --git a/po/de.po b/po/de.po index d95c9b87e..e053fee1e 100644 --- a/po/de.po +++ b/po/de.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-29 07:17+0200\n" -"PO-Revision-Date: 2004-08-04 15:58 +0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" +"PO-Revision-Date: 2005-06-15 18:22+0200\n" "Last-Translator: Michael Piefel <piefel@debian.org>\n" "Language-Team: <de@li.org>\n" "MIME-Version: 1.0\n" @@ -148,7 +148,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545 -#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s für %s %s kompiliert am %s %s\n" @@ -304,7 +304,7 @@ msgstr "Kann debconf-Version nicht ermitteln. Ist debconf installiert?" #: ftparchive/apt-ftparchive.cc:163 ftparchive/apt-ftparchive.cc:337 msgid "Package extension list is too long" -msgstr "Paketerweiterungsliste is zu lang" +msgstr "Paketerweiterungsliste ist zu lang" #: ftparchive/apt-ftparchive.cc:165 ftparchive/apt-ftparchive.cc:179 #: ftparchive/apt-ftparchive.cc:202 ftparchive/apt-ftparchive.cc:252 @@ -315,7 +315,7 @@ msgstr "Fehler beim Verarbeiten von Verzeichnis %s" #: ftparchive/apt-ftparchive.cc:250 msgid "Source extension list is too long" -msgstr "Quellerweiterungsliste is zu lang" +msgstr "Quellerweiterungsliste ist zu lang" #: ftparchive/apt-ftparchive.cc:367 msgid "Error writing header to contents file" @@ -398,7 +398,7 @@ msgstr "" "Die Befehle »packages« und »source« sollten in der Wurzel des Baumes " "aufgerufen\n" "werden. BinaryPath sollte auf die Basis der rekursiven Suche zeigen und\n" -"overridefile sollte die Override-Flags enthalten. Pfadpräfix wird wird, so\n" +"overridefile sollte die Override-Flags enthalten. Pfadpräfix wird, so\n" "vorhanden, jedem Dateinamen vorangestellt. Beispielaufruf im Debian-Archiv:\n" " apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" " dists/potato/main/binary-i386/Packages\n" @@ -631,7 +631,7 @@ msgstr "Konnte %s nicht in %s umbenennen" msgid "Y" msgstr "J" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 #, c-format msgid "Regex compilation error - %s" msgstr "Fehler beim Kompilieren eines regulären Ausdrucks - %s" @@ -700,8 +700,9 @@ msgid "%s (due to %s) " msgstr "%s (wegen %s) " #: cmdline/apt-get.cc:544 +#, fuzzy msgid "" -"WARNING: The following essential packages will be removed\n" +"WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" "WARNUNG: Die folgenden essentiellen Pakete werden entfernt.\n" @@ -782,11 +783,11 @@ msgstr "Es gab Probleme und -y wurde ohne --force-yes verwendet" msgid "Packages need to be removed but remove is disabled." msgstr "Pakete müssen entfernt werden, aber Entfernen ist abgeschaltet." -#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802 +#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 msgid "Unable to lock the download directory" msgstr "Kann kein Lock für das Downloadverzeichnis erhalten." -#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061 +#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Die Liste der Quellen konnte nicht gelesen werden." @@ -825,9 +826,9 @@ msgid "Yes, do as I say!" msgstr "Ja, tu was ich sage!" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, c-format msgid "" -"You are about to do something potentially harmful\n" +"You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" " ?] " msgstr "" @@ -843,7 +844,7 @@ msgstr "Abbruch." msgid "Do you want to continue [Y/n]? " msgstr "Möchten Sie fortfahren [J/n]? " -#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959 +#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Konnte %s nicht holen %s\n" @@ -852,7 +853,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:977 cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 msgid "Download complete and in download only mode" msgstr "Herunterladen abgeschlossen und im Nur-Herunterladen-Modus" @@ -956,7 +957,7 @@ msgstr "Gewählte Version %s (%s) für %s\n" msgid "The update command takes no arguments" msgstr "Der Befehl »update« nimmt keine Argumente" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "Kann kein Lock auf das Listenverzeichnis bekommen" @@ -972,23 +973,23 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "Interner Fehler, AllUpgrade hat was kaputt gemacht" -#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498 +#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 #, c-format msgid "Couldn't find package %s" msgstr "Konnte Paket %s nicht finden" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, 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:1515 +#: cmdline/apt-get.cc:1524 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "Sie möchten wahrscheinlich »apt-get -f install« aufrufen, um dies zu " "korrigieren:" -#: cmdline/apt-get.cc:1518 +#: cmdline/apt-get.cc:1527 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -996,7 +997,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:1530 +#: cmdline/apt-get.cc:1539 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1008,7 +1009,7 @@ msgstr "" "instabile Distribution verwenden, einige erforderliche Pakete noch nicht\n" "kreiert oder aus Incoming herausbewegt wurden." -#: cmdline/apt-get.cc:1538 +#: cmdline/apt-get.cc:1547 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1019,110 +1020,110 @@ msgstr "" "dass das Paket einfach nicht installierbar ist und eine Fehlermeldung über\n" "dieses Paket erfolgen sollte." -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "" "Die folgenden Informationen helfen Ihnen vielleicht, die Situation zu lösen:" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "Kaputte Pakete" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "Die folgenden zusätzlichen Pakete werden installiert:" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "Vorgeschlagene Pakete:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "Empfohlene Pakete:" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "Berechne Upgrade..." -#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99 +#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 msgid "Failed" msgstr "Fehlgeschlagen" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "Fertig" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 msgid "Must specify at least one package to fetch source for" msgstr "" "Es muss mindesten ein Paket angegeben werden, dessen Quellen geholt werden " "sollen" -#: cmdline/apt-get.cc:1872 cmdline/apt-get.cc:2079 +#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 #, c-format msgid "Unable to find a source package for %s" msgstr "Kann Quellpaket für %s nicht finden" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, 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:1924 +#: cmdline/apt-get.cc:1933 #, 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:1927 +#: cmdline/apt-get.cc:1936 #, 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:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "Hole Quelle %s\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "Konnte einige Archive nicht holen." -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, 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:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Entpack-Befehl »%s« fehlgeschlagen.\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "Build-Befehl »%s« fehlgeschlagen.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "Kindprozess fehlgeschlagen" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 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:2084 +#: cmdline/apt-get.cc:2093 #, 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:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "%s hat keine Build-Dependencies.\n" -#: cmdline/apt-get.cc:2156 +#: cmdline/apt-get.cc:2165 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1131,7 +1132,7 @@ msgstr "" "%s Abhängigkeit für %s kann nicht befriedigt werden, da Paket %s nicht " "gefunden werden kann." -#: cmdline/apt-get.cc:2208 +#: cmdline/apt-get.cc:2217 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1140,32 +1141,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:2243 +#: cmdline/apt-get.cc:2252 #, 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:2268 +#: cmdline/apt-get.cc:2277 #, 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:2282 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Build-Abhängigkeit für %s konnte nicht erfüllt werden." -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "Verarbeitung der Build-Dependencies fehlgeschlagen" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "Unterstützte Module:" -#: cmdline/apt-get.cc:2359 +#: cmdline/apt-get.cc:2368 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1422,8 +1423,8 @@ msgid "Duplicate conf file %s/%s" msgstr "Doppelte Konfigurationsdatei %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "Konnte nicht in Datei %s schreiben" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1782,7 +1783,7 @@ msgstr "Datenverbindungsaufbau erlitt Zeitüberschreitung" msgid "Unable to accept connection" msgstr "Kann Verbindung nicht annehmen" -#: methods/ftp.cc:864 methods/http.cc:916 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Bei Bestimmung des Hashwertes einer Datei trat ein Problem auf" @@ -1910,45 +1911,45 @@ msgstr "Der http-Server unterstützt Dateiteilübertragung nur fehlerhaft." msgid "Unknown date format" msgstr "Unbekanntes Datumsformat" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "Auswahl fehlgeschlagen" -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "Verbindung erlitt Zeitüberschreitung" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "Fehler beim Schreiben einer Ausgabedatei" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "Fehler beim Schreiben einer Datei" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "Fehler beim Schreiben der Datei" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "" "Fehler beim Lesen vom Server: Das entfernte Ende hat die Verbindung " "geschlossen" -#: methods/http.cc:834 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "Fehler beim Lesen vom Server" -#: methods/http.cc:1065 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "Fehlerhafte Kopfzeilendaten" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "Verbindung fehlgeschlagen" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "Interner Fehler" @@ -1973,7 +1974,7 @@ msgstr "Auswahl %s nicht gefunden" #: apt-pkg/contrib/configuration.cc:395 #, c-format msgid "Unrecognized type abbreviation: '%c'" -msgstr "Nicht erkannte Typabkürzung: ‚%c‘" +msgstr "Nicht erkannte Typabkürzung: »%c«" #: apt-pkg/contrib/configuration.cc:453 #, c-format @@ -2070,7 +2071,7 @@ msgstr "Option %s erfordert ein Ganzzahl-Argument, nicht »%s«" #: apt-pkg/contrib/cmndline.cc:268 #, c-format msgid "Option '%s' is too long" -msgstr "Option ‚%s‘ ist zu lang" +msgstr "Option »%s« ist zu lang" #: apt-pkg/contrib/cmndline.cc:301 #, c-format @@ -2257,27 +2258,27 @@ msgstr "Kann Paketdatei %s nicht parsen (2)" #: apt-pkg/sourcelist.cc:87 #, c-format msgid "Malformed line %lu in source list %s (URI)" -msgstr "Missgestaltete Zeile %lu in Quelliste %s (»URI«)" +msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI«)" #: apt-pkg/sourcelist.cc:89 #, c-format msgid "Malformed line %lu in source list %s (dist)" -msgstr "Missgestaltete Zeile %lu in Quelliste %s (»dist«)" +msgstr "Missgestaltete Zeile %lu in Quellliste %s (»dist«)" #: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" -msgstr "Missgestaltete Zeile %lu in Quelliste %s (»URI parse«)" +msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI parse«)" #: apt-pkg/sourcelist.cc:98 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" -msgstr "Missgestaltete Zeile %lu in Quelliste %s (»absolute dist«)" +msgstr "Missgestaltete Zeile %lu in Quellliste %s (»absolute dist«)" #: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" -msgstr "Missgestaltete Zeile %lu in Quelliste %s (»dist parse«)" +msgstr "Missgestaltete Zeile %lu in Quellliste %s (»dist parse«)" #: apt-pkg/sourcelist.cc:156 #, c-format @@ -2287,22 +2288,22 @@ msgstr "%s wird geöffnet" #: apt-pkg/sourcelist.cc:170 #, c-format msgid "Line %u too long in source list %s." -msgstr "Zeile %u zu lang in der Quelliste %s." +msgstr "Zeile %u zu lang in der Quellliste %s." #: apt-pkg/sourcelist.cc:187 #, c-format msgid "Malformed line %u in source list %s (type)" -msgstr "Missgestaltete Zeile %u in Quelliste %s (»type«)" +msgstr "Missgestaltete Zeile %u in Quellliste %s (»type«)" #: apt-pkg/sourcelist.cc:191 #, c-format msgid "Type '%s' is not known on line %u in source list %s" -msgstr "Typ »%s« ist unbekannt in Zeile %u der Quelliste %s" +msgstr "Typ »%s« ist unbekannt in Zeile %u der Quellliste %s" #: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %u in source list %s (vendor id)" -msgstr "Missgestaltete Zeile %u in Quelliste %s (»vendor id«)" +msgstr "Missgestaltete Zeile %u in Quellliste %s (»vendor id«)" #: apt-pkg/packagemanager.cc:402 #, c-format @@ -2495,11 +2496,11 @@ 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:235 apt-pkg/acquire-item.cc:894 +#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 msgid "MD5Sum mismatch" msgstr "MD5-Summe stimmt nicht" -#: apt-pkg/acquire-item.cc:708 +#: apt-pkg/acquire-item.cc:714 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2508,7 +2509,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:761 +#: apt-pkg/acquire-item.cc:767 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2517,14 +2518,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:797 +#: apt-pkg/acquire-item.cc:803 #, 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:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "Größe stimmt nicht" @@ -2630,7 +2631,7 @@ msgstr "" "geschrieben.\n" #~ msgid "Unknown vendor ID '%s' in line %u of source list %s" -#~ msgstr "Unbekannte Herstellerkennung »%s« in Zeile %u der Quelliste %s" +#~ msgstr "Unbekannte Herstellerkennung »%s« in Zeile %u der Quellliste %s" #~ msgid "" #~ "Some broken packages were found while trying to process build-" diff --git a/po/el.po b/po/el.po index f331c279d..4a0cfe84d 100644 --- a/po/el.po +++ b/po/el.po @@ -16,14 +16,15 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_el\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-29 07:17+0200\n" -"PO-Revision-Date: 2005-02-20 15:01EEST\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" +"PO-Revision-Date: 2005-07-14 14:25EEST\n" "Last-Translator: Greek Translation Team <debian-l10n-greek@lists.debian." "org>\n" "Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"org>\n" "X-Generator: KBabel 1.9.1\n" #: cmdline/apt-cache.cc:135 @@ -160,7 +161,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545 -#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s για %s %s είναι μεταγλωττισμένο σε %s %s\n" @@ -336,7 +337,6 @@ msgid "Error processing contents %s" msgstr "Σφάλμα επεξεργασίας περιεχομένων του %s" #: ftparchive/apt-ftparchive.cc:551 -#, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -395,8 +395,7 @@ msgstr "" "για τη βεβιασμένη αλλαγή των πεδίων Priority (Προτεραιότητα) και Section\n" "(Τομέας).\n" "\n" -"Με τον ίδιο τρόπο, το apt-ftparchive παράγει αρχεία πηγών (Sources) από " -"μια\n" +"Με τον ίδιο τρόπο, το apt-ftparchive παράγει αρχεία πηγών (Sources) από μια\n" "ιεραρχία αρχείων .dsc. Η επιλογή --source-override μπορεί να χρησιμοποιηθεί\n" "για παράκαμψη των αρχείων πηγών src.\n" "\n" @@ -638,7 +637,7 @@ msgstr "Αποτυχία μετονομασίας του %s σε %s" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 #, c-format msgid "Regex compilation error - %s" msgstr "σφάλμα μεταγλωτισμου - %s" @@ -707,8 +706,9 @@ msgid "%s (due to %s) " msgstr "%s (λόγω του %s) " #: cmdline/apt-get.cc:544 +#, fuzzy msgid "" -"WARNING: The following essential packages will be removed\n" +"WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Τα ακόλουθα απαραίτητα πακέτα θα αφαιρεθούν\n" @@ -790,11 +790,11 @@ msgid "Packages need to be removed but remove is disabled." msgstr "" "Μερικά πακέτα πρέπει να αφαιρεθούν αλλά η Αφαίρεση είναι απενεργοποιημένη." -#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802 +#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 msgid "Unable to lock the download directory" msgstr "Αδύνατο το κλείδωμα του καταλόγου μεταφόρτωσης" -#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061 +#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Αδύνατη η ανάγνωση της λίστας πηγών." @@ -833,9 +833,9 @@ msgid "Yes, do as I say!" msgstr "Ναι, κανε ότι λέω!" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, c-format msgid "" -"You are about to do something potentially harmful\n" +"You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" " ?] " msgstr "" @@ -851,7 +851,7 @@ msgstr "Εγκατάλειψη." msgid "Do you want to continue [Y/n]? " msgstr "Θέλετε να συνεχίσετε [Ν/ο]; " -#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959 +#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Αποτυχία ανάκτησης του %s %s\n" @@ -860,7 +860,7 @@ msgstr "Αποτυχία ανάκτησης του %s %s\n" msgid "Some files failed to download" msgstr "Για μερικά αρχεία απέτυχε η μεταφόρτωση" -#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 msgid "Download complete and in download only mode" msgstr "Ολοκληρώθηκε η μεταφόρτωση μόνο" @@ -966,7 +966,7 @@ msgstr "Επιλέχθηκε η έκδοση %s (%s) για το%s\n" msgid "The update command takes no arguments" msgstr "Η εντολή update δεν παίρνει ορίσματα" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "Αδύνατο το κλείδωμα του καταλόγου" @@ -982,21 +982,21 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "Εσωτερικό Σφάλμα, Η διαδικασία αναβάθμισης χάλασε" -#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498 +#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 #, c-format msgid "Couldn't find package %s" msgstr "Αδύνατη η εύρεση του πακέτου %s" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Σημείωση, επιλέχτηκε το %s στη θέση του '%s'\n" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1524 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Aν τρέξετε 'apt-get f install' ίσως να διορθώσετε αυτά τα προβλήματα:" -#: cmdline/apt-get.cc:1518 +#: cmdline/apt-get.cc:1527 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1004,7 +1004,7 @@ msgstr "" "Ανεπίλυτες εξαρτήσεις. Δοκιμάστε 'apt-get -f install' χωρίς να ορίσετε " "πακέτο (ή καθορίστε μια λύση)." -#: cmdline/apt-get.cc:1530 +#: cmdline/apt-get.cc:1539 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1016,7 +1016,7 @@ msgstr "" "διανομή, ότι μερικά από τα πακέτα δεν έχουν ακόμα δημιουργηθεί ή έχουν\n" "μετακινηθεί από τα εισερχόμενα." -#: cmdline/apt-get.cc:1538 +#: cmdline/apt-get.cc:1547 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1026,108 +1026,108 @@ msgstr "" "το πακέτο αυτό δεν είναι εγκαταστάσιμο και θα πρέπει να κάνετε μια\n" "αναφορά σφάλματος για αυτό το πακέτο." -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "Οι ακόλουθες πληροφορίες ίσως βοηθήσουν στην επίλυση του προβλήματος:" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "Χαλασμένα πακέτα" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "Τα ακόλουθα επιπλέον πακέτα θα εγκατασταθούν:" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "Προτεινόμενα πακέτα:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "Συνιστώμενα πακέτα:" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "Υπολογισμός της αναβάθμισης... " -#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99 +#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 msgid "Failed" msgstr "Απέτυχε" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "Ετοιμο" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 msgid "Must specify at least one package to fetch source for" msgstr "" "Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για να μεταφορτώσετε τον " "κωδικάτου" -#: cmdline/apt-get.cc:1872 cmdline/apt-get.cc:2079 +#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 #, c-format msgid "Unable to find a source package for %s" msgstr "Αδυναμία εντοπισμού του κώδικά του πακέτου %s" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, c-format msgid "You don't have enough free space in %s" msgstr "Δεν διαθέτετε αρκετό ελεύθερο χώρο στο %s" -#: cmdline/apt-get.cc:1924 +#: cmdline/apt-get.cc:1933 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Χρειάζεται να μεταφορτωθούν %sB/%sB πηγαίου κώδικα.\n" -#: cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Χρειάζεται να μεταφορτωθούν %sB πηγαίου κώδικα.\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "Μεταφόρτωση Κωδικα %s\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "Αποτυχία μεταφόρτωσης μερικών αρχειοθηκών." -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Παράκαμψη της αποσυμπίεσης ήδη μεταφορτωμένου κώδικα στο %s\n" -#: cmdline/apt-get.cc:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Απέτυχε η εντολή αποσυμπίεσης %s\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "Απέτυχε η εντολή χτισίματος %s.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "Η απογονική διεργασία απέτυχε" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 msgid "Must specify at least one package to check builddeps for" msgstr "" "Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για έλεγχο των εξαρτήσεων του" -#: cmdline/apt-get.cc:2084 +#: cmdline/apt-get.cc:2093 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Αδύνατη η εύρεση πληροφοριών χτισίματος για το %s" -#: cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "το %s δεν έχει εξαρτήσεις χτισίματος.\n" -#: cmdline/apt-get.cc:2156 +#: cmdline/apt-get.cc:2165 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1135,7 +1135,7 @@ msgid "" msgstr "" "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το πακέτο %s δεν βρέθηκε" -#: cmdline/apt-get.cc:2208 +#: cmdline/apt-get.cc:2217 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1144,32 +1144,32 @@ msgstr "" "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή δεν υπάρχουν διαθέσιμες " "εκδόσεις του πακέτου %s που να ικανοποιούν τις απαιτήσεις έκδοσης" -#: cmdline/apt-get.cc:2243 +#: cmdline/apt-get.cc:2252 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Αποτυχία ικανοποίησης %s εξαρτήσεων για το %s: Το εγκατεστημένο πακέτο %s " "είναι νεώτερο" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Αποτυχία ικανοποίησης %s εξάρτησης για το %s: %s" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Οι εξαρτήσεις χτισίματος για το %s δεν ικανοποιούνται." -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "Αποτυχία επεξεργασίας εξαρτήσεων χτισίματος" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "Υποστηριζόμενοι Οδηγοί:" -#: cmdline/apt-get.cc:2359 +#: cmdline/apt-get.cc:2368 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1422,8 +1422,8 @@ msgid "Duplicate conf file %s/%s" msgstr "Διπλό αρχείο ρυθμίσεων %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "Αποτυχία εγγραφής στο αρχείο %s" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1569,6 +1569,7 @@ msgid "Internal error adding a diversion" msgstr "Εσωτερικό Σφάλμα στην προσθήκη μιας παράκαμψης" #: apt-inst/deb/dpkgdb.cc:383 +#, fuzzy msgid "The pkg cache must be initialized first" msgstr "Η cache πακέτων πρέπει να αρχικοποιηθεί πρώτα" @@ -1776,7 +1777,7 @@ msgstr "Λήξη χρόνου σύνδεσης στην υποδοχή δεδο msgid "Unable to accept connection" msgstr "Αδύνατη η αποδοχή συνδέσεων" -#: methods/ftp.cc:864 methods/http.cc:916 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Πρόβλημα κατά το hashing του αρχείου" @@ -1903,44 +1904,44 @@ msgstr "Ο διακομιστής http δεν υποστηρίζει πλήρω msgid "Unknown date format" msgstr "Άγνωστη μορφή ημερομηνίας" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "Η επιλογή απέτυχε" -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "Λήξη χρόνου σύνδεσης" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "Σφάλμα στην εγγραφή στο αρχείο εξόδου" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "Σφάλμα στην εγγραφή στο αρχείο" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "Σφάλμα στην εγγραφή στο αρχείο" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "" "Σφάλμα στην ανάγνωση από το διακομιστή, το άλλο άκρο έκλεισε τη σύνδεση" -#: methods/http.cc:834 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "Σφάλμα στην ανάγνωση από το διακομιστή" -#: methods/http.cc:1065 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "Ελαττωματικά δεδομένα επικεφαλίδας" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "Η σύνδεση απέτυχε" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "Εσωτερικό Σφάλμα" @@ -2404,37 +2405,37 @@ msgid "Cache has an incompatible versioning system" msgstr "Η cache έχει ασύμβατο σύστημα απόδοσης έκδοσης" #: apt-pkg/pkgcachegen.cc:117 -#, c-format +#, fuzzy, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Σφάλμα κατά την επεξεργασία του %s (NewPackage)" #: apt-pkg/pkgcachegen.cc:129 -#, c-format +#, fuzzy, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Σφάλμα κατά την επεξεργασία του %s (UsePackage1)" #: apt-pkg/pkgcachegen.cc:150 -#, c-format +#, fuzzy, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Σφάλμα κατά την επεξεργασία του %s (UsePackage2)" #: apt-pkg/pkgcachegen.cc:154 -#, c-format +#, fuzzy, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Σφάλμα κατά την επεξεργασία του %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:184 -#, c-format +#, fuzzy, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Σφάλμα κατά την επεξεργασία του %s (NewVersion1)" #: apt-pkg/pkgcachegen.cc:188 -#, c-format +#, fuzzy, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Σφάλμα κατά την επεξεργασία του %s (UsePackage3)" #: apt-pkg/pkgcachegen.cc:192 -#, c-format +#, fuzzy, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Σφάλμα κατά την επεξεργασία του %s (NewVersion2)" @@ -2454,12 +2455,12 @@ msgstr "" "Εκπληκτικό, υπερβήκατε τον αριθμό των εξαρτήσεων που υποστηρίζει το APT." #: apt-pkg/pkgcachegen.cc:241 -#, c-format +#, fuzzy, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Σφάλμα κατά την επεξεργασία του %s (FindPkg)" #: apt-pkg/pkgcachegen.cc:254 -#, c-format +#, fuzzy, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Σφάλμα κατά την επεξεργασία του %s (CollectFileProvides)" @@ -2486,11 +2487,11 @@ msgstr "Σφάλμα IO κατά την αποθήκευση της cache πηγ msgid "rename failed, %s (%s -> %s)." msgstr "απέτυχε η μετονομασία, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:894 +#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 msgid "MD5Sum mismatch" msgstr "Ανόμοιο MD5Sum" -#: apt-pkg/acquire-item.cc:708 +#: apt-pkg/acquire-item.cc:714 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2499,7 +2500,7 @@ msgstr "" "Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι " "χρειάζεται να διορθώσετε χειροκίνητα το πακέτο. (λόγω χαμένου αρχείου)" -#: apt-pkg/acquire-item.cc:761 +#: apt-pkg/acquire-item.cc:767 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2508,7 +2509,7 @@ msgstr "" "Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι " "χρειάζεται να διορθώσετε χειροκίνητα το πακέτο." -#: apt-pkg/acquire-item.cc:797 +#: apt-pkg/acquire-item.cc:803 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2516,7 +2517,7 @@ msgstr "" "Κατεστραμμένα αρχεία ευρετηρίου πακέτων. Δεν υπάρχει πεδίο Filename: στο " "πακέτο %s." -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "Ανόμοιο μέγεθος" diff --git a/po/en_GB.po b/po/en_GB.po index e374f13d2..574a296d3 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" "PO-Revision-Date: 2002-11-10 20:56+0100\n" "Last-Translator: Michael Piefel <piefel@debian.org>\n" "Language-Team: en_GB <en@li.org>\n" @@ -147,7 +147,7 @@ msgstr "" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545 -#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "" @@ -562,7 +562,7 @@ msgstr "" msgid "Y" msgstr "" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 #, c-format msgid "Regex compilation error - %s" msgstr "" @@ -632,7 +632,7 @@ msgstr "" #: cmdline/apt-get.cc:544 msgid "" -"WARNING: The following essential packages will be removed\n" +"WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" @@ -709,11 +709,11 @@ msgstr "" msgid "Packages need to be removed but remove is disabled." msgstr "" -#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802 +#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 msgid "Unable to lock the download directory" msgstr "" -#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061 +#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "" @@ -752,9 +752,9 @@ msgid "Yes, do as I say!" msgstr "" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, c-format msgid "" -"You are about to do something potentially harmful\n" +"You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" " ?] " msgstr "" @@ -770,7 +770,7 @@ msgstr "" msgid "Do you want to continue [Y/n]? " msgstr "" -#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959 +#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" @@ -779,7 +779,7 @@ msgstr "" msgid "Some files failed to download" msgstr "" -#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 msgid "Download complete and in download only mode" msgstr "" @@ -875,7 +875,7 @@ msgstr "" msgid "The update command takes no arguments" msgstr "" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "" @@ -889,21 +889,21 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498 +#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 #, c-format msgid "Couldn't find package %s" msgstr "" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Note, selecting %s for regex ‘%s’\n" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1524 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "You might want to run ‘apt-get -f install’ to correct these:" -#: cmdline/apt-get.cc:1518 +#: cmdline/apt-get.cc:1527 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -911,7 +911,7 @@ msgstr "" "Unmet dependencies. Try ‘apt-get -f install’ with no packages (or specify a " "solution)." -#: cmdline/apt-get.cc:1530 +#: cmdline/apt-get.cc:1539 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -919,149 +919,149 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1538 +#: cmdline/apt-get.cc:1547 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" "that package should be filed." msgstr "" -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "" -#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99 +#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 msgid "Failed" msgstr "" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:1872 cmdline/apt-get.cc:2079 +#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, c-format msgid "You don't have enough free space in %s" msgstr "" -#: cmdline/apt-get.cc:1924 +#: cmdline/apt-get.cc:1933 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Unpack command ‘%s’ failed.\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "Build command ‘%s’ failed.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2084 +#: cmdline/apt-get.cc:2093 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2156 +#: cmdline/apt-get.cc:2165 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2208 +#: cmdline/apt-get.cc:2217 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:2243 +#: cmdline/apt-get.cc:2252 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:2359 +#: cmdline/apt-get.cc:2368 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1261,9 +1261,9 @@ msgid "Duplicate conf file %s/%s" msgstr "" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" -msgstr "" +#, fuzzy, c-format +msgid "Failed to write file %s" +msgstr "Could not resolve ‘%s’" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 #, c-format @@ -1611,7 +1611,7 @@ msgstr "" msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:864 methods/http.cc:916 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" @@ -1738,43 +1738,43 @@ msgstr "" msgid "Unknown date format" msgstr "" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "" -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:834 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "" -#: methods/http.cc:1065 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "" @@ -2301,31 +2301,31 @@ msgstr "" msgid "rename failed, %s (%s -> %s)." msgstr "" -#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:894 +#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 msgid "MD5Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:708 +#: apt-pkg/acquire-item.cc:714 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -#: apt-pkg/acquire-item.cc:761 +#: apt-pkg/acquire-item.cc:767 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" -#: apt-pkg/acquire-item.cc:797 +#: apt-pkg/acquire-item.cc:803 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "" diff --git a/po/es.po b/po/es.po index 297aa64a3..e046e15c2 100644 --- a/po/es.po +++ b/po/es.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.24\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" "PO-Revision-Date: 2005-02-08 20:36+0100\n" "Last-Translator: Rubn Porras Campo <nahoo@inicia.es>\n" "Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n" @@ -151,7 +151,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545 -#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s para %s %s compilado en %s %s\n" @@ -631,7 +631,7 @@ msgstr "Fall msgid "Y" msgstr "S" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 #, c-format msgid "Regex compilation error - %s" msgstr "Error de compilacin de expresiones regulares - %s" @@ -700,8 +700,9 @@ msgid "%s (due to %s) " msgstr "%s (por %s) " #: cmdline/apt-get.cc:544 +#, fuzzy msgid "" -"WARNING: The following essential packages will be removed\n" +"WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" "AVISO: Se van a eliminar los siguientes paquetes esenciales\n" @@ -780,11 +781,11 @@ msgstr "Hay problemas y se utiliz msgid "Packages need to be removed but remove is disabled." msgstr "Los paquetes necesitan eliminarse pero Remove est deshabilitado." -#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802 +#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 msgid "Unable to lock the download directory" msgstr "No se puede bloquear el directorio de descarga" -#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061 +#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "No se pudieron leer las listas de fuentes." @@ -824,9 +825,9 @@ msgid "Yes, do as I say!" msgstr "S, haga lo que le digo!" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, c-format msgid "" -"You are about to do something potentially harmful\n" +"You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" " ?] " msgstr "" @@ -842,7 +843,7 @@ msgstr "Abortado." msgid "Do you want to continue [Y/n]? " msgstr "Desea continuar [S/n]? " -#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959 +#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Imposible obtener %s %s\n" @@ -851,7 +852,7 @@ msgstr "Imposible obtener %s %s\n" msgid "Some files failed to download" msgstr "Algunos archivos no pudieron descargarse" -#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 msgid "Download complete and in download only mode" msgstr "Descarga completa y en modo de slo descarga" @@ -952,7 +953,7 @@ msgstr "Versi msgid "The update command takes no arguments" msgstr "El comando de actualizacin no toma argumentos" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "No se pudo bloquear el directorio de listas" @@ -968,21 +969,21 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "Error Interno, AllUpgrade rompi cosas" -#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498 +#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 #, c-format msgid "Couldn't find package %s" msgstr "No se pudo encontrar el paquete %s" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Nota, seleccionando %s para la expresin regular '%s'\n" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1524 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Tal vez quiera ejecutar `apt-get -f install' para corregirlo:" -#: cmdline/apt-get.cc:1518 +#: cmdline/apt-get.cc:1527 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -990,7 +991,7 @@ msgstr "" "Dependencias incumplidas. Intente 'apt-get -f install' sin paquetes (o " "especifique una solucin)." -#: cmdline/apt-get.cc:1530 +#: cmdline/apt-get.cc:1539 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1002,7 +1003,7 @@ msgstr "" "inestable, que algunos paquetes necesarios no han sido creados o han\n" "sido movidos fuera de Incoming." -#: cmdline/apt-get.cc:1538 +#: cmdline/apt-get.cc:1547 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1012,107 +1013,107 @@ msgstr "" "paquete simplemente no sea instalable y debera de rellenar un informe de\n" "error contra ese paquete." -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "La siguiente informacin puede ayudar a resolver la situacin:" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "Paquetes rotos" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "Se instalarn los siguientes paquetes extras:" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "Paquetes sugeridos:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "Paquetes recomendados" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "Calculando la actualizacin... " -#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99 +#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 msgid "Failed" msgstr "Fall" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "Listo" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 msgid "Must specify at least one package to fetch source for" msgstr "Debe especificar al menos un paquete para obtener su cdigo fuente" -#: cmdline/apt-get.cc:1872 cmdline/apt-get.cc:2079 +#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 #, c-format msgid "Unable to find a source package for %s" msgstr "No se pudo encontrar un paquete de fuentes para %s" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, c-format msgid "You don't have enough free space in %s" msgstr "No tiene suficiente espacio libre en %s" -#: cmdline/apt-get.cc:1924 +#: cmdline/apt-get.cc:1933 #, 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:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Necesito descargar %sB de archivos fuente.\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "Fuente obtenida %s\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "No se pudieron obtener algunos archivos." -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, 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:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Fall la orden de desempaquetamiento '%s'.\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "Fall la orden de construccin '%s'.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "Fall el proceso hijo" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 msgid "Must specify at least one package to check builddeps for" msgstr "" "Debe especificar al menos un paquete para verificar sus\n" "dependencias de construccin" -#: cmdline/apt-get.cc:2084 +#: cmdline/apt-get.cc:2093 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "No se pudo obtener informacin de dependencias de construccin para %s" -#: cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "%s no tiene dependencias de construccin.\n" -#: cmdline/apt-get.cc:2156 +#: cmdline/apt-get.cc:2165 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1121,7 +1122,7 @@ msgstr "" "La dependencia %s en %s no puede satisfacerse porque no se puede \n" "encontrar el paquete %s" -#: cmdline/apt-get.cc:2208 +#: cmdline/apt-get.cc:2217 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1130,32 +1131,32 @@ msgstr "" "La dependencia %s en %s no puede satisfacerse porque ninguna versin\n" "disponible del paquete %s satisface los requisitos de versin" -#: cmdline/apt-get.cc:2243 +#: cmdline/apt-get.cc:2252 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "No se pudo satisfacer la dependencia %s para %s: El paquete instalado %s es " "demasiado nuevo" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2277 #, 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:2282 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "No se pudieron satisfacer las dependencias de construccin de %s." -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "No se pudieron procesar las dependencias de construccin" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "Mdulos soportados:" -#: cmdline/apt-get.cc:2359 +#: cmdline/apt-get.cc:2368 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1412,8 +1413,8 @@ msgid "Duplicate conf file %s/%s" msgstr "Archivo de configuracin duplicado %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "Fall el cierre del archivo %s" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1767,7 +1768,7 @@ msgstr "Expir msgid "Unable to accept connection" msgstr "No pude aceptar la conexin" -#: methods/ftp.cc:864 methods/http.cc:916 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Hay problemas enlazando fichero" @@ -1894,43 +1895,43 @@ msgstr " msgid "Unknown date format" msgstr "Formato de fecha desconocido" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "Fall la seleccin" -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "Expir la conexin" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "Error escribiendo al archivo de salida" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "Error escribiendo a archivo" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "Error escribiendo al archivo" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "Error leyendo del servidor, el lado remoto cerr la conexin." -#: methods/http.cc:834 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "Error leyendo del servidor" -#: methods/http.cc:1065 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "Mala cabecera Data" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "Fallo la conexin" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "Error interno" @@ -2479,11 +2480,11 @@ msgstr "Error de E/S guardando cach msgid "rename failed, %s (%s -> %s)." msgstr "fall el cambio de nombre, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:894 +#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 msgid "MD5Sum mismatch" msgstr "La suma MD5 difiere" -#: apt-pkg/acquire-item.cc:708 +#: apt-pkg/acquire-item.cc:714 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2493,7 +2494,7 @@ msgstr "" "que necesita arreglar manualmente este paquete (debido a que falta una " "arquitectura)" -#: apt-pkg/acquire-item.cc:761 +#: apt-pkg/acquire-item.cc:767 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2502,7 +2503,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:797 +#: apt-pkg/acquire-item.cc:803 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2510,7 +2511,7 @@ msgstr "" "Los archivos de ndice de paquetes estn corrompidos. El campo 'Filename:' " "no existe para para el paquete %s." -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "El tamao difiere" diff --git a/po/eu.po b/po/eu.po index fec23bfe5..590e916f8 100644 --- a/po/eu.po +++ b/po/eu.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-eu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" "PO-Revision-Date: 2005-04-20 20:05+0200\n" "Last-Translator: Hizkuntza Politikarako Sailburuordetza <hizkpol@ej-gv.es>\n" "Language-Team: Basque <itzulpena@euskalgnu.org>\n" @@ -152,7 +152,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545 -#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s (%s %s) konpilatua: %s %s\n" @@ -620,7 +620,7 @@ msgstr "Huts egin du %s izenaren ordez %s ipintzean" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 #, c-format msgid "Regex compilation error - %s" msgstr "Adierazpen erregularren konpilazio-errorea - %s" @@ -689,8 +689,9 @@ msgid "%s (due to %s) " msgstr "%s (arrazoia: %s) " #: cmdline/apt-get.cc:544 +#, fuzzy msgid "" -"WARNING: The following essential packages will be removed\n" +"WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" "KONTUZ: Ondorengo funtsezko paketeak kendu egingo dira\n" @@ -769,11 +770,11 @@ msgstr "Arazoak daude, eta -y erabili da --force-yes gabe" msgid "Packages need to be removed but remove is disabled." msgstr "Paketeak ezabatu beharra dute bain Ezabatzea ezgaiturik dago." -#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802 +#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 msgid "Unable to lock the download directory" msgstr "Ezin da deskarga-direktorioa blokeatu" -#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061 +#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Ezin izan da iturburu-zerrenda irakurri." @@ -812,9 +813,9 @@ msgid "Yes, do as I say!" msgstr "Bai, egin esandakoa!" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, c-format msgid "" -"You are about to do something potentially harmful\n" +"You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" " ?] " msgstr "" @@ -830,7 +831,7 @@ msgstr "Abortatu." msgid "Do you want to continue [Y/n]? " msgstr "Aurrera jarraitu nahi al duzu [B/e]? " -#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959 +#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Ezin da lortu %s %s\n" @@ -839,7 +840,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:977 cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 msgid "Download complete and in download only mode" msgstr "Deskarga amaituta eta deskarga soileko moduan" @@ -940,7 +941,7 @@ msgstr "Hautatutako bertsioa: %s (%s) -- %s\n" msgid "The update command takes no arguments" msgstr "Eguneratzeko komandoak ez du argumenturik hartzen" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "Ezin da zerrenda-direktorioa blokeatu" @@ -956,21 +957,21 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "Barne Errorea, AllUpgade-k zerbait apurtu du" -#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498 +#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 #, c-format msgid "Couldn't find package %s" msgstr "Ezin izan da %s paketea aurkitu" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Oharra: %s hautatzen '%s' adierazpen erregularrarentzat\n" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1524 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Beharbada `apt-get -f install' exekutatu nahiko duzu hauek zuzentzeko:" -#: cmdline/apt-get.cc:1518 +#: cmdline/apt-get.cc:1527 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -978,7 +979,7 @@ msgstr "" "Bete gabeko mendekotasunak. Probatu 'apt-get -f install' paketerik gabe (edo " "zehaztu konponbide bat)." -#: cmdline/apt-get.cc:1530 +#: cmdline/apt-get.cc:1539 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -990,7 +991,7 @@ msgstr "" "beharrezko pakete batzuk ez ziren sortuko oraindik, edo \n" "Sarrerakoetan (Incoming) egoten jarraituko dute." -#: cmdline/apt-get.cc:1538 +#: cmdline/apt-get.cc:1547 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -999,107 +1000,107 @@ 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:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "Informazio honek arazoa konpontzen lagun dezake:" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "Hautsitako paketeak" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "Ondorengo pakete gehigarriak instalatuko dira:" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "Iradokitako paketeak:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "Gomendatutako paketeak:" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "Berriketak kalkulatzen... " -#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99 +#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 msgid "Failed" msgstr "Huts egin du" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "Eginda" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 msgid "Must specify at least one package to fetch source for" msgstr "Gutxienez pakete bat zehaztu behar duzu iturburua lortzeko" -#: cmdline/apt-get.cc:1872 cmdline/apt-get.cc:2079 +#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 #, c-format msgid "Unable to find a source package for %s" msgstr "Ezin da iturburu-paketerik aurkitu %s(r)entzat" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, 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:1924 +#: cmdline/apt-get.cc:1933 #, 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:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Iturburu-artxiboetako %sB eskuratu behar dira.\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "Eskuratu %s iturubura\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "Huts egin du zenbat artxibo lortzean." -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, 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:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Deskonprimitzeko '%s' komandoak huts egin du.\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "Eraikitzeko '%s' komandoak huts egin du.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "Prozesu umeak huts egin du" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 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:2084 +#: cmdline/apt-get.cc:2093 #, 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:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "%s: ez du eraikitze-mendekotasunik.\n" -#: cmdline/apt-get.cc:2156 +#: cmdline/apt-get.cc:2165 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1107,7 +1108,7 @@ msgid "" msgstr "" "%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu" -#: cmdline/apt-get.cc:2208 +#: cmdline/apt-get.cc:2217 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1116,32 +1117,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:2243 +#: cmdline/apt-get.cc:2252 #, 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:2268 +#: cmdline/apt-get.cc:2277 #, 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:2282 +#: cmdline/apt-get.cc:2291 #, 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:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "Huts egin du eraikitze-mendekotasunak prozesatzean" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "Onartutako Moduluak:" -#: cmdline/apt-get.cc:2359 +#: cmdline/apt-get.cc:2368 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1391,8 +1392,8 @@ msgid "Duplicate conf file %s/%s" msgstr "Konfigurazio-fitxategi bikoiztua: %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "Ezin izan da %s fitxategian idatzi" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1749,7 +1750,7 @@ msgstr "Datu-socket konexioak denbora-muga gainditu du" msgid "Unable to accept connection" msgstr "Ezin da konexioa onartu" -#: methods/ftp.cc:864 methods/http.cc:916 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Arazoa fitxategiaren hash egitean" @@ -1877,43 +1878,43 @@ msgstr "http zerbitzariak barruti onarpena apurturik du" msgid "Unknown date format" msgstr "Datu-formatu ezezaguna" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "Hautapenak huts egin du" -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "Konexioaren denbora-muga gainditu da" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "Errorea irteerako fitxategian idaztean" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "Errorea fitxategian idaztean" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "Errorea fitxategian idaztean" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "Errorea zerbitzaritik irakurtzen Urrunetik amaitutako konexio itxiera" -#: methods/http.cc:834 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "Errorea zerbitzaritik irakurtzean" -#: methods/http.cc:1065 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "Goiburu data gaizki dago" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "Konexioak huts egin du" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "Barne-errorea" diff --git a/po/fi.po b/po/fi.po index 3436485a9..04cc6473c 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: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" "PO-Revision-Date: 2005-02-15 14:09+0200\n" "Last-Translator: Tapio Lehtonen <tale@debian.org>\n" "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n" @@ -150,7 +150,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545 -#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s laitealustalle %s %s käännöksen päiväys %s %s\n" @@ -623,7 +623,7 @@ msgstr "Nimen muuttaminen %s -> %s ei onnistunut" msgid "Y" msgstr "K" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 #, c-format msgid "Regex compilation error - %s" msgstr "Käännösvirhe lausekkeessa - %s" @@ -692,8 +692,9 @@ msgid "%s (due to %s) " msgstr "%s (syynä %s) " #: cmdline/apt-get.cc:544 +#, fuzzy msgid "" -"WARNING: The following essential packages will be removed\n" +"WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" "VAROITUS: Seuraavat välttämättömät paketit on merkitty poistettaviksi\n" @@ -772,11 +773,11 @@ msgstr "Oli pulmia ja -y käytettiin ilman valitsinta --force-yes" msgid "Packages need to be removed but remove is disabled." msgstr "Paketteja pitäisi poistaa mutta Remove ei ole käytössä." -#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802 +#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 msgid "Unable to lock the download directory" msgstr "Noutokansiota ei saatu lukittua" -#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061 +#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Lähteiden luetteloa ei pystynyt lukemaan." @@ -816,9 +817,9 @@ msgid "Yes, do as I say!" msgstr "Kyllä, tee kuten käsketään!" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, c-format msgid "" -"You are about to do something potentially harmful\n" +"You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" " ?] " msgstr "" @@ -834,7 +835,7 @@ msgstr "Keskeytä." msgid "Do you want to continue [Y/n]? " msgstr "Haluatko jatkaa [K/e]? " -#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959 +#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Tiedoston %s nouto ei onnistunut %s\n" @@ -843,7 +844,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:977 cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 msgid "Download complete and in download only mode" msgstr "Nouto on valmis ja määrätty vain nouto" @@ -944,7 +945,7 @@ msgstr "Valittiin versio %s (%s) paketille %s\n" msgid "The update command takes no arguments" msgstr "Komento update ei käytä parametreja" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "Luettelokansiota ei voitu lukita" @@ -960,21 +961,21 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "Sisäinen virhe, AllUpgrade rikkoi jotain" -#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498 +#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 #, c-format msgid "Couldn't find package %s" msgstr "Pakettia %s ei löytynyt" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Huomautus, valitaan %s lausekkeella \"%s\"\n" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1524 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Saatat haluta suorittaa \"apt-get -f install\" korjaamaan nämä:" -#: cmdline/apt-get.cc:1518 +#: cmdline/apt-get.cc:1527 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -982,7 +983,7 @@ msgstr "" "Kaikkia riippuvuuksia ei ole tyydytetty. Kokeile \"apt-get -f install\" " "ilmanpaketteja (tai ratkaise itse)." -#: cmdline/apt-get.cc:1530 +#: cmdline/apt-get.cc:1539 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -993,7 +994,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:1538 +#: cmdline/apt-get.cc:1547 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1003,106 +1004,106 @@ msgstr "" "paketti ei lainkaan ole asennettavissa ja olisi tehtävä vikailmoitus\n" "tuosta paketista." -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "Seuraavista tiedoista voi olla hyötyä selvitettäessä tilannetta:" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "Rikkinäiset paketit" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "Seuraavat ylimääräiset paketit on merkitty asennettaviksi:" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "Ehdotetut paketit:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "Suositellut paketit:" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "Käsitellään päivitystä ... " -#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99 +#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 msgid "Failed" msgstr "Ei onnistunut" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "Valmis" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 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:1872 cmdline/apt-get.cc:2079 +#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 #, c-format msgid "Unable to find a source package for %s" msgstr "Paketin %s lähdekoodipakettia ei löytynyt" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, 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:1924 +#: cmdline/apt-get.cc:1933 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "On noudettava %st/%st lähdekoodiarkistoja.\n" -#: cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "On noudettava %st lähdekoodiarkistoja.\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "Nouda lähdekoodi %s\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "Joidenkin arkistojen noutaminen ei onnistunut." -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, 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:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Purkukomento \"%s\" ei onnistunut.\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "Paketointikomento \"%s\" ei onnistunut.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "Lapsiprosessi kaatui" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 msgid "Must specify at least one package to check builddeps for" msgstr "" "On annettava ainakin yksi paketti jonka paketointiriippuvuudet tarkistetaan" -#: cmdline/apt-get.cc:2084 +#: cmdline/apt-get.cc:2093 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Paketille %s ei ole saatavilla riippuvuustietoja" -#: cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "Paketille %s ei ole määritetty paketointiriippuvuuksia.\n" -#: cmdline/apt-get.cc:2156 +#: cmdline/apt-get.cc:2165 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1110,7 +1111,7 @@ msgid "" msgstr "" "riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy" -#: cmdline/apt-get.cc:2208 +#: cmdline/apt-get.cc:2217 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1119,32 +1120,32 @@ msgstr "" "%s riippuvuutta paketille %s ei voi tyydyttää koska mikään paketin %s versio " "ei vastaa versioriippuvuuksia" -#: cmdline/apt-get.cc:2243 +#: cmdline/apt-get.cc:2252 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Riippuvutta %s paketille %s ei voi tyydyttää: Asennettu paketti %s on liian " "uusi" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Riippuvuutta %s paketille %s ei voi tyydyttää: %s" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Paketointiriippuvuuksia paketille %s ei voi tyydyttää." -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "Paketointiriippuvuuksien käsittely ei onnistunut" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "Tuetut moduulit:" -#: cmdline/apt-get.cc:2359 +#: cmdline/apt-get.cc:2368 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1394,8 +1395,8 @@ msgid "Duplicate conf file %s/%s" msgstr "Asetustiedoston kaksoiskappale %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "Tiedoston %s kirjoittaminen ei onnistunut" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1748,7 +1749,7 @@ msgstr "Pistokkeen kytkeminen aikakatkaistiin" msgid "Unable to accept connection" msgstr "Yhteyttä ei voitu hyväksyä" -#: methods/ftp.cc:864 methods/http.cc:916 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Pulmia tiedoston hajautuksessa" @@ -1875,43 +1876,43 @@ msgstr "HTTP-palvelimen arvoaluetuki on rikki" msgid "Unknown date format" msgstr "Tuntematon päiväysmuoto" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "Select ei toiminut" -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "Yhteys aikakatkaistiin" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "Tapahtui virhe kirjoitettaessa tulostustiedostoon" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "Tapahtui virhe kirjoitettaessa tiedostoon" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "Tapahtui virhe kirjoitettaessa tiedostoon" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "Tapahtui virhe luettaessa palvelimelta. Etäpää sulki yhteyden" -#: methods/http.cc:834 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "Tapahtui virhe luettaessa palvelimelta" -#: methods/http.cc:1065 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "Virheellinen otsikkotieto" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "Yhteys ei toiminut" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "Sisäinen virhe" @@ -2445,11 +2446,11 @@ 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:235 apt-pkg/acquire-item.cc:894 +#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 msgid "MD5Sum mismatch" msgstr "MD5Sum ei täsmää" -#: apt-pkg/acquire-item.cc:708 +#: apt-pkg/acquire-item.cc:714 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2458,7 +2459,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:761 +#: apt-pkg/acquire-item.cc:767 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2467,7 +2468,7 @@ msgstr "" "Pakettia %s vastaavaa tiedostoa ei löytynyt. Voit ehkä joutua korjaamaan " "tämän paketin itse." -#: apt-pkg/acquire-item.cc:797 +#: apt-pkg/acquire-item.cc:803 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2475,7 +2476,7 @@ msgstr "" "Pakettihakemistotiedostot ovat turmeltuneet. Paketille %s ei ole Filename-" "kenttää." -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "Koko ei täsmää" diff --git a/po/fr.po b/po/fr.po index 8644bf55c..26323dd75 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1,4 +1,3 @@ -# translation of fr-save.po to French # translation of fr.po to French # Advanced Package Transfer - APT message translation catalog # French messages @@ -9,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-29 07:17+0200\n" -"PO-Revision-Date: 2005-03-29 09:40+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" +"PO-Revision-Date: 2005-07-28 20:52+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" @@ -152,7 +151,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545 -#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s pour %s %s est compil le %s %s\n" @@ -379,7 +378,7 @@ msgstr "" " clean config\n" "\n" "apt-ftparchive gnre des fichiers d'index pour les archives Debian. Il\n" -"gre de nombreux types de gnration, d'une automatisation complte \n" +"supporte de nombreux types de gnration, d'une automatisation complte \n" "des remplacements fonctionnels pour dpkg-scanpackages et dpkg-scansources\n" "\n" "apt-ftparchive gnre les fichiers de paquets partir d'un arbre de .debs.\n" @@ -389,7 +388,7 @@ msgstr "" "des sections\n" "\n" "De faon similaire, apt-ftparchive gnre des fichiers de source partir\n" -"d'un arbre de .dscs. L'option --source-override peut tre utilise pour\n" +"d'un arbre de .dscs. L'option --source-override peut tre employe pour\n" "spcifier un fichier src d'override\n" "\n" "Les commandes packages et sources devraient tre dmarres la\n" @@ -487,7 +486,7 @@ msgstr "Impossible d'ouvrir %s" #: ftparchive/writer.cc:246 #, c-format msgid " DeLink %s [%s]\n" -msgstr " DeLink %s [%s]\n" +msgstr " Dlier %s [%s]\n" #: ftparchive/writer.cc:254 #, c-format @@ -628,7 +627,7 @@ msgstr "Impossible de changer le nom %s en %s" msgid "Y" msgstr "O" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 #, c-format msgid "Regex compilation error - %s" msgstr "Erreur de compilation de l'expression rationnelle - %s" @@ -698,12 +697,12 @@ msgstr "%s (en raison de %s) " #: cmdline/apt-get.cc:544 msgid "" -"WARNING: The following essential packages will be removed\n" +"WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" -"DANGER: Les paquets essentiels suivants vont tre enlevs\n" -"Vous NE devez PAS faire ceci, moins de savoir exactement ce que vous tes\n" -"en train de faire!" +"ATTENTION: Les paquets essentiels suivants vont tre enlevs.\n" +"Vous NE devez PAS faire ceci, moins de savoir exactement ce\n" +"que vous tes en train de faire." #: cmdline/apt-get.cc:575 #, c-format @@ -778,11 +777,11 @@ msgstr "Il y a des probl msgid "Packages need to be removed but remove is disabled." msgstr "Les paquets doivent tre enlevs mais la dsinstallation est dsactive." -#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802 +#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 msgid "Unable to lock the download directory" msgstr "Impossible de verrouiller le rpertoire de tlchargement" -#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061 +#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "La liste des sources ne peut tre lue." @@ -827,7 +826,7 @@ msgstr "Oui, faites ce que je vous dis !" #: cmdline/apt-get.cc:865 #, c-format msgid "" -"You are about to do something potentially harmful\n" +"You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" " ?] " msgstr "" @@ -843,7 +842,7 @@ msgstr "Annulation." msgid "Do you want to continue [Y/n]? " msgstr "Souhaitez-vous continuer [O/n] ? " -#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959 +#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Impossible de rcuprer %s %s\n" @@ -852,7 +851,7 @@ msgstr "Impossible de r msgid "Some files failed to download" msgstr "Certains fichiers n'ont pu tre tlchargs." -#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 msgid "Download complete and in download only mode" msgstr "Tlchargement achev et dans le mode tlchargement uniquement" @@ -954,7 +953,7 @@ msgstr "Version choisie %s (%s) pour %s\n" msgid "The update command takes no arguments" msgstr "La commande de mise jour ne prend pas d'argument" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "Impossible de verrouiller le rpertoire de liste" @@ -970,21 +969,21 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "Erreur interne, AllUpgrade a cass le boulot!" -#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498 +#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 #, c-format msgid "Couldn't find package %s" msgstr "Impossible de trouver le paquet %s" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Note, slectionne %s pour l'expression rationnelle %s\n" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1524 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Vous pouvez lancer apt-get -f install pour corriger ces problmes:" -#: cmdline/apt-get.cc:1518 +#: cmdline/apt-get.cc:1527 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -992,7 +991,7 @@ msgstr "" "Dpendances non satisfaites. Essayez apt-get -f install sans paquet\n" "(ou indiquez une solution)." -#: cmdline/apt-get.cc:1530 +#: cmdline/apt-get.cc:1539 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1004,7 +1003,7 @@ msgstr "" "la distribution unstable, que certains paquets n'ont pas encore\n" "t crs ou ne sont pas sortis d'Incoming." -#: cmdline/apt-get.cc:1538 +#: cmdline/apt-get.cc:1547 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1013,107 +1012,107 @@ msgstr "" "Puisque vous n'avez demand qu'une seule opration, le paquet n'est\n" "probablement pas installable et vous devriez envoyer un rapport de bogue." -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "L'information suivante devrait vous aider rsoudre la situation: " -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "Paquets dfectueux" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "Les paquets supplmentaires suivants seront installs: " -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "Paquets suggrs:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "Paquets recommands:" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "Calcul de la mise jour... " -#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99 +#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 msgid "Failed" msgstr "chec" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "Fait" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 msgid "Must specify at least one package to fetch source for" msgstr "Vous devez spcifier au moins un paquet source" -#: cmdline/apt-get.cc:1872 cmdline/apt-get.cc:2079 +#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 #, c-format msgid "Unable to find a source package for %s" msgstr "Impossible de trouver une source de paquet pour %s" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, c-format msgid "You don't have enough free space in %s" msgstr "Pas assez d'espace disponible sur %s" -#: cmdline/apt-get.cc:1924 +#: cmdline/apt-get.cc:1933 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Ncessit de prendre %so/%so dans les sources.\n" -#: cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Ncessit de prendre %so dans les sources.\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "Rcupration des sources %s\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "chec lors de la rcupration de quelques archives." -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Saut du dcompactage des paquets sources dj dcompacts dans %s\n" -#: cmdline/apt-get.cc:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "La commande de dcompactage %s a chou.\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "La commande de construction %s a chou.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "chec du processus fils" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 msgid "Must specify at least one package to check builddeps for" msgstr "" "Il faut spcifier au moins un paquet pour vrifier les dpendances de " "construction" -#: cmdline/apt-get.cc:2084 +#: cmdline/apt-get.cc:2093 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Impossible d'obtenir les dpendances de construction pour %s" -#: cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "%s n'a pas de dpendance de construction.\n" -#: cmdline/apt-get.cc:2156 +#: cmdline/apt-get.cc:2165 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1122,7 +1121,7 @@ msgstr "" "La dpendance %s vis--vis de %s ne peut tre satisfaite car le paquet %s ne " "peut tre trouv" -#: cmdline/apt-get.cc:2208 +#: cmdline/apt-get.cc:2217 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1131,32 +1130,32 @@ msgstr "" "La dpendance %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:2243 +#: cmdline/apt-get.cc:2252 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Impossible de satisfaire la dpendance %s pour %s: le paquet install %s " "est trop rcent" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Impossible de satisfaire les dpendances %s pour %s: %s" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Les dpendances de compilation pour %s ne peuvent pas tre satisfaites." -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "Impossible d'activer les dpendances de construction" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "Modules reconnus:" -#: cmdline/apt-get.cc:2359 +#: cmdline/apt-get.cc:2368 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1412,7 +1411,7 @@ msgstr "Fichier de configuration en double %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 #, c-format -msgid "Failed write file %s" +msgid "Failed to write file %s" msgstr "Erreur d'criture du fichier %s" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1769,7 +1768,7 @@ msgstr "D msgid "Unable to accept connection" msgstr "Impossible d'accepter une connexion" -#: methods/ftp.cc:864 methods/http.cc:916 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problme de hachage du fichier" @@ -1898,43 +1897,43 @@ msgstr "Ce serveur http poss msgid "Unknown date format" msgstr "Format de date inconnu" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "Slection dfaillante" -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "Dlai de connexion dpass" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "Erreur d'criture du fichier de sortie" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "Erreur d'criture sur un fichier" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "Erreur d'criture sur le fichier" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "Erreur de lecture depuis le serveur distant et clture de la connexion" -#: methods/http.cc:834 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "Erreur de lecture du serveur" -#: methods/http.cc:1065 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "Mauvais en-tte de donne" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "chec de la connexion" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "Erreur interne" @@ -2136,7 +2135,7 @@ msgstr "lu(s), %lu restant #: apt-pkg/contrib/fileutl.cc:504 #, c-format msgid "write, still have %lu to write but couldn't" -msgstr "crit(s), %lu restant crire, mais l'ecriture est impossible" +msgstr "crit(s), %lu restant crire, mais l'criture est impossible" #: apt-pkg/contrib/fileutl.cc:579 msgid "Problem closing the file" @@ -2434,19 +2433,17 @@ msgstr "Erreur apparue lors du traitement de %s (NewVersion2)" #: apt-pkg/pkgcachegen.cc:207 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" -"Oula, vous avez dpass le nombre de noms de paquets que cet APT est capable " -"de traiter." +"Vous avez dpass le nombre de noms de paquets que cet APT est capable de " +"traiter." #: apt-pkg/pkgcachegen.cc:210 msgid "Wow, you exceeded the number of versions this APT is capable of." -msgstr "" -"Oula, vous avez dpass le nombre de versions que cet APT est capable de " -"traiter." +msgstr "Vous avez dpass le nombre de versions que cet APT est capable de traiter." #: apt-pkg/pkgcachegen.cc:213 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" -"Oula, vous avez dpass le nombre de dpendances que cet APT est capable de " +"Vous avez dpass le nombre de dpendances que cet APT est capable de " "traiter." #: apt-pkg/pkgcachegen.cc:241 @@ -2484,11 +2481,11 @@ msgstr "Erreur d'entr msgid "rename failed, %s (%s -> %s)." msgstr "impossible de changer le nom, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:894 +#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 msgid "MD5Sum mismatch" msgstr "Somme de contrle MD5 incohrente" -#: apt-pkg/acquire-item.cc:708 +#: apt-pkg/acquire-item.cc:714 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2498,7 +2495,7 @@ msgstr "" "sans doute que vous devrez corriger ce paquet manuellement (absence " "d'architecture)." -#: apt-pkg/acquire-item.cc:761 +#: apt-pkg/acquire-item.cc:767 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2507,14 +2504,14 @@ msgstr "" "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:797 +#: apt-pkg/acquire-item.cc:803 #, 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: " "pour le paquet %s." -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "Taille incohrente" @@ -2619,8 +2616,238 @@ msgstr "" "%i enregistrements crits avec %i fichiers manquants et %i qui ne " "correspondent pas\n" +#~ msgid "The pkg cache must be initialize first" +#~ msgstr "Le cache des paquets doit tre initialis en premier" + +#~ msgid "Error occured while processing %s (NewPackage)" +#~ msgstr "Erreur apparue lors du traitement de %s (NewPackage)" + +#~ msgid "Error occured while processing %s (UsePackage1)" +#~ msgstr "Erreur apparue lors du traitement de %s (UsePackage1)" + +#~ msgid "Error occured while processing %s (UsePackage2)" +#~ msgstr "Erreur apparue lors du traitement de %s (UsePackage2)" + +#~ msgid "Error occured while processing %s (NewFileVer1)" +#~ msgstr "Erreur apparue lors du traitement de %s (NewFileVer1)" + +#~ msgid "Error occured while processing %s (NewVersion1)" +#~ msgstr "Erreur apparue lors du traitement de %s (NewVersion1)" + +#~ msgid "Error occured while processing %s (UsePackage3)" +#~ msgstr "Erreur apparue lors du traitement de %s (UsePackage3)" + +#~ msgid "Error occured while processing %s (NewVersion2)" +#~ msgstr "Erreur apparue lors du traitement de %s (NewVersion2)" + +#~ msgid "Error occured while processing %s (FindPkg)" +#~ msgstr "Erreur apparue lors du traitement de %s (FindPkg)" + +#~ msgid "Error occured while processing %s (CollectFileProvides)" +#~ msgstr "Erreur apparue lors du traitement de %s (CollectFileProvides)" + +#~ msgid "Total Package Names : " +#~ msgstr "Nombre total de paquets: " + +#~ msgid " Normal Packages: " +#~ msgstr " Paquets ordinaires: " + +#~ msgid " Pure Virtual Packages: " +#~ msgstr " Paquets entirement virtuels: " + +#~ msgid " Single Virtual Packages: " +#~ msgstr " Paquets virtuels simples: " + +#~ msgid " Mixed Virtual Packages: " +#~ msgstr " Paquets virtuels mixtes: " + +#~ msgid "Total Distinct Versions: " +#~ msgstr "Nombre de versions distinctes: " + +#~ msgid "Total Dependencies: " +#~ msgstr "Nombre de dpendances: " + +#~ msgid "Total Ver/File relations: " +#~ msgstr "Nombre de relations version/fichier: " + +#~ msgid "Total Provides Mappings: " +#~ msgstr "Nombre de relations Provides: " + +#~ msgid "Total Globbed Strings: " +#~ msgstr "Nombre de motifs rationnels: " + +#~ msgid "Total Dependency Version space: " +#~ msgstr "Espace occup par les versions des dpendances: " + +#~ msgid "Total Slack space: " +#~ msgstr "Espace disque gaspill: " + +#~ msgid "Total Space Accounted for: " +#~ msgstr "Total de l'espace attribu: " + +#~ msgid "Package Files:" +#~ msgstr "Fichiers du paquet:" + +#~ msgid "Pinned Packages:" +#~ msgstr "Paquets tiquets:" + +#~ msgid " Package Pin: " +#~ msgstr " tiquette de paquet: " + +#~ msgid " Version Table:" +#~ msgstr " Table de version:" + +#~ msgid "Error Processing directory %s" +#~ msgstr "Erreur lors du traitement du rpertoire %s" + +#~ msgid "Error Processing Contents %s" +#~ msgstr "Erreur du traitement du contenu %s" + +#~ msgid "Unknown Compresison Algorithm '%s'" +#~ msgstr "Algorithme de compression %s inconnu" + +#~ msgid "Compress Child" +#~ msgstr "Fils compress" + +#~ msgid "Internal Error, Failed to create %s" +#~ msgstr "Erreur interne, impossible de crer %s" + +#~ msgid "Packages need to be removed but Remove is disabled." +#~ msgstr "" +#~ "Les paquets doivent tre enlevs mais la dsinstallation est dsactive." + +#~ msgid "Do you want to continue? [Y/n] " +#~ msgstr "Souhaitez-vous continuer? [O/n] " + +#~ msgid "Aborting Install." +#~ msgstr "Annulation de l'installation." + +#~ msgid "Internal Error, AllUpgrade broke stuff" +#~ msgstr "Erreur interne, AllUpgrade a cass le boulot!" + +#~ msgid "Calculating Upgrade... " +#~ msgstr "Calcul de la mise jour... " + +#~ msgid "Fetch Source %s\n" +#~ msgstr "Rcupration des sources %s\n" + +#~ msgid "Supported Modules:" +#~ msgstr "Modules reconnus:" + +#~ msgid "" +#~ "Media Change: Please insert the disc labeled\n" +#~ " '%s'\n" +#~ "in the drive '%s' and press enter\n" +#~ msgstr "" +#~ "Changement de support: veuillez insrer le disque\n" +#~ "%s\n" +#~ "dans le lecteur %s et appuyez sur la touche Entre\n" + +#~ msgid "Merging Available information" +#~ msgstr "Fusion des informations disponibles" + +#~ msgid "Tar Checksum failed, archive corrupted" +#~ msgstr "chec dans la somme de contrle de tar, l'archive est corrompue" + +#~ msgid "Internal Error in AddDiversion" +#~ msgstr "Erreur interne dans AddDiversion" + +#~ msgid "Reading Package Lists" +#~ msgstr "Lecture des listes de paquets" + +#~ msgid "Internal Error getting a Package Name" +#~ msgstr "Erreur interne lors de l'obtention d'un nom de paquet" + +#~ msgid "Reading File Listing" +#~ msgstr "Lecture de la liste de fichiers" + +#~ msgid "Internal Error getting a Node" +#~ msgstr "Erreur interne lors de l'obtention d'un Nud" + +#~ msgid "Internal Error adding a diversion" +#~ msgstr "Erreur interne en ajoutant une dviation" + +#~ msgid "Reading File List" +#~ msgstr "Lecture de la liste des fichiers" + +#~ msgid "Failed to find a Package: Header, offset %lu" +#~ msgstr "Impossible de trouver un en-tte Package:, dcalage %lu" + +#~ msgid "Internal Error, could not locate member %s" +#~ msgstr "Erreur interne, ne peut localiser la partie %s" + +#~ msgid "Internal Error, could not locate member" +#~ msgstr "Erreur interne, ne peut localiser le membre" + +#~ msgid "Unparsible control file" +#~ msgstr "Fichier de contrle non traitable" + +#~ msgid "" +#~ "Please use apt-cdrom to make this CD recognized by APT. apt-get update " +#~ "cannot be used to add new CDs" +#~ msgstr "" +#~ "Veuillez utiliser apt-cdrom afin de faire reconnatre ce cdrom par " +#~ "votre APT. apt-get update ne peut tre employ pour ajouter de nouveaux " +#~ "cdroms" + +#~ msgid "Wrong CD" +#~ msgstr "Mauvais cdrom" + +#~ msgid "Server refused our connection and said: %s" +#~ msgstr "Le serveur a refus notre connexion et a rpondu: %s" + +#~ msgid "Write Error" +#~ msgstr "Erreur d'criture" + +#~ msgid "The http server sent an invalid reply header" +#~ msgstr "Le serveur http a envoy une rponse dont l'en-tte est invalide" + +#~ msgid "The http server sent an invalid Content-Length header" +#~ msgstr "Le serveur http a envoy un en-tte Content-Length invalide" + +#~ msgid "The http server sent an invalid Content-Range header" +#~ msgstr "Le serveur http a envoy un en-tte Content-Range invalide" + +#~ msgid "This http server has broken range support" +#~ msgstr "Ce serveur http possde un support des limites non-valide" + +#~ msgid "Error reading from server Remote end closed connection" +#~ msgstr "" +#~ "Erreur de lecture depuis le serveur distant et clture de la connexion" + +#~ msgid "Bad header Data" +#~ msgstr "Mauvais en-tte de donne" + +#~ msgid "Syntax error %s:%u: Malformed Tag" +#~ msgstr "Erreur syntaxique %s:%u: balise mal forme" + +#~ msgid "Waited, for %s but it wasn't there" +#~ msgstr "A attendu %s mais il n'tait pas prsent" + +#~ msgid "This APT does not support the Versioning System '%s'" +#~ msgstr "Cet APT ne supporte pas le systme de version %s" + +#~ msgid "Building Dependency Tree" +#~ msgstr "Construction de l'arbre des dpendances" + +#~ msgid "Candidate Versions" +#~ msgstr "Versions possibles" + +#~ msgid "Dependency Generation" +#~ msgstr "Gnration des dpendances" + +#~ msgid "Malformed line %lu in source list %s (Absolute dist)" +#~ msgstr "" +#~ "Ligne %lu mal forme dans la liste des sources %s (distribution absolue)" + +#~ msgid "Vendor block %s is invalid" +#~ msgstr "Bloc de fournisseur %s invalide" + #~ msgid "Unknown vendor ID '%s' in line %u of source list %s" #~ msgstr "" #~ "Identifiant %s du fournisseur inconnu dans la ligne %u de la liste " #~ "des sources %s" +#~ msgid "File Not Found" +#~ msgstr "Fichier non trouv" + diff --git a/po/he.po b/po/he.po index 242155eff..8dae868ef 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: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" "PO-Revision-Date: 2004-06-10 19:58+0300\n" "Last-Translator: Lior Kaplan <webmaster@guides.co.il>\n" "Language-Team: Hebrew\n" @@ -148,7 +148,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545 -#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s בשביל %s %s קומפל על %s %s\n" @@ -523,7 +523,7 @@ msgstr "כשלון בשינוי השם %s ל-%s" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 #, c-format msgid "Regex compilation error - %s" msgstr "" @@ -592,8 +592,9 @@ msgid "%s (due to %s) " msgstr "%s (בגלל %s) " #: cmdline/apt-get.cc:544 +#, fuzzy msgid "" -"WARNING: The following essential packages will be removed\n" +"WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" "א ז ה ר ה: החבילות החיוניות הבאות יוסרו\n" @@ -638,9 +639,7 @@ msgstr "לא מצליח לתקן תלויות" #: cmdline/apt-get.cc:656 msgid "Unable to minimize the upgrade set" -msgstr "" -"א ז ה ר ה: החבילות החיוניות הבאות יוסרו\n" -"על הפעולה להעשות *רק* אם אתה יודע מה אתה עושה!" +msgstr "א ז ה ר ה: החבילות החיוניות הבאות יוסרו" #: cmdline/apt-get.cc:658 msgid " Done" @@ -675,11 +674,11 @@ msgstr "היו בעיות והאפשרות -y היתה בשימוש ללא הא msgid "Packages need to be removed but remove is disabled." msgstr "" -#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802 +#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 msgid "Unable to lock the download directory" msgstr "לא מצליח לנעול את ספרית ההורדה." -#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061 +#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "רשימת המקורות לא ניתנת לקריאה." @@ -720,7 +719,7 @@ msgstr "כן, עשה כפי שאני אומר!" #: cmdline/apt-get.cc:865 #, c-format msgid "" -"You are about to do something potentially harmful\n" +"You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" " ?] " msgstr "" @@ -734,7 +733,7 @@ msgstr "בטל." msgid "Do you want to continue [Y/n]? " msgstr "האם אתה רוצה להמשיך? [Y/n]" -#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959 +#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 #, c-format msgid "Failed to fetch %s %s\n" msgstr "כשלון בהבאת %s %s\n" @@ -743,7 +742,7 @@ msgstr "כשלון בהבאת %s %s\n" msgid "Some files failed to download" msgstr "כשלון בהורדת חלק מהקבצים" -#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 msgid "Download complete and in download only mode" msgstr "ההורדה הסתיימה במסגרת מצב הורדה בלבד." @@ -839,7 +838,7 @@ msgstr "" msgid "The update command takes no arguments" msgstr "" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "" @@ -853,27 +852,27 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498 +#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 #, c-format msgid "Couldn't find package %s" msgstr "" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1524 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" -#: cmdline/apt-get.cc:1518 +#: cmdline/apt-get.cc:1527 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -#: cmdline/apt-get.cc:1530 +#: cmdline/apt-get.cc:1539 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -881,149 +880,149 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1538 +#: cmdline/apt-get.cc:1547 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" "that package should be filed." msgstr "" -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "" -#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99 +#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 msgid "Failed" msgstr "" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:1872 cmdline/apt-get.cc:2079 +#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, c-format msgid "You don't have enough free space in %s" msgstr "" -#: cmdline/apt-get.cc:1924 +#: cmdline/apt-get.cc:1933 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2084 +#: cmdline/apt-get.cc:2093 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2156 +#: cmdline/apt-get.cc:2165 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2208 +#: cmdline/apt-get.cc:2217 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:2243 +#: cmdline/apt-get.cc:2252 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:2359 +#: cmdline/apt-get.cc:2368 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1220,9 +1219,9 @@ msgid "Duplicate conf file %s/%s" msgstr "" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" -msgstr "" +#, fuzzy, c-format +msgid "Failed to write file %s" +msgstr "כשלון בפענוח %s" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 #, c-format @@ -1567,7 +1566,7 @@ msgstr "" msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:864 methods/http.cc:916 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" @@ -1694,43 +1693,43 @@ msgstr "" msgid "Unknown date format" msgstr "" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "" -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:834 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "" -#: methods/http.cc:1065 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "" @@ -2257,31 +2256,31 @@ msgstr "" msgid "rename failed, %s (%s -> %s)." msgstr "" -#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:894 +#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 msgid "MD5Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:708 +#: apt-pkg/acquire-item.cc:714 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -#: apt-pkg/acquire-item.cc:761 +#: apt-pkg/acquire-item.cc:767 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" -#: apt-pkg/acquire-item.cc:797 +#: apt-pkg/acquire-item.cc:803 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "" diff --git a/po/hu.po b/po/hu.po index cdc21fce3..5dbebd086 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: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" "PO-Revision-Date: 2005-02-15 18:03+0100\n" "Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n" "Language-Team: Hungarian <gnome@gnome.hu>\n" @@ -151,7 +151,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545 -#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s ehhez: %s %s fordítás ideje: %s %s\n" @@ -624,7 +624,7 @@ msgstr "Nem sikerült átnevezni a következőt: %s erre: %s" msgid "Y" msgstr "I" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 #, c-format msgid "Regex compilation error - %s" msgstr "Regex fordítási hiba - %s" @@ -693,8 +693,9 @@ msgid "%s (due to %s) " msgstr "%s (%s miatt) " #: cmdline/apt-get.cc:544 +#, fuzzy msgid "" -"WARNING: The following essential packages will be removed\n" +"WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" "FIGYELEM: A következő alapvető csomagok kerülnek eltávolításra\n" @@ -773,11 +774,11 @@ msgstr "Problémák vannak és a -y -t használtad --force-yes nélkül" msgid "Packages need to be removed but remove is disabled." msgstr "Csomagokat kellene eltávolítani, de az Eltávolítás nem engedélyezett." -#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802 +#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 msgid "Unable to lock the download directory" msgstr "Nem tudom zárolni a letöltési könyvtárat" -#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061 +#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "A források listája olvashatatlan." @@ -816,9 +817,9 @@ msgid "Yes, do as I say!" msgstr "Igen, tedd amit mondok!" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, c-format msgid "" -"You are about to do something potentially harmful\n" +"You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" " ?] " msgstr "" @@ -834,7 +835,7 @@ msgstr "Megszakítva." msgid "Do you want to continue [Y/n]? " msgstr "Folytatni akarod [Y/n]? " -#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959 +#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Nem sikerült letölteni a következőt: %s %s\n" @@ -843,7 +844,7 @@ msgstr "Nem sikerült letölteni a következőt: %s %s\n" msgid "Some files failed to download" msgstr "Néhány fájlt nem sikerült letölteni" -#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 msgid "Download complete and in download only mode" msgstr "A letöltés befejeződött a 'csak letöltés' módban" @@ -944,7 +945,7 @@ msgstr "%s (%s) a kiválasztott verzió ehhez: %s\n" msgid "The update command takes no arguments" msgstr "Az update parancsnak nincsenek argumentumai" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "Nem tudom a listakönyvtárat zárolni" @@ -960,22 +961,22 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "Belső hiba, AllUpgrade megsértett valamit" -#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498 +#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 #, c-format msgid "Couldn't find package %s" msgstr "Nem található a(z) %s csomag" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, 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:1515 +#: cmdline/apt-get.cc:1524 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "A következők kijavításához próbáld futtatni az 'apt-get -f install'-t :" -#: cmdline/apt-get.cc:1518 +#: cmdline/apt-get.cc:1527 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -983,7 +984,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:1530 +#: cmdline/apt-get.cc:1539 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -995,7 +996,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:1538 +#: cmdline/apt-get.cc:1547 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1005,108 +1006,108 @@ msgstr "" "hogy a csomag egyszerűen nem telepíthető és egy hibajelentést kellene\n" "kitölteni a csomaghoz." -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "A következő információ talán segít megoldani a helyzetet:" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "Törött csomagok" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "A következő extra csomagok kerülnek telepítésre:" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "Javasolt csomagok:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "Ajánlott csomagok:" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "Frissítés kiszámítása... " -#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99 +#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 msgid "Failed" msgstr "Sikertelen" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "Kész" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 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:1872 cmdline/apt-get.cc:2079 +#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 #, c-format msgid "Unable to find a source package for %s" msgstr "Nem található forráscsomag ehhez: %s" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, c-format msgid "You don't have enough free space in %s" msgstr "Nincs elég szabad hely itt: %s" -#: cmdline/apt-get.cc:1924 +#: cmdline/apt-get.cc:1933 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%sB/%sB forrásarchívot kell letölteni.\n" -#: cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "%sB forrásarchívumot kell letölteni.\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "Forrás letöltése: %s\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "Nem sikerült néhány archívumot letölteni." -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, 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:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "'%s' kibontási parancs nem sikerült.\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "'%s' elkészítési parancs nem sikerült.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "Hiba a gyermekfolyamatnál" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 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:2084 +#: cmdline/apt-get.cc:2093 #, 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:2104 +#: cmdline/apt-get.cc:2113 #, 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:2156 +#: cmdline/apt-get.cc:2165 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1115,7 +1116,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:2208 +#: cmdline/apt-get.cc:2217 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1124,32 +1125,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:2243 +#: cmdline/apt-get.cc:2252 #, 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:2268 +#: cmdline/apt-get.cc:2277 #, 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:2282 +#: cmdline/apt-get.cc:2291 #, 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:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "Nem sikerült az építési függőségeket feldolgozni" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "Támogatott modulok:" -#: cmdline/apt-get.cc:2359 +#: cmdline/apt-get.cc:2368 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1397,8 +1398,8 @@ msgid "Duplicate conf file %s/%s" msgstr "Dupla %s/%s konfigurációs fájl" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "Nem sikerült a(z) %s fájlba írni" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1755,7 +1756,7 @@ msgstr "Az adat sockethez kapcsolódás túllépte az időkeretet" msgid "Unable to accept connection" msgstr "Nem lehet elfogadni a kapcsolatot" -#: methods/ftp.cc:864 methods/http.cc:916 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Probléma a fájl hash értékének meghatározásakor" @@ -1882,43 +1883,43 @@ msgstr "Ez a http szerver támogatja a sérült tartományokat " msgid "Unknown date format" msgstr "Ismeretlen dátum formátum" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "Sikertelen kiválasztás" -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "Időtúllépés a kapcsolatban" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "Hiba a kimeneti fájl írásakor" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "Hiba fájl írásakor" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "Hiba a fájl írásakor" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "Hiba a kiszolgálóról olvasáskor, a túloldal lezárta a kapcsolatot" -#: methods/http.cc:834 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "Hiba a kiszolgálóról olvasáskor" -#: methods/http.cc:1065 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "Rossz fejlécadat" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "Kapcsolódás sikertelen" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "Belső hiba" @@ -2461,11 +2462,11 @@ 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:235 apt-pkg/acquire-item.cc:894 +#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 msgid "MD5Sum mismatch" msgstr "Az MD5Sum nem megfelelő" -#: apt-pkg/acquire-item.cc:708 +#: apt-pkg/acquire-item.cc:714 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2474,7 +2475,7 @@ msgstr "" "Nem találtam egy fájlt a(z) %s csomaghoz. Ez azt jelentheti, hogy kézileg " "kell kijavítani a csomagot. (hiányzó arch. miatt)" -#: apt-pkg/acquire-item.cc:761 +#: apt-pkg/acquire-item.cc:767 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2483,14 +2484,14 @@ msgstr "" "Nem találtam egy fájlt a(z) %s csomaghoz. Ez azt jelentheti, hogy kézileg " "kell kijavítani a csomagot." -#: apt-pkg/acquire-item.cc:797 +#: apt-pkg/acquire-item.cc:803 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "A csomagindex-fájlok megsérültek. Nincs Filename: mező a(z) %s csomaghoz." -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "A méret nem megfelelő" diff --git a/po/it.po b/po/it.po index 602e441ab..edb215bbc 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: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" "PO-Revision-Date: 2005-03-26 00:42+0100\n" "Last-Translator: Samuele Giovanni Tonon <samu@debian.org>\n" "Language-Team: Italian <it@li.org>\n" @@ -147,7 +147,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545 -#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s per %s %s compilato il %s %s\n" @@ -623,7 +623,7 @@ msgstr "Impossibile rinominare %s in %s" msgid "Y" msgstr "S" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 #, c-format msgid "Regex compilation error - %s" msgstr "Errore di compilazione della regex - %s" @@ -692,8 +692,9 @@ msgid "%s (due to %s) " msgstr "%s (a causa di %s) " #: cmdline/apt-get.cc:544 +#, fuzzy msgid "" -"WARNING: The following essential packages will be removed\n" +"WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" "ATTENZIONE: il seguente pacchetto ESSENZIALE sta per essere rimosso\n" @@ -774,11 +775,11 @@ msgstr "Sussistono dei problemi e -y msgid "Packages need to be removed but remove is disabled." msgstr "I pacchetti devono essere rimossi ma il remove disabilitato." -#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802 +#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 msgid "Unable to lock the download directory" msgstr "Impossibile creare un lock sulla directory di download" -#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061 +#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "La lista dei sorgenti non pu essere letta." @@ -819,9 +820,9 @@ msgid "Yes, do as I say!" msgstr "SI, esegui come richiesto!" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, c-format msgid "" -"You are about to do something potentially harmful\n" +"You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" " ?] " msgstr "" @@ -837,7 +838,7 @@ msgstr "Interrotto." msgid "Do you want to continue [Y/n]? " msgstr "Continuare [S/n]? " -#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959 +#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Impossibile ottenere %s %s\n" @@ -846,7 +847,7 @@ msgstr "Impossibile ottenere %s %s\n" msgid "Some files failed to download" msgstr "Il download di alcuni file fallito" -#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 msgid "Download complete and in download only mode" msgstr "Download completato e in modalit download-only" @@ -949,7 +950,7 @@ msgstr "Versione selezionata %s (%s) per %s\n" msgid "The update command takes no arguments" msgstr "Il comando update non accetta argomenti" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "Impossibile creare un lock sulla directory di list" @@ -965,22 +966,22 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "Errore interno, AllUpgrade ha rotto qualcosa" -#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498 +#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 #, c-format msgid "Couldn't find package %s" msgstr "Impossibile trovare %s" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, 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:1515 +#: cmdline/apt-get.cc:1524 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:1518 +#: cmdline/apt-get.cc:1527 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -988,7 +989,7 @@ msgstr "" "Dipendenze non soddisfatte. Provare 'apt-get -f install' senza pacchetti (o " "specificare una soluzione)." -#: cmdline/apt-get.cc:1530 +#: cmdline/apt-get.cc:1539 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1000,7 +1001,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:1538 +#: cmdline/apt-get.cc:1547 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1010,107 +1011,107 @@ msgstr "" "il pacchetto semplicemente non sia installabile, si consiglia\n" "di inviare un \"bug report\" per tale pacchetto." -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "Le seguenti informazioni possono aiutare a risolvere la situazione: " -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "Pacchetto non integro" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "I seguenti pacchetti verranno inoltre installati:" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "Pacchetti suggeriti:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "Pacchetti raccomandati:" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "Calcolo dell'aggiornamento in corso... " -#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99 +#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 msgid "Failed" msgstr "Fallito" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "Fatto" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 msgid "Must specify at least one package to fetch source for" msgstr "Bisogna specificare almeno un pacchetto cui scaricare il sorgente" -#: cmdline/apt-get.cc:1872 cmdline/apt-get.cc:2079 +#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 #, c-format msgid "Unable to find a source package for %s" msgstr "Impossibile trovare un pacchetto sorgente per %s" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, c-format msgid "You don't have enough free space in %s" msgstr "Lo spazio libero in %s non sufficente" -#: cmdline/apt-get.cc:1924 +#: cmdline/apt-get.cc:1933 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr " necessario prendere %sB/%sB di sorgenti.\n" -#: cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr " necessario prendere %sB di sorgenti\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "Prelievo del sorgente %s\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "Non stato possibile scaricare alcuni archivi." -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, 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:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Comando di estrazione '%s' fallito.\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "Comando di costruzione '%s' fallito.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "Processo figlio fallito" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 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:2084 +#: cmdline/apt-get.cc:2093 #, 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:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "%s non ha dipendenze di costruzione.\n" -#: cmdline/apt-get.cc:2156 +#: cmdline/apt-get.cc:2165 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1119,7 +1120,7 @@ msgstr "" "%s dipendenze per %s non possono essere soddisfatte perch non si trova il " "pacchetto %s" -#: cmdline/apt-get.cc:2208 +#: cmdline/apt-get.cc:2217 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1128,32 +1129,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:2243 +#: cmdline/apt-get.cc:2252 #, 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:2268 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "La dipendenza %s per %s: %s fallita" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2291 #, 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:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "Il calcolo delle dipendenze per la costruzione fallito" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "Moduli supportati:" -#: cmdline/apt-get.cc:2359 +#: cmdline/apt-get.cc:2368 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1411,8 +1412,8 @@ msgid "Duplicate conf file %s/%s" msgstr "File di configurazione duplice %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "Scrittura del file %s fallita" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1767,7 +1768,7 @@ msgstr "Tempo limite di connessione esaurito per il socket dati" msgid "Unable to accept connection" msgstr "Impossibile accettare connessioni" -#: methods/ftp.cc:864 methods/http.cc:916 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problemi nella creazione dell'hash del file" @@ -1895,44 +1896,44 @@ msgstr "Questo server HTTP ha il supporto del range bacato" msgid "Unknown date format" msgstr "Formato della data sconosciuto" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "Select fallito" -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "Tempo limite per la connessione esaurito" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "Errore nella scrittura del file di output" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "Errore nella scrittura nel file" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "Errore nella scrittura nel file" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "" "Errore nella lettura dal server. Il lato remoto ha chiuso la connessione" -#: methods/http.cc:834 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "Errore nella lettura dal server" -#: methods/http.cc:1065 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "Header dei dati malformato" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "Connessione fallita" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "Errore interno" @@ -2479,11 +2480,11 @@ 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:235 apt-pkg/acquire-item.cc:894 +#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 msgid "MD5Sum mismatch" msgstr "Somma MD5 non corrispondente" -#: apt-pkg/acquire-item.cc:708 +#: apt-pkg/acquire-item.cc:714 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2493,7 +2494,7 @@ msgstr "" "che bisogna correggere manualmente l'errore. (a causa di un'architettura " "mancante)" -#: apt-pkg/acquire-item.cc:761 +#: apt-pkg/acquire-item.cc:767 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2502,7 +2503,7 @@ msgstr "" "Non stato possibile trovare file per il pacchetto %s. Questo significa che " "bisogna correggere manualmente l'errore." -#: apt-pkg/acquire-item.cc:797 +#: apt-pkg/acquire-item.cc:803 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2510,7 +2511,7 @@ msgstr "" "I file indice dei pacchetti sono corrotti. Non c' un campo Filename: per il " "pacchetto %s." -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "Le Dimensioni non corrispondono" diff --git a/po/ja.po b/po/ja.po index fa9829bb2..acd03c6cc 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: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" "PO-Revision-Date: 2005-02-09 12:54+0900\n" "Last-Translator: Kenshi Muto <kmuto@debian.org>\n" "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n" @@ -149,7 +149,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545 -#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s for %s %s ѥ: %s %s\n" @@ -622,7 +622,7 @@ msgstr "%s msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 #, c-format msgid "Regex compilation error - %s" msgstr "ɽŸ顼 - %s" @@ -691,8 +691,9 @@ msgid "%s (due to %s) " msgstr "%s (%s Τ) " #: cmdline/apt-get.cc:544 +#, fuzzy msgid "" -"WARNING: The following essential packages will be removed\n" +"WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" "ٹ: ʲԲķѥåޤ\n" @@ -773,11 +774,11 @@ msgstr " msgid "Packages need to be removed but remove is disabled." msgstr "ѥåʤФʤޤ󤬡̵ˤʤäƤޤ" -#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802 +#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 msgid "Unable to lock the download directory" msgstr "ɥǥ쥯ȥåǤޤ" -#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061 +#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "ΥꥹȤɤळȤǤޤ" @@ -816,9 +817,9 @@ msgid "Yes, do as I say!" msgstr "Yes, do as I say!" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, c-format msgid "" -"You are about to do something potentially harmful\n" +"You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" " ?] " msgstr "" @@ -834,7 +835,7 @@ msgstr " msgid "Do you want to continue [Y/n]? " msgstr "³Ԥޤ [Y/n]? " -#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959 +#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s μ˼Ԥޤ %s\n" @@ -843,7 +844,7 @@ msgstr "%s msgid "Some files failed to download" msgstr "ĤΥեμ˼Ԥޤ" -#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 msgid "Download complete and in download only mode" msgstr "ɥ꡼⡼ɤǥѥåΥɤλޤ" @@ -946,7 +947,7 @@ msgstr "%3$s msgid "The update command takes no arguments" msgstr "update ޥɤϰޤ" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "list ǥ쥯ȥå뤳ȤǤޤ" @@ -962,23 +963,23 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "顼AllUpgrade ˲ޤ" -#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498 +#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 #, c-format msgid "Couldn't find package %s" msgstr "ѥå %s դޤ" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr ": ɽ '%2$s' Ф %1$s 򤷤ޤ\n" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1524 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "ʲ褹뤿 'apt-get -f install' ¹Ԥɬפ뤫⤷" "ޤ:" -#: cmdline/apt-get.cc:1518 +#: cmdline/apt-get.cc:1527 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -986,7 +987,7 @@ msgstr "" "̤ΰ¸طǤ'apt-get -f install' ¹ԤƤߤƤ(ޤϲˡ" "Ƥ)" -#: cmdline/apt-get.cc:1530 +#: cmdline/apt-get.cc:1539 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -998,7 +999,7 @@ msgstr "" "Incoming ưƤʤ԰ǥǥȥӥ塼Ѥ\n" "ƤΤȹͤޤ" -#: cmdline/apt-get.cc:1538 +#: cmdline/apt-get.cc:1547 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1008,107 +1009,107 @@ msgstr "" "ǽ⤤ǤΤᡢΥѥåؤΥХݡȤäƤ\n" "" -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "ʲξ󤬤褹뤿ΩĤ⤷ޤ:" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "줿ѥå" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "ʲ̥ѥå󥹥ȡ뤵ޤ:" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "ƥѥå:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "侩ѥå:" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "åץ졼ɥѥå򸡽ФƤޤ... " -#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99 +#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 msgid "Failed" msgstr "" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "λ" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 msgid "Must specify at least one package to fetch source for" msgstr "" "ˤϾʤȤҤȤĤΥѥå̾ꤹɬפޤ" -#: cmdline/apt-get.cc:1872 cmdline/apt-get.cc:2079 +#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 #, c-format msgid "Unable to find a source package for %s" msgstr "%s ΥѥåĤޤ" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, c-format msgid "You don't have enough free space in %s" msgstr "%s ˽ʬʶڡޤ" -#: cmdline/apt-get.cc:1924 +#: cmdline/apt-get.cc:1933 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%2$sB %1$sB Υ֤ɬפޤ\n" -#: cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "%sB Υ֤ɬפޤ\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr " %s \n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "ĤΥ֤μ˼Ԥޤ" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Ǥ %s Ÿ줿뤿ᡢŸ򥹥åפޤ\n" -#: cmdline/apt-get.cc:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Ÿޥ '%s' Ԥޤ\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "ӥɥޥ '%s' Ԥޤ\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "ҥץԤޤ" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 msgid "Must specify at least one package to check builddeps for" msgstr "" "builddeps åѥå򾯤ʤȤ 1 Ļꤹɬפޤ" -#: cmdline/apt-get.cc:2084 +#: cmdline/apt-get.cc:2093 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s build-dependency 뤳ȤǤޤ" -#: cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "%s ˤ build depends ꤵƤޤ\n" -#: cmdline/apt-get.cc:2156 +#: cmdline/apt-get.cc:2165 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1117,7 +1118,7 @@ msgstr "" "ѥå %3$s Ĥʤᡢ%2$s Ф %1$s ΰ¸ط" "Ǥޤ" -#: cmdline/apt-get.cc:2208 +#: cmdline/apt-get.cc:2217 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1126,32 +1127,32 @@ msgstr "" "ǽ %3$s ϤСˤĤƤ׵ʤᡢ%2$s " " %1$s ΰ¸طȤǤޤ" -#: cmdline/apt-get.cc:2243 +#: cmdline/apt-get.cc:2252 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "%2$s ΰ¸ط %1$s ȤǤޤ: 󥹥ȡ뤵줿 %3$s ѥ" "Ͽޤ" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%2$s ΰ¸ط %1$s ȤǤޤ: %3$s" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s Build-dependency ȤǤޤǤ" -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "build dependency ν˼Ԥޤ" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "ݡȤƤ⥸塼:" -#: cmdline/apt-get.cc:2359 +#: cmdline/apt-get.cc:2368 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1402,8 +1403,8 @@ msgid "Duplicate conf file %s/%s" msgstr "ե %s/%s ʣƤޤ" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "%s ν񤭹ߤ˼Ԥޤ" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1758,7 +1759,7 @@ msgstr " msgid "Unable to accept connection" msgstr "³ accept Ǥޤ" -#: methods/ftp.cc:864 methods/http.cc:916 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "եΥϥåǤ" @@ -1885,43 +1886,43 @@ msgstr "http msgid "Unknown date format" msgstr "եեޥåȤǤ" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "select ˼Ԥޤ" -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "³ॢ" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "ϥեؤν񤭹ߤǥ顼ȯޤ" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "եؤν񤭹ߤǥ顼ȯޤ" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "եؤν񤭹ߤǥ顼ȯޤ" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "⡼¦³ƥФɤ߹ߤ˼Ԥޤ" -#: methods/http.cc:834 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "Фɤ߹ߤ˼Ԥޤ" -#: methods/http.cc:1065 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "ʥإåǤ" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "³" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "顼" @@ -2461,11 +2462,11 @@ msgstr " msgid "rename failed, %s (%s -> %s)." msgstr "͡˼Ԥޤ%s (%s -> %s)" -#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:894 +#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 msgid "MD5Sum mismatch" msgstr "MD5Sum Ŭ礷ޤ" -#: apt-pkg/acquire-item.cc:708 +#: apt-pkg/acquire-item.cc:714 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2474,7 +2475,7 @@ msgstr "" "ѥå %s Υեΰ֤Ǥޤ󡣤餯Υѥåư" "ǽɬפޤ (¸ߤʤƥΤ)" -#: apt-pkg/acquire-item.cc:761 +#: apt-pkg/acquire-item.cc:767 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2483,7 +2484,7 @@ msgstr "" "ѥå %s Υեΰ֤Ǥޤ󡣤餯Υѥåư" "ǽɬפޤ" -#: apt-pkg/acquire-item.cc:797 +#: apt-pkg/acquire-item.cc:803 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2491,7 +2492,7 @@ msgstr "" "ѥåǥåե뤬Ƥޤѥå %s Filename: " "եɤޤ" -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "Ŭ礷ޤ" diff --git a/po/ko.po b/po/ko.po index 50999a8da..ebb80cb0d 100644 --- a/po/ko.po +++ b/po/ko.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" "PO-Revision-Date: 2005-02-10 21:56+0900\n" "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n" "Language-Team: Korean <cwryu@debian.org>\n" @@ -145,7 +145,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545 -#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s (%s %s), 컴파일 시각 %s %s\n" @@ -619,7 +619,7 @@ msgstr "%s 파일의 이름을 %s(으)로 바꾸는 데 실패했습니다" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 #, c-format msgid "Regex compilation error - %s" msgstr "정규식 컴파일 오류 - %s" @@ -688,8 +688,9 @@ msgid "%s (due to %s) " msgstr "%s (%s때문에) " #: cmdline/apt-get.cc:544 +#, fuzzy msgid "" -"WARNING: The following essential packages will be removed\n" +"WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" "경고: 꼭 필요한 다음 꾸러미를 지우게 됩니다.\n" @@ -769,11 +770,11 @@ msgstr "문제가 발생했고 -y 옵션이 --force-yes 옵션 없이 사용되 msgid "Packages need to be removed but remove is disabled." msgstr "꾸러미를 지워야 하지만 지우기가 금지되어 있습니다." -#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802 +#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 msgid "Unable to lock the download directory" msgstr "내려받기 디렉토리를 잠글 수 없습니다" -#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061 +#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "소스 목록을 읽을 수 없습니다." @@ -815,9 +816,9 @@ msgid "Yes, do as I say!" msgstr "Yes, do as I say!" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, c-format msgid "" -"You are about to do something potentially harmful\n" +"You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" " ?] " msgstr "" @@ -833,7 +834,7 @@ msgstr "중단." msgid "Do you want to continue [Y/n]? " msgstr "계속 하시겠습니까 [Y/n]? " -#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959 +#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s 파일을 받는 데 실패했습니다 %s\n" @@ -842,7 +843,7 @@ msgstr "%s 파일을 받는 데 실패했습니다 %s\n" msgid "Some files failed to download" msgstr "일부 파일을 받는 데 실패했습니다" -#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 msgid "Download complete and in download only mode" msgstr "내려받기를 마쳤고 내려받기 전용 모드입니다" @@ -944,7 +945,7 @@ msgstr "%3$s 꾸러미의 %1$s (%2$s) 버전을 선택합니다\n" msgid "The update command takes no arguments" msgstr "update 명령은 인수를 받지 않습니다" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "목록 디렉토리를 잠글 수 없습니다" @@ -960,22 +961,22 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "내부 오류, AllUpgrade때문에 망가졌습니다" -#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498 +#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 #, c-format msgid "Couldn't find package %s" msgstr "%s 꾸러미를 찾을 수 없습니다" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "주의, 정규식 '%2$s'에 대하여 %1$s을(를) 선택합니다\n" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1524 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "다음을 바로잡으려면 `apt-get -f install'을 실행해 보십시오:" # FIXME: specify a solution? 무슨 솔루션? -#: cmdline/apt-get.cc:1518 +#: cmdline/apt-get.cc:1527 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -983,7 +984,7 @@ msgstr "" "의존성이 맞지 않습니다. 꾸러미 없이 'apt-get -f install'을 시도해 보십시오 " "(아니면 해결 방법을 지정하십시오)." -#: cmdline/apt-get.cc:1530 +#: cmdline/apt-get.cc:1539 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -994,7 +995,7 @@ msgstr "" "불안정 배포판을 사용해서 일부 필요한 꾸러미를 아직 만들지 않았거나,\n" "아직 Incoming에서 나오지 않은 경우일 수도 있습니다." -#: cmdline/apt-get.cc:1538 +#: cmdline/apt-get.cc:1547 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1003,105 +1004,105 @@ msgstr "" "한 가지 작업만을 요청하셨으므로, 아마도 이 꾸러미를 설치할 수\n" "없는 경우일 것이고 이 꾸러미에 버그 보고서를 제출해야 합니다." -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "이 상황을 해결하는 데 다음 정보가 도움이 될 수도 있습니다:" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "망가진 꾸러미" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "다음 꾸러미를 더 설치할 것입니다:" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "제안하는 꾸러미:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "추천하는 꾸러미:" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "업그레이드를 계산하는 중입니다... " -#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99 +#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 msgid "Failed" msgstr "실패" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "완료" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 msgid "Must specify at least one package to fetch source for" msgstr "해당되는 소스 꾸러미를 가져올 꾸러미를 최소한 하나 지정해야 합니다" -#: cmdline/apt-get.cc:1872 cmdline/apt-get.cc:2079 +#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 #, c-format msgid "Unable to find a source package for %s" msgstr "%s의 소스 꾸러미를 찾을 수 없습니다" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, c-format msgid "You don't have enough free space in %s" msgstr "%s에 충분한 공간이 없습니다" -#: cmdline/apt-get.cc:1924 +#: cmdline/apt-get.cc:1933 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "소스 아카이브를 %s바이트/%s바이트 받아야 합니다.\n" -#: cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "소스 아카이브를 %s바이트 받아야 합니다.\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "%s 소스를 가져옵니다\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "일부 아카이브를 가져오는 데 실패했습니다." -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "%s에 이미 풀려 있는 소스의 압축을 풀지 않고 건너 뜁니다.\n" -#: cmdline/apt-get.cc:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "압축 풀기 명령 '%s' 실패.\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "빌드 명령 '%s' 실패.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "하위 프로세스가 실패했습니다" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 msgid "Must specify at least one package to check builddeps for" msgstr "해당되는 빌드 의존성을 검사할 꾸러미를 최소한 하나 지정해야 합니다" -#: cmdline/apt-get.cc:2084 +#: cmdline/apt-get.cc:2093 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s의 빌드 의존성 정보를 가져올 수 없습니다" -#: cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "%s 꾸러미에 빌드 의존성이 없습니다.\n" -#: cmdline/apt-get.cc:2156 +#: cmdline/apt-get.cc:2165 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1110,7 +1111,7 @@ msgstr "" "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 꾸러미를 찾을 수 없습니" "다" -#: cmdline/apt-get.cc:2208 +#: cmdline/apt-get.cc:2217 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1119,32 +1120,32 @@ msgstr "" "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 꾸러미의 사용 가능한 버" "전 중에서는 이 버전 요구사항을 만족시킬 수 없습니다" -#: cmdline/apt-get.cc:2243 +#: cmdline/apt-get.cc:2252 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "%2$s에 대한 %1$s 의존성을 만족시키는 데 실패했습니다: 설치한 %3$s 꾸러미가 너" "무 최근 버전입니다" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%2$s에 대한 %1$s 의존성을 만족시키는 데 실패했습니다: %3$s" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s의 빌드 의존성을 만족시키지 못했습니다." -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "빌드 의존성을 처리하는 데 실패했습니다" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "지원하는 모듈:" -#: cmdline/apt-get.cc:2359 +#: cmdline/apt-get.cc:2368 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1393,8 +1394,8 @@ msgid "Duplicate conf file %s/%s" msgstr "%s/%s 설정 파일이 중복되었습니다" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "%s 파일을 쓰는 데 실패했습니다" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1746,7 +1747,7 @@ msgstr "데이터 소켓 연결 시간 초과" msgid "Unable to accept connection" msgstr "연결을 받을 수 없습니다" -#: methods/ftp.cc:864 methods/http.cc:916 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "파일 해싱에 문제가 있습니다" @@ -1873,43 +1874,43 @@ msgstr "HTTP 서버에 범위 지원 기능이 잘못되어 있습니다" msgid "Unknown date format" msgstr "데이터 형식을 알 수 없습니다" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "select가 실패했습니다" -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "연결 시간이 초과했습니다" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "출력 파일에 쓰는 데 오류가 발생했습니다" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "파일에 쓰는 데 오류가 발생했습니다" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "해당 파일에 쓰는 데 오류가 발생했습니다" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "서버에서 읽고 연결을 닫는 데 오류가 발생했습니다" -#: methods/http.cc:834 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "서버에서 읽는 데 오류가 발생했습니다" -#: methods/http.cc:1065 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "헤더 데이터가 잘못되었습니다" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "연결이 실패했습니다" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "내부 오류" @@ -2442,11 +2443,11 @@ msgstr "소스 캐시를 저장하는 데 입출력 오류가 발생했습니다 msgid "rename failed, %s (%s -> %s)." msgstr "이름 바꾸기가 실패했습니다. %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:894 +#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 msgid "MD5Sum mismatch" msgstr "MD5Sum이 맞지 않습니다" -#: apt-pkg/acquire-item.cc:708 +#: apt-pkg/acquire-item.cc:714 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2455,7 +2456,7 @@ msgstr "" "%s 꾸러미의 파일을 찾을 수 없습니다. 수동으로 이 꾸러미를 고쳐야 할 수도 있습" "니다. (아키텍쳐가 빠졌기 때문입니다)" -#: apt-pkg/acquire-item.cc:761 +#: apt-pkg/acquire-item.cc:767 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2464,14 +2465,14 @@ msgstr "" "%s 꾸러미의 파일을 찾을 수 없습니다. 수동으로 이 꾸러미를 고쳐야 할 수도 있습" "니다." -#: apt-pkg/acquire-item.cc:797 +#: apt-pkg/acquire-item.cc:803 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "꾸러미 인덱스 파일이 손상되었습니다. %s 꾸러미에 Filename: 필드가 없습니다." -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "크기가 맞지 않습니다" diff --git a/po/nb.po b/po/nb.po index ff8fce4a2..ad66a1e9f 100644 --- a/po/nb.po +++ b/po/nb.po @@ -19,7 +19,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" "PO-Revision-Date: 2005-02-09 10:45+0100\n" "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n" "Language-Team: Norwegian Bokml <i18n-nb@lister.ping.ui.no>\n" @@ -162,7 +162,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545 -#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s for %s %s kompilert p %s %s\n" @@ -637,7 +637,7 @@ msgstr "Klarte ikke msgid "Y" msgstr "J" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 #, c-format msgid "Regex compilation error - %s" msgstr "Kompileringsfeil i regulrt uttrykk - %s" @@ -706,8 +706,9 @@ msgid "%s (due to %s) " msgstr "%s (pga. %s) " #: cmdline/apt-get.cc:544 +#, fuzzy msgid "" -"WARNING: The following essential packages will be removed\n" +"WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" "ADVARSEL: Flgende kjernepakker vil bli fjernet\n" @@ -786,11 +787,11 @@ msgstr "Det oppsto problemer og msgid "Packages need to be removed but remove is disabled." msgstr "Pakker trenges fjernes, men funksjonen er sltt av." -#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802 +#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 msgid "Unable to lock the download directory" msgstr "Klarer ikke lse nedlastingsmappa" -#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061 +#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Kan ikke lese kildlista." @@ -830,9 +831,9 @@ msgid "Yes, do as I say!" msgstr "Ja, gjr som jeg sier!" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, c-format msgid "" -"You are about to do something potentially harmful\n" +"You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" " ?] " msgstr "" @@ -848,7 +849,7 @@ msgstr "Avbryter." msgid "Do you want to continue [Y/n]? " msgstr "Vil du fortsette [Y/n]? " -#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959 +#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Klarte ikke skaffe %s %s\n" @@ -857,7 +858,7 @@ msgstr "Klarte ikke msgid "Some files failed to download" msgstr "Noen av filene kunne ikke lastes ned" -#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 msgid "Download complete and in download only mode" msgstr "Nedlasting fullfrt med innstillinga bare nedlasting" @@ -959,7 +960,7 @@ msgstr "Utvalgt versjon %s (%s) for %s\n" msgid "The update command takes no arguments" msgstr "Oppdaterings-kommandoen tar ingen argumenter" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "Kan ikke lse listemappa" @@ -975,21 +976,21 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "Intern feil - AllUpgrade dela noe" -#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498 +#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 #, c-format msgid "Couldn't find package %s" msgstr "Klarte ikke finne pakken %s" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Merk, velger %s istedenfor det regulre uttrykket %s\n" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1524 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Du vil kanskje utfre apt-get -f install for rette p disse:" -#: cmdline/apt-get.cc:1518 +#: cmdline/apt-get.cc:1527 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -997,7 +998,7 @@ msgstr "" "Uinnfridde avhengighetsforhold. Prv apt-get -f install uten pakker (eller " "angi en lsning)." -#: cmdline/apt-get.cc:1530 +#: cmdline/apt-get.cc:1539 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1009,7 +1010,7 @@ msgstr "" "at visse kjernepakker enn ikke er laget eller flyttet ut av Incoming for\n" "distribusjonen." -#: cmdline/apt-get.cc:1538 +#: cmdline/apt-get.cc:1547 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1019,112 +1020,112 @@ msgstr "" "at pakken helt enkelt ikke kan installeres, og du br fylle ut en " "feilmelding." -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "Flgende informasjon kan vre til hjelp med lse problemet:" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "delagte pakker" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "Flgende ekstra pakker vil bli installert." -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "Foresltte pakker:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "Anbefalte pakker" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "Beregner oppgradering... " -#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99 +#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 msgid "Failed" msgstr "Mislyktes" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "Utfrt" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 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:1872 cmdline/apt-get.cc:2079 +#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 #, c-format msgid "Unable to find a source package for %s" msgstr "Klarer ikke finne en kildekodepakke for %s" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, 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:1924 +#: cmdline/apt-get.cc:1933 #, 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:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Trenger skaffe %sB fra kildekodearkivet.\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "Skaffer kildekode %s\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "Klarte ikke skaffe alle arkivene." -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Omgr utpakking av allerede utpakket kilde i %s\n" -#: cmdline/apt-get.cc:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Utpakkingskommandoen %s mislyktes.\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "Byggekommandoen %s mislyktes.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "Barneprosessen mislyktes" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 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:2084 +#: cmdline/apt-get.cc:2093 #, 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:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "%s har ingen avhengigheter.\n" -#: cmdline/apt-get.cc:2156 +#: cmdline/apt-get.cc:2165 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "Kravet %s for %s kan ikke oppfylles fordi pakken %s ikke finnes" -#: cmdline/apt-get.cc:2208 +#: cmdline/apt-get.cc:2217 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1133,32 +1134,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:2243 +#: cmdline/apt-get.cc:2252 #, 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:2268 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Klarte ikke tilfredsstille %s avhengighet for %s: %s" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Klarte ikke tilfredstille bygg-avhengighetene for %s." -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "Klarte ikke behandle forutsetningene for bygging" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "Stttede moduler:" -#: cmdline/apt-get.cc:2359 +#: cmdline/apt-get.cc:2368 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1409,8 +1410,8 @@ msgid "Duplicate conf file %s/%s" msgstr "Dobbel oppsettsfil %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "Klarte ikke skrive fila %s" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1767,7 +1768,7 @@ msgstr "Tidsavbrudd p msgid "Unable to accept connection" msgstr "Klarte ikke godta tilkoblingen" -#: methods/ftp.cc:864 methods/http.cc:916 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem ved oppretting av nkkel for fil" @@ -1894,43 +1895,43 @@ msgstr "Denne HTTP-tjeneren har msgid "Unknown date format" msgstr "Ukjent datoformat" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "Utvalget mislykkes" -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "Tidsavbrudd p forbindelsen" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "Feil ved skriving til utfil" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "Feil ved skriving til fil" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "Feil ved skriving til fila" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "Feil ved lesing fra tjeneren. Forbindelsen ble lukket i andre enden" -#: methods/http.cc:834 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "Feil ved lesing fra tjeneren" -#: methods/http.cc:1065 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "delagte hodedata" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "Forbindelsen mislykkes" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "Intern feil" @@ -2465,11 +2466,11 @@ 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:235 apt-pkg/acquire-item.cc:894 +#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 msgid "MD5Sum mismatch" msgstr "Feil MD5sum" -#: apt-pkg/acquire-item.cc:708 +#: apt-pkg/acquire-item.cc:714 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2478,7 +2479,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:761 +#: apt-pkg/acquire-item.cc:767 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2487,13 +2488,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:797 +#: apt-pkg/acquire-item.cc:803 #, 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:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "Feil strrelse" diff --git a/po/nl.po b/po/nl.po index f0b90d9bf..48a2801f4 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: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" "PO-Revision-Date: 2005-02-10 17:35+0100\n" "Last-Translator: Bart Cornelis <cobaco@linux.be>\n" "Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n" @@ -148,7 +148,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545 -#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s voor %s %s gecompileerd op %s %s\n" @@ -627,7 +627,7 @@ msgstr "Hernoemen van %s naar %s is mislukt" msgid "Y" msgstr "J" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 #, c-format msgid "Regex compilation error - %s" msgstr "Regex-compilatiefout - %s" @@ -696,8 +696,9 @@ msgid "%s (due to %s) " msgstr "%s (wegens %s) " #: cmdline/apt-get.cc:544 +#, fuzzy msgid "" -"WARNING: The following essential packages will be removed\n" +"WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" "WAARSCHUWING: De volgende essentile pakketten zullen verwijderd worden\n" @@ -777,11 +778,11 @@ msgstr "Er zijn problemen en -y was gebruikt zonder --force-yes" msgid "Packages need to be removed but remove is disabled." msgstr "Pakketten moeten verwijderd worden maar verwijderen is uitgeschakeld." -#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802 +#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 msgid "Unable to lock the download directory" msgstr "Kon de ophaalmap niet vergrendelen" -#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061 +#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "De lijst van bronnen kon niet gelezen worden." @@ -820,9 +821,9 @@ msgid "Yes, do as I say!" msgstr "Ja, doe wat ik zeg!" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, c-format msgid "" -"You are about to do something potentially harmful\n" +"You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" " ?] " msgstr "" @@ -838,7 +839,7 @@ msgstr "Afbreken." msgid "Do you want to continue [Y/n]? " msgstr "Wilt u doorgaan [J/n]? " -#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959 +#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Ophalen van %s %s is mislukt\n" @@ -847,7 +848,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:977 cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 msgid "Download complete and in download only mode" msgstr "Ophalen klaar en alleen-ophalen-modus staat aan" @@ -951,7 +952,7 @@ msgstr "Versie %s (%s) geselecteerd voor %s\n" msgid "The update command takes no arguments" msgstr "De 'update'-opdracht aanvaard geen argumenten" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "Kon de lijst-map niet vergrendelen" @@ -967,23 +968,23 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "Interne fout, AllUpgrade heeft dingen stukgemaakt" -#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498 +#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 #, c-format msgid "Couldn't find package %s" msgstr "Kon pakket %s niet vinden" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, 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:1515 +#: cmdline/apt-get.cc:1524 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:1518 +#: cmdline/apt-get.cc:1527 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -991,7 +992,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:1530 +#: cmdline/apt-get.cc:1539 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1002,7 +1003,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:1538 +#: cmdline/apt-get.cc:1547 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1012,109 +1013,109 @@ msgstr "" "waarschijnlijk dat het pakket gewoon niet installeerbaar is. U kunt dan\n" "best een foutrapport indienen voor dit pakket." -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "De volgende informatie helpt u mogelijk verder:" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "Niet-werkende pakketten:" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "De volgende extra pakketten zullen genstalleerd worden:" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "Voorgestelde pakketten:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "Aanbevolen pakketten:" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "Opwaardering wordt doorgerekend... " -#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99 +#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 msgid "Failed" msgstr "Mislukt" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "Klaar" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 msgid "Must specify at least one package to fetch source for" msgstr "" "U dient minstens 1 pakket op te geven waarvan de broncode opgehaald " "moetworden" -#: cmdline/apt-get.cc:1872 cmdline/apt-get.cc:2079 +#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 #, c-format msgid "Unable to find a source package for %s" msgstr "Kan geen bronpakket vinden voor %s" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, 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:1924 +#: cmdline/apt-get.cc:1933 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Moet %sB/%sB aan bronarchieven ophalen.\n" -#: cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Moet %sB aan bronarchieven ophalen.\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "Ophalen bron %s\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "Ophalen van sommige archieven is mislukt." -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, 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:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Uitpakopdracht '%s' is mislukt.\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "Bouwopdracht '%s' is mislukt.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "Dochterproces is mislukt" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 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:2084 +#: cmdline/apt-get.cc:2093 #, 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:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "%s heeft geen bouwvereisten.\n" -#: cmdline/apt-get.cc:2156 +#: cmdline/apt-get.cc:2165 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1123,7 +1124,7 @@ msgstr "" "De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s " "onvindbaar is" -#: cmdline/apt-get.cc:2208 +#: cmdline/apt-get.cc:2217 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1132,32 +1133,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:2243 +#: cmdline/apt-get.cc:2252 #, 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: genstalleerde versie %s " "is te nieuw" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2277 #, 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:2282 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Bouwvereisten voor %s konden niet voldaan worden." -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "Verwerken van de bouwvereisten is mislukt" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "Ondersteunde modules:" -#: cmdline/apt-get.cc:2359 +#: cmdline/apt-get.cc:2368 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1417,8 +1418,8 @@ msgid "Duplicate conf file %s/%s" msgstr "Dubbel configuratiebestand %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "Wegschrijven van bestand %s is mislukt" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1775,7 +1776,7 @@ msgstr "Datasocket verbinding is verlopen" msgid "Unable to accept connection" msgstr "Kan de verbinding niet aanvaarden" -#: methods/ftp.cc:864 methods/http.cc:916 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Probleem bij het hashen van het bestand" @@ -1904,44 +1905,44 @@ msgstr "De bereik-ondersteuning van deze HTTP-server werkt niet" msgid "Unknown date format" msgstr "Onbekend datumformaat" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "Selectie is mislukt" -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "Verbinding verliep" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "Fout bij het schrijven naar het uitvoerbestand" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "Fout bij het schrijven naar bestand" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "Fout bij het schrijven naar het bestand" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "" "Fout bij het lezen van de server, andere kant heeft de verbinding gesloten" -#: methods/http.cc:834 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "Fout bij het lezen van de server" -#: methods/http.cc:1065 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "Foute koptekstdata" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "Verbinding mislukt" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "Interne fout" @@ -2489,11 +2490,11 @@ 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:235 apt-pkg/acquire-item.cc:894 +#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 msgid "MD5Sum mismatch" msgstr "MD5Sum komt niet overeen" -#: apt-pkg/acquire-item.cc:708 +#: apt-pkg/acquire-item.cc:714 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2502,7 +2503,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:761 +#: apt-pkg/acquire-item.cc:767 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2511,7 +2512,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:797 +#: apt-pkg/acquire-item.cc:803 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2519,7 +2520,7 @@ msgstr "" "De pakketindex-bestanden zijn beschadigd. Er is geen 'Filename:'-veld voor " "pakket %s." -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "Grootte komt niet overeen" diff --git a/po/nn.po b/po/nn.po index 4284ac7cd..6bd23e0f9 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: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" "PO-Revision-Date: 2005-02-14 23:30+0100\n" "Last-Translator: Hvard Korsvoll <korsvoll@skulelinux.no>\n" "Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n" @@ -151,7 +151,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545 -#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s for %s %s kompilert p %s %s\n" @@ -621,7 +621,7 @@ msgstr "Klarte ikkje endra namnet p msgid "Y" msgstr "J" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 #, c-format msgid "Regex compilation error - %s" msgstr "Regex-kompileringsfeil - %s" @@ -690,8 +690,9 @@ msgid "%s (due to %s) " msgstr "%s (fordi %s) " #: cmdline/apt-get.cc:544 +#, fuzzy msgid "" -"WARNING: The following essential packages will be removed\n" +"WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" "TVARING: Dei flgjande ndvendige pakkane vil verta fjerna.\n" @@ -771,11 +772,11 @@ msgstr "Det oppstod problem, og msgid "Packages need to be removed but remove is disabled." msgstr "Nokre pakkar m fjernast, men fjerning er sltt av." -#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802 +#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 msgid "Unable to lock the download directory" msgstr "Klarte ikkje lsa nedlastingskatalogen" -#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061 +#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Kjeldelista kan ikkje lesast." @@ -815,9 +816,9 @@ msgid "Yes, do as I say!" msgstr "Ja, gjer som eg seier!" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, c-format msgid "" -"You are about to do something potentially harmful\n" +"You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" " ?] " msgstr "" @@ -833,7 +834,7 @@ msgstr "Avbryt." msgid "Do you want to continue [Y/n]? " msgstr "Vil du halda fram [J/n]? " -#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959 +#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Klarte ikkje henta %s %s\n" @@ -842,7 +843,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:977 cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 msgid "Download complete and in download only mode" msgstr "Nedlastinga er ferdig i nedlastingsmodus" @@ -945,7 +946,7 @@ msgstr "Vald versjon %s (%s) for %s\n" msgid "The update command takes no arguments" msgstr "Oppdateringskommandoen tek ingen argument" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "Klarte ikkje lsa listekatalogen" @@ -961,22 +962,22 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "Intern feil. AllUpgrade ydelagde noko" -#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498 +#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 #, c-format msgid "Couldn't find package %s" msgstr "Fann ikkje pakken %s" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Merk, vel %s i staden for regex %s\n" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1524 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "Du vil kanskje prva retta p desse ved kyra apt-get -f install." -#: cmdline/apt-get.cc:1518 +#: cmdline/apt-get.cc:1527 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -984,7 +985,7 @@ msgstr "" "Nokre krav er ikkje oppfylte. Du kan prva apt-get -f install (eller velja " "ei lysing)." -#: cmdline/apt-get.cc:1530 +#: cmdline/apt-get.cc:1539 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -996,7 +997,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:1538 +#: cmdline/apt-get.cc:1547 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1006,112 +1007,112 @@ msgstr "" "pakken rett og slett ikkje lt seg installera. I sfall br du senda\n" "feilmelding." -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "Flgjande informasjon kan hjelpa med lysa situasjonen:" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "ydelagde pakkar" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "Dei flgjande tilleggspakkane vil verta installerte:" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "Fresltte pakkar:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "Tilrdde pakkar" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "Reknar ut oppgradering ... " -#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99 +#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 msgid "Failed" msgstr "Mislukkast" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "Ferdig" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 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:1872 cmdline/apt-get.cc:2079 +#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 #, c-format msgid "Unable to find a source package for %s" msgstr "Finn ingen kjeldepakke for %s" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, 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:1924 +#: cmdline/apt-get.cc:1933 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "M henta %sB/%sB med kjeldekodearkiv.\n" -#: cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "M henta %sB med kjeldekodearkiv.\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "Hent kjeldekode %s\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "Klarte ikkje henta nokre av arkiva." -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Hoppar over utpakking av kjeldekode som er utpakka fr fr i %s\n" -#: cmdline/apt-get.cc:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Utpakkingskommandoen %s mislukkast.\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "Byggjekommandoen %s mislukkast.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "Barneprosessen mislukkast" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 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:2084 +#: cmdline/apt-get.cc:2093 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Klarte ikkje henta byggjekrav for %s" -#: cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "%s har ingen byggjekrav.\n" -#: cmdline/apt-get.cc:2156 +#: cmdline/apt-get.cc:2165 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "Kravet %s for %s kan ikkje oppfyllast fordi pakken %s ikkje finst" -#: cmdline/apt-get.cc:2208 +#: cmdline/apt-get.cc:2217 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1120,31 +1121,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:2243 +#: cmdline/apt-get.cc:2252 #, 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:2268 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Klarte ikkje oppfylla kravet %s for %s: %s" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Byggjekrav for %s kunne ikkje tilfredstillast." -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "Klarte ikkje behandla byggjekrava" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "Sttta modular:" -#: cmdline/apt-get.cc:2359 +#: cmdline/apt-get.cc:2368 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1393,8 +1394,8 @@ msgid "Duplicate conf file %s/%s" msgstr "Dobbel oppsettsfil %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "Klarte ikkje skriva fila %s" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1750,7 +1751,7 @@ msgstr "Tidsavbrot p msgid "Unable to accept connection" msgstr "Klarte ikkje godta tilkoplinga" -#: methods/ftp.cc:864 methods/http.cc:916 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem ved oppretting av nkkel for fil" @@ -1877,43 +1878,43 @@ msgstr "Denne HTTP-tenaren har msgid "Unknown date format" msgstr "Ukjend datoformat" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "Utvalet mislukkast" -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "Tidsavbrot p sambandet" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "Feil ved skriving til utfil" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "Feil ved skriving til fil" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "Feil ved skriving til fila" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "Feil ved lesing fr tenaren. Sambandet vart lukka i andre enden" -#: methods/http.cc:834 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "Feil ved lesing fr tenaren" -#: methods/http.cc:1065 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "ydelagde hovuddata" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "Sambandet mislukkast" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "Intern feil" @@ -2448,11 +2449,11 @@ 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:235 apt-pkg/acquire-item.cc:894 +#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 msgid "MD5Sum mismatch" msgstr "Feil MD5-sum" -#: apt-pkg/acquire-item.cc:708 +#: apt-pkg/acquire-item.cc:714 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2461,7 +2462,7 @@ msgstr "" "Fann ikkje fila for pakken %s. Det kan henda du m fiksa denne pakken sjlv " "(fordi arkitekturen manglar)." -#: apt-pkg/acquire-item.cc:761 +#: apt-pkg/acquire-item.cc:767 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2469,14 +2470,14 @@ msgid "" msgstr "" "Fann ikkje fila for pakken %s. Det kan henda du m fiksa denne pakken sjlv." -#: apt-pkg/acquire-item.cc:797 +#: apt-pkg/acquire-item.cc:803 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Pakkeindeksfilene er ydelagde. Feltet Filename: manglar for pakken %s." -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "Feil storleik" diff --git a/po/pl.po b/po/pl.po index 26a5239b7..be2659af4 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: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" "PO-Revision-Date: 2005-02-11 11:47+0100\n" "Last-Translator: Bartosz Fenski <fenio@debian.org>\n" "Language-Team: Polish <pddp@debian.linux.org.pl>\n" @@ -149,7 +149,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545 -#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s dla %s %s skompilowany %s %s\n" @@ -624,7 +624,7 @@ msgstr "Nie uda msgid "Y" msgstr "T" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 #, c-format msgid "Regex compilation error - %s" msgstr "Bd kompilacji wyraenia regularnego - %s" @@ -693,8 +693,9 @@ msgid "%s (due to %s) " msgstr "%s (z powodu %s) " #: cmdline/apt-get.cc:544 +#, fuzzy msgid "" -"WARNING: The following essential packages will be removed\n" +"WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" "UWAGA: Zostan usunite nastpujce istotne pakiety\n" @@ -773,11 +774,11 @@ msgstr "By msgid "Packages need to be removed but remove is disabled." msgstr "Pakiety powinny zosta usunite, ale Remove jest wyczone." -#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802 +#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 msgid "Unable to lock the download directory" msgstr "Nie udao si zablokowa katalogu pobierania" -#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061 +#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Nie udao si odczyta list rde." @@ -816,9 +817,9 @@ msgid "Yes, do as I say!" msgstr "Tak, rb jak mwi!" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, c-format msgid "" -"You are about to do something potentially harmful\n" +"You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" " ?] " msgstr "" @@ -834,7 +835,7 @@ msgstr "Przerwane." msgid "Do you want to continue [Y/n]? " msgstr "Czy chcesz kontynuowa [T/n]? " -#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959 +#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Nie udao si pobra %s %s\n" @@ -843,7 +844,7 @@ msgstr "Nie uda msgid "Some files failed to download" msgstr "Nie udao si pobra niektrych plikw" -#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 msgid "Download complete and in download only mode" msgstr "Ukoczono pobieranie w trybie samego pobierania" @@ -946,7 +947,7 @@ msgstr "Wybrano wersj msgid "The update command takes no arguments" msgstr "Polecenie update nie wymaga adnych argumentw" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "Nie udao si zablokowa katalogu list" @@ -962,21 +963,21 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "Bd wewntrzny, AllUpgrade wszystko popsuo" -#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498 +#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 #, c-format msgid "Couldn't find package %s" msgstr "Nie udao si odnale pakietu %s" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Uwaga, wybieranie %s za wyraenie '%s'\n" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1524 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Naley uruchomi `apt-get -f install', aby je naprawi:" -#: cmdline/apt-get.cc:1518 +#: cmdline/apt-get.cc:1527 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -984,7 +985,7 @@ msgstr "" "Niespenione zalenoci. Sprbuj 'apt-get -f install' bez pakietw (lub " "podaj rozwizanie)." -#: cmdline/apt-get.cc:1530 +#: cmdline/apt-get.cc:1539 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -996,7 +997,7 @@ msgstr "" "niestabilnej, w ktrej niektre pakiety nie zostay jeszcze utworzone\n" "lub przeniesione z katalogu Incoming (\"Przychodzce\")." -#: cmdline/apt-get.cc:1538 +#: cmdline/apt-get.cc:1547 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1006,110 +1007,110 @@ msgstr "" "danego pakietu po prostu nie da si zainstalowa i naley zgosi w nim\n" "bd." -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "Nastpujce informacje mog pomc rozpozna sytuacj:" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "Pakiety s bdne" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "Zostan zainstalowane nastpujce dodatkowe pakiety:" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "Sugerowane pakiety:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "Polecane pakiety:" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "Obliczanie aktualizacji..." -#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99 +#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 msgid "Failed" msgstr "Nie udao si" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "Gotowe" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 msgid "Must specify at least one package to fetch source for" msgstr "" "Naley poda przynajmniej jeden pakiet, dla ktrego maj zosta pobrane " "rda" -#: cmdline/apt-get.cc:1872 cmdline/apt-get.cc:2079 +#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 #, c-format msgid "Unable to find a source package for %s" msgstr "Nie udao si odnale rda dla pakietu %s" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, c-format msgid "You don't have enough free space in %s" msgstr "W %s nie ma wystarczajcej iloci wolnego miejsca" -#: cmdline/apt-get.cc:1924 +#: cmdline/apt-get.cc:1933 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Konieczne pobranie %sB/%sB archiww rde.\n" -#: cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Konieczne pobranie %sB archiww rde.\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "Pobierz rdo %s\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "Nie udao si pobra niektrych archiww." -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Pomijanie rozpakowania ju rozpakowanego rda w %s\n" -#: cmdline/apt-get.cc:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Polecenie rozpakowania '%s' zawiodo.\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "Polecenie budowania '%s' zawiodo.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "Proces potomny zawid" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 msgid "Must specify at least one package to check builddeps for" msgstr "" "Naley poda przynajmniej jeden pakiet, dla ktrego maj zosta pakiety " "wymagane do budowania" -#: cmdline/apt-get.cc:2084 +#: cmdline/apt-get.cc:2093 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" "Nie udao si pobra informacji o zalenociach na czas budowania dla %s" -#: cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "%s nie ma zalenoci czasu budowania.\n" -#: cmdline/apt-get.cc:2156 +#: cmdline/apt-get.cc:2165 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1118,7 +1119,7 @@ msgstr "" "Zaleno %s od %s nie moe zosta speniona, poniewa nie znaleziono " "pakietu %s" -#: cmdline/apt-get.cc:2208 +#: cmdline/apt-get.cc:2217 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1127,32 +1128,32 @@ msgstr "" "Zaleno %s od %s nie moe zosta speniona, poniewa adna z dostpnych " "wersji pakietu %s nie ma odpowiedniej wersji" -#: cmdline/apt-get.cc:2243 +#: cmdline/apt-get.cc:2252 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Nie udao si speni zalenoci %s od %s: Zainstalowany pakiet %s jest zbyt " "nowy" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Nie udao si speni zalenoci %s od %s: %s" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Nie udao si speni zalenoci na czas budowania od %s." -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "Nie udao si przetworzy zalenoci na czas budowania" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "Obsugiwane moduy:" -#: cmdline/apt-get.cc:2359 +#: cmdline/apt-get.cc:2368 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1405,8 +1406,8 @@ msgid "Duplicate conf file %s/%s" msgstr "Zduplikowany plik konfiguracyjny %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "Nie udao si zapisa pliku %s" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1760,7 +1761,7 @@ msgstr "Przekroczony czas po msgid "Unable to accept connection" msgstr "Nie udao si przyj poczenia" -#: methods/ftp.cc:864 methods/http.cc:916 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Nie udao si obliczy skrtu pliku" @@ -1887,43 +1888,43 @@ msgstr "Ten serwer HTTP nieprawid msgid "Unknown date format" msgstr "Nieznany format daty" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "Operacja select nie powioda si" -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "Przekroczenie czasu poczenia" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "Bd przy pisaniu do pliku wyjciowego" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "Bd przy pisaniu do pliku" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "Bd przy pisaniu do pliku" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "Bd czytania z serwera: Zdalna strona zamkna poczenie" -#: methods/http.cc:834 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "Bd czytania z serwera" -#: methods/http.cc:1065 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "Bdne dane nagwka" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "Poczenie nie udao si" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "Bd wewntrzny" @@ -2463,11 +2464,11 @@ msgstr "B msgid "rename failed, %s (%s -> %s)." msgstr "nie udao si zmieni nazwy, %s (%s -> %s)" -#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:894 +#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 msgid "MD5Sum mismatch" msgstr "Bdna suma MD5" -#: apt-pkg/acquire-item.cc:708 +#: apt-pkg/acquire-item.cc:714 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2476,7 +2477,7 @@ msgstr "" "Nie udao si odnale pliku dla pakietu %s. Moe to oznacza, e trzeba " "bdzie rcznie naprawi ten pakiet (z powodu brakujcej architektury)." -#: apt-pkg/acquire-item.cc:761 +#: apt-pkg/acquire-item.cc:767 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2485,14 +2486,14 @@ msgstr "" "Nie udao si odnale pliku dla pakietu %s. Moe to oznacza, e trzeba " "bdzie rcznie naprawi ten pakiet." -#: apt-pkg/acquire-item.cc:797 +#: apt-pkg/acquire-item.cc:803 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Pliki indeksu pakietw s uszkodzone. Brak pola Filename: dla pakietu %s." -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "Bdny rozmiar" diff --git a/po/pt.po b/po/pt.po index 21912759b..84bc5b49d 100644 --- a/po/pt.po +++ b/po/pt.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" "PO-Revision-Date: 2005-03-07 22:20+0000\n" "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n" "Language-Team: Portuguese <traduz@debianpt.org>\n" @@ -148,7 +148,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545 -#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s para %s %s compilado em %s %s\n" @@ -620,7 +620,7 @@ msgstr "Falha ao renomear %s para %s" msgid "Y" msgstr "S" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 #, c-format msgid "Regex compilation error - %s" msgstr "Erro de compilação de regex - %s" @@ -689,8 +689,9 @@ msgid "%s (due to %s) " msgstr "%s (devido a %s) " #: cmdline/apt-get.cc:544 +#, fuzzy msgid "" -"WARNING: The following essential packages will be removed\n" +"WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" "AVISO: Os seguintes pacotes essenciais serão removidos\n" @@ -770,11 +771,11 @@ msgstr "Há problemas e -y foi usado sem --force-yes" msgid "Packages need to be removed but remove is disabled." msgstr "Pacotes precisam de ser removidos mas Remove está desabilitado." -#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802 +#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 msgid "Unable to lock the download directory" msgstr "Impossível criar lock no directório de download" -#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061 +#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "A lista de fontes não pôde ser lida." @@ -814,9 +815,9 @@ msgid "Yes, do as I say!" msgstr "Sim, faça como eu digo!" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, c-format msgid "" -"You are about to do something potentially harmful\n" +"You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" " ?] " msgstr "" @@ -832,7 +833,7 @@ msgstr "Abortado." msgid "Do you want to continue [Y/n]? " msgstr "Você deseja continuar [Y/n]? " -#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959 +#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Falha ao obter %s %s\n" @@ -841,7 +842,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:977 cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 msgid "Download complete and in download only mode" msgstr "Download completo e em modo de apenas download" @@ -944,7 +945,7 @@ msgstr "Versão seleccionada %s (%s) para %s\n" msgid "The update command takes no arguments" msgstr "O comando update não leva argumentos" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "Impossível criar lock no directório de listas" @@ -960,21 +961,21 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "Erro Interno, AllUpgrade estragou algo" -#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498 +#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 #, c-format msgid "Couldn't find package %s" msgstr "Impossível encontrar o pacote %s" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, 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:1515 +#: cmdline/apt-get.cc:1524 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:1518 +#: cmdline/apt-get.cc:1527 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -982,7 +983,7 @@ msgstr "" "Dependências não satisfeitas. Tente `apt-get -f install' sem nenhum pacote " "(ou especifique uma solução)." -#: cmdline/apt-get.cc:1530 +#: cmdline/apt-get.cc:1539 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -994,7 +995,7 @@ msgstr "" "distribuição instável, que alguns pacotes requesitados ainda não foram \n" "criados ou foram tirados do Incoming." -#: cmdline/apt-get.cc:1538 +#: cmdline/apt-get.cc:1547 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1005,109 +1006,109 @@ msgstr "" "de\n" "bug sobre esse pacote." -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "A seguinte informação pode ajudar a resolver a situação:" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "Pacotes estragados" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "Os seguintes pacotes extra serão instalados:" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "Pacotes sugeridos :" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "Pacotes recomendados :" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "Calculando Actualização... " -#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99 +#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 msgid "Failed" msgstr "Falhou" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "Pronto" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 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:1872 cmdline/apt-get.cc:2079 +#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 #, c-format msgid "Unable to find a source package for %s" msgstr "Impossível encontrar um pacote de código fonte para %s" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, 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:1924 +#: cmdline/apt-get.cc:1933 #, 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:1927 +#: cmdline/apt-get.cc:1936 #, 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:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "Obter Código Fonte %s\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "Falha ao obter alguns arquivos." -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, 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:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "O comando de descompactação '%s' falhou.\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "O comando de compilação '%s' falhou.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "O processo filho falhou" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 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:2084 +#: cmdline/apt-get.cc:2093 #, 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:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "%s não tem dependências de compilação.\n" -#: cmdline/apt-get.cc:2156 +#: cmdline/apt-get.cc:2165 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1116,7 +1117,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:2208 +#: cmdline/apt-get.cc:2217 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1125,32 +1126,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 requesitos de versão" -#: cmdline/apt-get.cc:2243 +#: cmdline/apt-get.cc:2252 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Falha ao satisfazer a dependência %s para %s: Pacote instalado %s é muito " "novo" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2277 #, 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:2282 +#: cmdline/apt-get.cc:2291 #, 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:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "Falha ao processar as dependências de compilação" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "Módulos Suportados:" -#: cmdline/apt-get.cc:2359 +#: cmdline/apt-get.cc:2368 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1404,8 +1405,8 @@ msgid "Duplicate conf file %s/%s" msgstr "Arquivo de configuração duplicado %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "Falha ao escrever ficheiro %s" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1551,8 +1552,8 @@ msgid "Internal error adding a diversion" msgstr "Erro Interno ao adicionar um desvio" #: apt-inst/deb/dpkgdb.cc:383 -msgid "The pkg cache must be initialize first" -msgstr "A cache de pacotes deve ser inicializada primeiro" +msgid "The pkg cache must be initialized first" +msgstr "A cache de pacotes tem de ser inicializada primeiro" #: apt-inst/deb/dpkgdb.cc:386 msgid "Reading file list" @@ -1758,7 +1759,7 @@ msgstr "Ligação de socket de dados expirou" msgid "Unable to accept connection" msgstr "Impossível aceitar ligação" -#: methods/ftp.cc:864 methods/http.cc:916 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problema fazendo o hash do ficheiro" @@ -1885,43 +1886,43 @@ msgstr "Este servidor http possui suporte a range errado" msgid "Unknown date format" msgstr "Formato de data desconhecido" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "Select falhou." -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "A ligação expirou" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "Erro gravando para ficheiro de saída" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "Erro gravando para ficheiro" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "Erro gravando para o ficheiro" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "Erro lendo do servidor. O Remoto fechou a ligação" -#: methods/http.cc:834 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "Erro lendo do servidor" -#: methods/http.cc:1065 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "Dados de cabeçalho errados" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "Falhou a ligação" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "Erro interno" @@ -2383,37 +2384,37 @@ msgstr "A Cache possui um sistema de versões incompatível" #: apt-pkg/pkgcachegen.cc:117 #, c-format -msgid "Error occured while processing %s (NewPackage)" +msgid "Error occurred while processing %s (NewPackage)" msgstr "Um erro ocorreu ao processar %s (NovoPacote)" #: apt-pkg/pkgcachegen.cc:129 #, c-format -msgid "Error occured while processing %s (UsePackage1)" +msgid "Error occurred while processing %s (UsePackage1)" msgstr "Um erro ocorreu ao processar %s (UsePacote1)" #: apt-pkg/pkgcachegen.cc:150 #, c-format -msgid "Error occured while processing %s (UsePackage2)" +msgid "Error occurred while processing %s (UsePackage2)" msgstr "Um erro ocorreu ao processar %s (UsePacote2)" #: apt-pkg/pkgcachegen.cc:154 #, c-format -msgid "Error occured while processing %s (NewFileVer1)" +msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Um erro ocorreu ao processar %s (NovoArquivoVer1)" #: apt-pkg/pkgcachegen.cc:184 #, c-format -msgid "Error occured while processing %s (NewVersion1)" +msgid "Error occurred while processing %s (NewVersion1)" msgstr "Um erro ocorreu ao processar %s (NovaVersão1)" #: apt-pkg/pkgcachegen.cc:188 #, c-format -msgid "Error occured while processing %s (UsePackage3)" +msgid "Error occurred while processing %s (UsePackage3)" msgstr "Um erro ocorreu ao processar %s (UsePacote3)" #: apt-pkg/pkgcachegen.cc:192 #, c-format -msgid "Error occured while processing %s (NewVersion2)" +msgid "Error occurred while processing %s (NewVersion2)" msgstr "Um erro ocorreu ao processar %s (NovaVersão2)" #: apt-pkg/pkgcachegen.cc:207 @@ -2434,12 +2435,12 @@ msgstr "" #: apt-pkg/pkgcachegen.cc:241 #, c-format -msgid "Error occured while processing %s (FindPkg)" +msgid "Error occurred while processing %s (FindPkg)" msgstr "Um erro ocorreu ao processar %s (FindPkg)" #: apt-pkg/pkgcachegen.cc:254 #, c-format -msgid "Error occured while processing %s (CollectFileProvides)" +msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Um erro ocorreu ao processar %s (CollectFileProvides)" #: apt-pkg/pkgcachegen.cc:260 @@ -2602,54 +2603,35 @@ msgstr "" "Escreveu %i registos com %i ficheiros em falta e %i ficheiros não " "coincidentes\n" -#: apt-inst/deb/dpkgdb.cc:383 -msgid "The pkg cache must be initialized first" -msgstr "A cache de pacotes tem de ser inicializada primeiro" +#~ msgid "The pkg cache must be initialize first" +#~ msgstr "A cache de pacotes deve ser inicializada primeiro" -#: apt-pkg/pkgcachegen.cc:117 -#, c-format -msgid "Error occurred while processing %s (NewPackage)" -msgstr "Um erro ocorreu ao processar %s (NovoPacote)" +#~ msgid "Error occured while processing %s (NewPackage)" +#~ msgstr "Um erro ocorreu ao processar %s (NovoPacote)" -#: apt-pkg/pkgcachegen.cc:129 -#, c-format -msgid "Error occurred while processing %s (UsePackage1)" -msgstr "Um erro ocorreu ao processar %s (UsePacote1)" +#~ msgid "Error occured while processing %s (UsePackage1)" +#~ msgstr "Um erro ocorreu ao processar %s (UsePacote1)" -#: apt-pkg/pkgcachegen.cc:150 -#, c-format -msgid "Error occurred while processing %s (UsePackage2)" -msgstr "Um erro ocorreu ao processar %s (UsePacote2)" +#~ msgid "Error occured while processing %s (UsePackage2)" +#~ msgstr "Um erro ocorreu ao processar %s (UsePacote2)" -#: apt-pkg/pkgcachegen.cc:154 -#, c-format -msgid "Error occurred while processing %s (NewFileVer1)" -msgstr "Um erro ocorreu ao processar %s (NovoArquivoVer1)" +#~ msgid "Error occured while processing %s (NewFileVer1)" +#~ msgstr "Um erro ocorreu ao processar %s (NovoArquivoVer1)" -#: apt-pkg/pkgcachegen.cc:184 -#, c-format -msgid "Error occurred while processing %s (NewVersion1)" -msgstr "Um erro ocorreu ao processar %s (NovaVersão1)" +#~ msgid "Error occured while processing %s (NewVersion1)" +#~ msgstr "Um erro ocorreu ao processar %s (NovaVersão1)" -#: apt-pkg/pkgcachegen.cc:188 -#, c-format -msgid "Error occurred while processing %s (UsePackage3)" -msgstr "Um erro ocorreu ao processar %s (UsePacote3)" +#~ msgid "Error occured while processing %s (UsePackage3)" +#~ msgstr "Um erro ocorreu ao processar %s (UsePacote3)" -#: apt-pkg/pkgcachegen.cc:192 -#, c-format -msgid "Error occurred while processing %s (NewVersion2)" -msgstr "Um erro ocorreu ao processar %s (NovaVersão2)" +#~ msgid "Error occured while processing %s (NewVersion2)" +#~ msgstr "Um erro ocorreu ao processar %s (NovaVersão2)" -#: apt-pkg/pkgcachegen.cc:241 -#, c-format -msgid "Error occurred while processing %s (FindPkg)" -msgstr "Um erro ocorreu ao processar %s (FindPkg)" +#~ msgid "Error occured while processing %s (FindPkg)" +#~ msgstr "Um erro ocorreu ao processar %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:254 -#, c-format -msgid "Error occurred while processing %s (CollectFileProvides)" -msgstr "Um erro ocorreu ao processar %s (CollectFileProvides)" +#~ msgid "Error occured while processing %s (CollectFileProvides)" +#~ msgstr "Um erro ocorreu ao processar %s (CollectFileProvides)" #~ msgid "Unknown vendor ID '%s' in line %u of source list %s" #~ msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index 8e1525db7..968259925 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -7,12 +7,12 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-29 07:17+0200\n" -"PO-Revision-Date: 2005-02-13 15:18-0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" +"PO-Revision-Date: 2005-06-16 10:24-0300\n" "Last-Translator: Andr Lus Lopes <andrelop@debian.org>\n" "Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=iso-8859-1\n" +"Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" #: cmdline/apt-cache.cc:135 @@ -149,7 +149,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545 -#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s para %s %s compilado em %s %s\n" @@ -325,7 +325,6 @@ msgid "Error processing contents %s" msgstr "Erro processando Contedo %s" #: ftparchive/apt-ftparchive.cc:551 -#, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -378,7 +377,7 @@ msgstr "" "suporta muitos estilos de gerao, desde totalmente automatizadas at \n" "substitutos funcionais para o dpkg-scanpackages e dpkg-scansources\n" "\n" -"O apt-ftparchive gera arquivos Packages a partir de uma rvore de .debs.\n" +"O apt-ftparchive gera arquivos Package a partir de uma rvore de .debs.\n" " O arquivo Package contm o contedo de todos os campos control de \n" "cada pacote bem como o hash MD5 e tamanho de arquivo. Um arquivo \n" "override suportado para forar o valor de Priority e Section.\n" @@ -623,7 +622,7 @@ msgstr "Falha ao renomear %s para %s" msgid "Y" msgstr "S" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 #, c-format msgid "Regex compilation error - %s" msgstr "Erro de compilao de regex - %s" @@ -692,8 +691,9 @@ msgid "%s (due to %s) " msgstr "%s (por causa de %s) " #: cmdline/apt-get.cc:544 +#, fuzzy msgid "" -"WARNING: The following essential packages will be removed\n" +"WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" "AVISO: Os pacotes essenciais a seguir sero removidos\n" @@ -772,11 +772,11 @@ msgstr "H msgid "Packages need to be removed but remove is disabled." msgstr "Pacotes precisam ser removidos mas a remoo est desabilitada." -#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802 +#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 msgid "Unable to lock the download directory" msgstr "Impossvel criar lock no diretrio de download" -#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061 +#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "A lista de fontes no pde ser lida." @@ -816,9 +816,9 @@ msgid "Yes, do as I say!" msgstr "Sim, faa o que eu digo!" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, c-format msgid "" -"You are about to do something potentially harmful\n" +"You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" " ?] " msgstr "" @@ -834,7 +834,7 @@ msgstr "Abortado." msgid "Do you want to continue [Y/n]? " msgstr "Quer continuar [S/n] ? " -#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959 +#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Falha ao baixar %s %s\n" @@ -843,7 +843,7 @@ msgstr "Falha ao baixar %s %s\n" msgid "Some files failed to download" msgstr "Alguns arquivos falharam ao baixar" -#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 msgid "Download complete and in download only mode" msgstr "Download completo e em modo de apenas download" @@ -946,7 +946,7 @@ msgstr "Vers msgid "The update command takes no arguments" msgstr "O comando update no leva argumentos" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "Impossvel criar lock no diretrio de listas" @@ -962,21 +962,21 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "Erro Interno, AllUpgrade quebrou as coisas" -#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498 +#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 #, c-format msgid "Couldn't find package %s" msgstr "Impossvel achar pacote %s" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Nota, selecionando %s para expresso regular '%s'\n" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1524 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Voc deve querer rodar `apt-get -f install' para corrigir isso:" -#: cmdline/apt-get.cc:1518 +#: cmdline/apt-get.cc:1527 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -984,7 +984,7 @@ msgstr "" "Dependncias desencontradas. Tente `apt-get -f install' sem nenhum pacote " "(ou especifique uma soluo)." -#: cmdline/apt-get.cc:1530 +#: cmdline/apt-get.cc:1539 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -996,7 +996,7 @@ msgstr "" "distribuio instvel, que alguns pacotes requeridos no foram \n" "criados ainda ou foram tirados do Incoming." -#: cmdline/apt-get.cc:1538 +#: cmdline/apt-get.cc:1547 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1006,107 +1006,107 @@ msgstr "" "esteja simplesmente no instalvel e um relato de erro sobre esse\n" "pacotes deve ser enviado." -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "A informao a seguir pode ajudar a resolver a situao:" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "Pacotes quebrados" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "Os pacotes extra a seguir sero instalados:" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "Pacotes sugeridos :" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "Pacotes recomendados :" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "Calculando Atualizao... " -#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99 +#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 msgid "Failed" msgstr "Falhou" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "Pronto" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 msgid "Must specify at least one package to fetch source for" msgstr "Deve-se especificar pelo menos um pacote para que se baixe o fonte" -#: cmdline/apt-get.cc:1872 cmdline/apt-get.cc:2079 +#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 #, c-format msgid "Unable to find a source package for %s" msgstr "Impossvel encontrar um pacote fonte para %s" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, c-format msgid "You don't have enough free space in %s" msgstr "Voc no possui espao livre suficiente em %s" -#: cmdline/apt-get.cc:1924 +#: cmdline/apt-get.cc:1933 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Preciso pegar %sB/%sB de arquivos fonte.\n" -#: cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Precisa obter %sB de arquivos fonte.\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "Obter Fonte %s\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "Falha ao fazer o download de alguns arquivos." -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Pulando desempacotamento de pacote fonte j desempacotado em %s\n" -#: cmdline/apt-get.cc:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Comando de desempacotamento '%s' falhou.\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "Comando de construo '%s' falhou.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "Processo filho falhou" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 msgid "Must specify at least one package to check builddeps for" msgstr "" "Deve-se especificar pelo menos um pacote para que se cheque as dependncias " "de construo" -#: cmdline/apt-get.cc:2084 +#: cmdline/apt-get.cc:2093 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Impossvel conseguir informaes de dependncia de construo para %s" -#: cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "%s no tem dependncias de construo.\n" -#: cmdline/apt-get.cc:2156 +#: cmdline/apt-get.cc:2165 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1115,7 +1115,7 @@ msgstr "" "a dependncia de %s por %s no pde ser satisfeita porque o pacote %s no " "pde ser encontrado" -#: cmdline/apt-get.cc:2208 +#: cmdline/apt-get.cc:2217 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1124,32 +1124,32 @@ msgstr "" "a dependncia de %s por %s no pode ser satisfeita porque nenhuma verso " "disponvel do pacote %s pode satisfazer os requerimentos de verso" -#: cmdline/apt-get.cc:2243 +#: cmdline/apt-get.cc:2252 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Falha ao satisfazer a dependncia %s para %s: Pacote instalado %s muito " "novo" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Falha ao satisfazer dependncia %s para %s: %s" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "No foi possvel satisfazer as dependncias de compilao para %s." -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "Falha ao processar as dependncias de construo" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "Mdulos Suportados:" -#: cmdline/apt-get.cc:2359 +#: cmdline/apt-get.cc:2368 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1402,8 +1402,8 @@ msgid "Duplicate conf file %s/%s" msgstr "Arquivo de confgiurao duplicado %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "Falha ao gravar arquivo %s" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1549,6 +1549,7 @@ msgid "Internal error adding a diversion" msgstr "Erro Interno ao adicionar um desvio" #: apt-inst/deb/dpkgdb.cc:383 +#, fuzzy msgid "The pkg cache must be initialized first" msgstr "O cache de pacotes deve ser inicializado primeiro" @@ -1758,7 +1759,7 @@ msgstr "Conex msgid "Unable to accept connection" msgstr "Impossvel aceitar conexo" -#: methods/ftp.cc:864 methods/http.cc:916 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problema fazendo o hash do arquivo" @@ -1885,43 +1886,43 @@ msgstr "Este servidor http possui suporte a range quebrado" msgid "Unknown date format" msgstr "Formato de data desconhecido" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "Seleo falhou." -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "Conexo expirou" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "Erro gravando para arquivo de sada" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "Erro gravando para arquivo" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "Erro gravando para o arquivo" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "Erro lendo do servidor Ponto remoto fechou a conexo" -#: methods/http.cc:834 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "Erro lendo do servidor" -#: methods/http.cc:1065 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "Dados de cabealho ruins" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "Conexo falhou." -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "Erro interno" @@ -2383,37 +2384,37 @@ msgid "Cache has an incompatible versioning system" msgstr "O Cache possui um sistema de verses incompatvel" #: apt-pkg/pkgcachegen.cc:117 -#, c-format +#, fuzzy, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Um erro ocorreu processando %s (NovoPacote)" #: apt-pkg/pkgcachegen.cc:129 -#, c-format +#, fuzzy, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Um erro ocorreu processando %s (UsePacote1)" #: apt-pkg/pkgcachegen.cc:150 -#, c-format +#, fuzzy, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Um erro ocorreu processando %s (UsePacote2)" #: apt-pkg/pkgcachegen.cc:154 -#, c-format +#, fuzzy, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Um erro ocorreu processando %s (NovoArquivoVer1)" #: apt-pkg/pkgcachegen.cc:184 -#, c-format +#, fuzzy, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Um erro ocorreu processando %s (NovaVerso1)" #: apt-pkg/pkgcachegen.cc:188 -#, c-format +#, fuzzy, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Um erro ocorreu processando %s (UsePacote3)" #: apt-pkg/pkgcachegen.cc:192 -#, c-format +#, fuzzy, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Um erro ocorreu processando %s (NovaVerso2)" @@ -2434,12 +2435,12 @@ msgstr "" "Ops, voc excedeu o nmero de dependncias que este APT capaz de suportar." #: apt-pkg/pkgcachegen.cc:241 -#, c-format +#, fuzzy, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Um erro ocorreu processando %s (FindPkg)" #: apt-pkg/pkgcachegen.cc:254 -#, c-format +#, fuzzy, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Um erro ocorreu processando %s (CollectFileProvides)" @@ -2466,11 +2467,11 @@ msgstr "Erro de I/O ao gravar cache fonte" msgid "rename failed, %s (%s -> %s)." msgstr "renomeao falhou, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:894 +#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 msgid "MD5Sum mismatch" msgstr "MD5Sum incorreto" -#: apt-pkg/acquire-item.cc:708 +#: apt-pkg/acquire-item.cc:714 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2480,7 +2481,7 @@ msgstr "" "que voc precisa consertar manualmente este pacote. (devido a arquitetura " "no especificada)." -#: apt-pkg/acquire-item.cc:761 +#: apt-pkg/acquire-item.cc:767 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2489,7 +2490,7 @@ msgstr "" "No foi possvel localizar arquivo para o pacote %s. Isto pode significar " "que voc precisa consertar manualmente este pacote." -#: apt-pkg/acquire-item.cc:797 +#: apt-pkg/acquire-item.cc:803 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2497,7 +2498,7 @@ msgstr "" "Os arquivos de ndice de pacotes esto corrompidos. Nenhum campo Filename: " "para o pacote %s." -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "Tamanho incorreto" diff --git a/po/ro.po b/po/ro.po index 714787236..30546b718 100644 --- a/po/ro.po +++ b/po/ro.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_ro\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" "PO-Revision-Date: 2004-11-16 01:22+0200\n" "Last-Translator: Sorin Batariuc <sorin@bonbon.net>\n" "Language-Team: Romanian <romanian>\n" @@ -149,7 +149,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545 -#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s pentru %s %s compilat pe %s %s\n" @@ -629,7 +629,7 @@ msgstr "Eşuare în a redenumi %s în %s" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 #, c-format msgid "Regex compilation error - %s" msgstr "Eroare de compilare regex - %s" @@ -698,8 +698,9 @@ msgid "%s (due to %s) " msgstr "%s (datorită %s) " #: cmdline/apt-get.cc:544 +#, fuzzy msgid "" -"WARNING: The following essential packages will be removed\n" +"WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" "AVERTISMENT: Următoarele pachete esenţiale vor fi şterse\n" @@ -779,11 +780,11 @@ msgstr "Sunt unele probleme şi -y a fost folosit fără --force-yes" msgid "Packages need to be removed but remove is disabled." msgstr "Pachete trebuiesc şterse dar ştergerea este dezactivată." -#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802 +#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 msgid "Unable to lock the download directory" msgstr "Nu pot încuia directorul de descărcare" -#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061 +#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Lista surselor nu poate fi citită." @@ -823,9 +824,9 @@ msgid "Yes, do as I say!" msgstr "Da, fă cum îţi spun!" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, c-format msgid "" -"You are about to do something potentially harmful\n" +"You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" " ?] " msgstr "" @@ -842,7 +843,7 @@ msgstr "Renunţare." msgid "Do you want to continue [Y/n]? " msgstr "Vreţi să continuaţi? [Y/n] " -#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959 +#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Eşuare în aducerea %s %s\n" @@ -851,7 +852,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:977 cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 msgid "Download complete and in download only mode" msgstr "Descărcare completă şi în modul doar descărcare" @@ -952,7 +953,7 @@ msgstr "Versiune selectată %s (%s) pentru %s\n" msgid "The update command takes no arguments" msgstr "Comanda de actualizare nu are argumente" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "Nu pot încuia directorul cu lista" @@ -968,21 +969,21 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "Eroare internă, înnoire totală a defectat diverse chestiuni" -#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498 +#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 #, c-format msgid "Couldn't find package %s" msgstr "Nu pot găsi pachetul %s" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Notă, selectare %s pentru regex '%s'\n" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1524 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Aţi putea porni 'apt-get -f install' pentru a corecta acestea:" -#: cmdline/apt-get.cc:1518 +#: cmdline/apt-get.cc:1527 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -990,7 +991,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:1530 +#: cmdline/apt-get.cc:1539 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1003,7 +1004,7 @@ msgstr "" "pachete\n" "cerute n-au fost create încă sau au fost mutate din Incoming." -#: cmdline/apt-get.cc:1538 +#: cmdline/apt-get.cc:1547 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1013,107 +1014,107 @@ 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:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "Următoarele informaţii ar putea să vă ajute la rezolvarea situaţiei:" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "Pachete deteriorate" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "Următoarele extra pachete vor fi instalate:" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "Pachete sugerate:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "Pachete recomandate:" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "Calculez înnoirea... " -#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99 +#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 msgid "Failed" msgstr "Eşuare" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "Gata" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 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:1872 cmdline/apt-get.cc:2079 +#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 #, c-format msgid "Unable to find a source package for %s" msgstr "Nu pot găsi o sursă pachet pentru %s" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, 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:1924 +#: cmdline/apt-get.cc:1933 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Este nevoie de %sB/%sB din arhivele surselor.\n" -#: cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Este nevoie de %sB din arhivele surselor.\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "Aducere sursa %s\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "Eşuare în a aduce unele arhive." -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, 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:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Comanda de despachetare '%s' eşuată.\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "Comanda de construire '%s' eşuată.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "Eşuare proces copil" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 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:2084 +#: cmdline/apt-get.cc:2093 #, 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:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "%s nu are dependenţe înglobate.\n" -#: cmdline/apt-get.cc:2156 +#: cmdline/apt-get.cc:2165 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1122,7 +1123,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:2208 +#: cmdline/apt-get.cc:2217 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1131,32 +1132,32 @@ msgstr "" "Dependenţa lui %s de %s nu poate fi satisfăcută deoarece nici o versiune " "disponibilă a pachetului %s nu poate satisface cererile de versiuni" -#: cmdline/apt-get.cc:2243 +#: cmdline/apt-get.cc:2252 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Eşuare în a satisface dependenţa lui %s de %s: Pachetul instalat %s este " "prea nou" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2277 #, 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:2282 +#: cmdline/apt-get.cc:2291 #, 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:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "Eşuare în a prelucra dependenţele înglobate" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "Module suportate:" -#: cmdline/apt-get.cc:2359 +#: cmdline/apt-get.cc:2368 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1411,8 +1412,8 @@ msgid "Duplicate conf file %s/%s" msgstr "Fişier de configurare duplicat %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "Eşuare în a scrie fişierul %s" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1768,7 +1769,7 @@ msgstr "Timp de conectare data socket expirat" msgid "Unable to accept connection" msgstr "Nu pot accepta conexiune" -#: methods/ftp.cc:864 methods/http.cc:916 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problemă la criptarea fişierului" @@ -1895,44 +1896,44 @@ msgstr "Acest server http are zonă de suport necorespunzătoare" msgid "Unknown date format" msgstr "Format de date necunoscut" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "Eşuarea selecţiei" -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "Timp de conectare expirat" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "Eroare la scrierea fişierului de rezultat" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "Eroare la scrierea în fişier" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "Eroare la scrierea în fişierul" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "" "Eroare la citirea de pe server, conexiunea a fost închisă de la distanţă" -#: methods/http.cc:834 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "Eroare la citirea de pe server" -#: methods/http.cc:1065 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "Antet de date necorespunzător" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "Conectare eşuată" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "Eroare internă" @@ -2476,11 +2477,11 @@ 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:235 apt-pkg/acquire-item.cc:894 +#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 msgid "MD5Sum mismatch" msgstr "Nepotrivire MD5Sum" -#: apt-pkg/acquire-item.cc:708 +#: apt-pkg/acquire-item.cc:714 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2489,7 +2490,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 (din pricina unui arch lipsă)" -#: apt-pkg/acquire-item.cc:761 +#: apt-pkg/acquire-item.cc:767 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2498,7 +2499,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:797 +#: apt-pkg/acquire-item.cc:803 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2506,7 +2507,7 @@ msgstr "" "Fişierele index de pachete sunt deteriorate. Fără câmpul 'nume fişier:' la " "pachetul %s." -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "Nepotrivire dimensiune" diff --git a/po/ru.po b/po/ru.po index de0660f8c..5b36cc5ef 100644 --- a/po/ru.po +++ b/po/ru.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-ru\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" "PO-Revision-Date: 2005-02-09 19:50+0400\n" "Last-Translator: Yuri Kozlov <yuray@id.ru>\n" "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n" @@ -161,7 +161,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545 -#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s для %s %s скомпилирован %s %s\n" @@ -644,7 +644,7 @@ msgstr "Не удалось переименовать %s в %s" msgid "Y" msgstr "д" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 #, c-format msgid "Regex compilation error - %s" msgstr "Ошибка компиляции регулярного выражения - %s" @@ -714,8 +714,9 @@ msgid "%s (due to %s) " msgstr "%s (вследствие %s) " #: cmdline/apt-get.cc:544 +#, fuzzy msgid "" -"WARNING: The following essential packages will be removed\n" +"WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" "ВНИМАНИЕ: Эти существенно важные пакеты будут удалены\n" @@ -796,11 +797,11 @@ msgstr "Существуют проблемы, а опция -y использо msgid "Packages need to be removed but remove is disabled." msgstr "Пакеты необходимо удалить, но удаление запрещено." -#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802 +#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 msgid "Unable to lock the download directory" msgstr "Невозможно заблокировать каталог для загрузки" -#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061 +#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Не читается перечень источников." @@ -843,9 +844,9 @@ msgid "Yes, do as I say!" msgstr "Да, делать, как я скажу!" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, c-format msgid "" -"You are about to do something potentially harmful\n" +"You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" " ?] " msgstr "" @@ -861,7 +862,7 @@ msgstr "Аварийное завершение." msgid "Do you want to continue [Y/n]? " msgstr "Хотите продолжить [Д/н]? " -#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959 +#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Не удалось загрузить %s %s\n" @@ -870,7 +871,7 @@ msgstr "Не удалось загрузить %s %s\n" msgid "Some files failed to download" msgstr "Некоторые файлы не удалось загрузить" -#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 msgid "Download complete and in download only mode" msgstr "Указан режим \"только загрузка\", и загрузка завершена" @@ -972,7 +973,7 @@ msgstr "Выбрана версия %s (%s) для %s\n" msgid "The update command takes no arguments" msgstr "Команде update не нужны аргументы" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "Невозможно заблокировать каталог со списками пакетов" @@ -988,23 +989,23 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "Внутренняя ошибка, AllUpgrade все поломал" -#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498 +#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 #, c-format msgid "Couldn't find package %s" msgstr "Не могу найти пакет %s" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Заметьте, регулярное выражение %2$s приводит к выбору %1$s\n" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1524 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "Возможно, для исправления этих ошибок вы захотите воспользоваться `apt-get -" "f install':" -#: cmdline/apt-get.cc:1518 +#: cmdline/apt-get.cc:1527 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1012,7 +1013,7 @@ msgstr "" "Неудовлетворённые зависимости. Попытайтесь выполнить 'apt-get -f install', " "не указывая имени пакета, (или найдите другое решение)." -#: cmdline/apt-get.cc:1530 +#: cmdline/apt-get.cc:1539 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1023,7 +1024,7 @@ msgstr "" "или же используете нестабильного дистрибутив, и запрошенные Вами пакеты\n" "ещё не созданы или были удалены из Incoming." -#: cmdline/apt-get.cc:1538 +#: cmdline/apt-get.cc:1547 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1033,111 +1034,111 @@ msgstr "" "пакет просто не может быть установлен из-за ошибок в самом пакете.\n" "Необходимо послать отчёт об этой ошибке." -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "Следующая информация возможно поможет Вам:" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "Сломанные пакеты" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "Будут установлены следующие дополнительные пакеты:" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "Настойчиво рекомендуемые пакеты:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "Рекомендуемые пакеты:" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "Рассчёт обновлений... " -#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99 +#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 msgid "Failed" msgstr "Неудачно" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "Готово" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 msgid "Must specify at least one package to fetch source for" msgstr "" "Укажите как минимум один пакет, для которого необходимо загрузить исходные " "тексты" -#: cmdline/apt-get.cc:1872 cmdline/apt-get.cc:2079 +#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 #, c-format msgid "Unable to find a source package for %s" msgstr "Невозможно найти пакет с исходными текстами для %s" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, c-format msgid "You don't have enough free space in %s" msgstr "Недостаточно места в %s" -#: cmdline/apt-get.cc:1924 +#: cmdline/apt-get.cc:1933 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Необходимо загрузить %sB/%sB из архивов исходных текстов.\n" -#: cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Нужно загрузить %sB архивов с исходными текстами.\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "Загрузка исходных текстов %s\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "Некоторые архивы не удалось загрузить." -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "Распаковка исходных текстов пропущена, так как в %s уже находятся " "распакованные исходные тексты\n" -#: cmdline/apt-get.cc:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Команда распаковки '%s' завершилась неудачно.\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "Команда сборки '%s' завершилась неудачно.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "Порождённый процесс завершился неудачно" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 msgid "Must specify at least one package to check builddeps for" msgstr "" "Для проверки зависимостей для сборки необходимо указать как минимум один " "пакет" -#: cmdline/apt-get.cc:2084 +#: cmdline/apt-get.cc:2093 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Невозможно получить информацию о зависимостях для сборки %s" -#: cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "%s не имеет зависимостей для сборки.\n" -#: cmdline/apt-get.cc:2156 +#: cmdline/apt-get.cc:2165 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1146,7 +1147,7 @@ msgstr "" "Зависимость типа %s для %s не может быть удовлетворена, так как пакет %s не " "найден" -#: cmdline/apt-get.cc:2208 +#: cmdline/apt-get.cc:2217 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1155,32 +1156,32 @@ msgstr "" "Зависимость типа %s для %s не может быть удовлетворена, поскольку ни одна из " "версий пакета %s не удовлетворяет требованиям" -#: cmdline/apt-get.cc:2243 +#: cmdline/apt-get.cc:2252 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Не удалось удовлетворить зависимость типа %s для пакета %s: Установленный " "пакет %s новее, чем надо" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Невозможно удовлетворить зависимость типа %s для пакета %s: %s" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Зависимости для сборки %s не могут быть удовлетворены." -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "Обработка зависимостей для сборки завершилась неудачно" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "Поддерживаемые модули:" -#: cmdline/apt-get.cc:2359 +#: cmdline/apt-get.cc:2368 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1432,8 +1433,8 @@ msgid "Duplicate conf file %s/%s" msgstr "Повторно указанный конфигурационный файл %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "Не удалось записать файл %s" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1789,7 +1790,7 @@ msgstr "Время установления соединения для соке msgid "Unable to accept connection" msgstr "Невозможно принять соединение" -#: methods/ftp.cc:864 methods/http.cc:916 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Проблема при хэшировании файла" @@ -1917,43 +1918,43 @@ msgstr "Этот http-сервер не поддерживает загрузк msgid "Unknown date format" msgstr "Неизвестный формат данных" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "Ошибка в select" -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "Время ожидания для соединения истекло" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "Ошибка записи в выходной файл" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "Ошибка записи в файл" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "Ошибка записи в файл" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "Ошибка чтения, удалённый сервер прервал соединение" -#: methods/http.cc:834 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "Ошибка чтения с сервера" -#: methods/http.cc:1065 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "Неверный заголовок данных" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "Соединение разорвано" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "Внутренняя ошибка" @@ -2495,11 +2496,11 @@ msgstr "Ошибка ввода/вывода при попытке сохран msgid "rename failed, %s (%s -> %s)." msgstr "переименовать не удалось, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:894 +#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 msgid "MD5Sum mismatch" msgstr "MD5Sum не совпадает" -#: apt-pkg/acquire-item.cc:708 +#: apt-pkg/acquire-item.cc:714 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2508,7 +2509,7 @@ msgstr "" "Я не в состоянии обнаружить файл пакета %s. Это может означать, что Вам " "придётся вручную исправить этот пакет (возможно, пропущен arch)" -#: apt-pkg/acquire-item.cc:761 +#: apt-pkg/acquire-item.cc:767 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2517,13 +2518,13 @@ msgstr "" "Я не в состоянии обнаружить файл пакета %s. Это может означать, что Вам " "придётся вручную исправить этот пакет." -#: apt-pkg/acquire-item.cc:797 +#: apt-pkg/acquire-item.cc:803 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Некорректный перечень пакетов. Нет поля Filename: для пакета %s." -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "Не совпадает размер" diff --git a/po/sk.po b/po/sk.po index c3fc16df9..dd7cb2636 100644 --- a/po/sk.po +++ b/po/sk.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-29 07:17+0200\n" -"PO-Revision-Date: 2005-02-09 11:29+0100\n" -"Last-Translator: Peter KLFMANiK Mann <Peter.Mann@tuke.sk>\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" +"PO-Revision-Date: 2005-07-01 09:34+0200\n" +"Last-Translator: Peter Mann <Peter.Mann@tuke.sk>\n" "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -148,7 +148,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545 -#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s pre %s %s skompilovaný na %s %s\n" @@ -322,7 +322,6 @@ msgid "Error processing contents %s" msgstr "Chyba pri spracovávaní obsahu %s" #: ftparchive/apt-ftparchive.cc:551 -#, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -377,16 +376,16 @@ msgstr "" "\n" "apt-ftparchive zo stromu .deb súborov vygeneruje súbory Packages. Súbor\n" "Packages okrem všetkých riadiacich polí každého balíka obsahuje tiež jeho\n" -"veľkosť a MD5 súčet. Podporovaný je tiež súbor override, pomocou ktorého\n" +"veľkosť a MD5 súčet. Podporovaný je tiež súbor 'override', pomocou ktorého\n" "môžete vynútiť hodnoty polí Priority a Section.\n" "\n" "Podobne vie apt-ftparchive vygenerovať zo stromu súborov .dsc súbory\n" -"Sources. Voľbou --source-override môžete určiť zdrojový súbor override.\n" +"Sources. Voľbou --source-override môžete určiť zdrojový súbor 'override'.\n" "\n" "Príkazy 'packages' a 'sources' by sa mali spúšťať v koreni stromu.\n" "Binárna_cesta by mala ukazovať na začiatok rekurzívneho hľadania\n" -"a súbor override by mal obsahovať príznaky pre nahradenie. Ak je udaný\n" -"prefix_cesty, pridá sa do polí Filename.\n" +"a súbor 'override' by mal obsahovať príznaky pre nahradenie. Ak je udaný\n" +"prefix_cesty, pridá sa do polí 'filename'.\n" "Skutočný príklad z archívu Debianu:\n" " apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" " dists/potato/main/binary-i386/Packages\n" @@ -394,7 +393,7 @@ msgstr "" "Voľby:\n" " -h Táto nápoveda\n" " --md5 Vygeneruje kontrolný MD5 súčet\n" -" -s=? Zdrojový súbor override\n" +" -s=? Zdrojový súbor 'override'\n" " -q Tichý režim\n" " -d=? Zvolí voliteľnú databázu pre vyrovnávaciu pamäť\n" " --no-delink Povolí ladiaci režim\n" @@ -619,7 +618,7 @@ msgstr "Premenovanie %s na %s zlyhalo" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 #, c-format msgid "Regex compilation error - %s" msgstr "Chyba pri preklade regulárneho výrazu - %s" @@ -688,8 +687,9 @@ msgid "%s (due to %s) " msgstr "%s (kvôli %s) " #: cmdline/apt-get.cc:544 +#, fuzzy msgid "" -"WARNING: The following essential packages will be removed\n" +"WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" "UPOZORNENIE: Nasledovné dôležité balíky sa odstránia.\n" @@ -768,11 +768,11 @@ msgstr "Nastali problémy a -y bolo použité bez --force-yes" msgid "Packages need to be removed but remove is disabled." msgstr "Je potrebné odstránenie balíka, ale funkcia Odstrániť je vypnutá." -#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802 +#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 msgid "Unable to lock the download directory" msgstr "Adresár pre sťahovanie sa nedá zamknúť" -#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061 +#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Nedá sa načítať zoznam zdrojov." @@ -811,9 +811,9 @@ msgid "Yes, do as I say!" msgstr "Áno, urob to, čo vravím!" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, c-format msgid "" -"You are about to do something potentially harmful\n" +"You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" " ?] " msgstr "" @@ -829,7 +829,7 @@ msgstr "Prerušené." msgid "Do you want to continue [Y/n]? " msgstr "Chcete pokračovať [Y/n]? " -#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959 +#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Zlyhalo stiahnutie %s %s\n" @@ -838,7 +838,7 @@ msgstr "Zlyhalo stiahnutie %s %s\n" msgid "Some files failed to download" msgstr "Niektoré súbory sa nedajú stiahnuť" -#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 msgid "Download complete and in download only mode" msgstr "Sťahovanie ukončené v režime \"iba stiahnuť\"" @@ -938,7 +938,7 @@ msgstr "Zvolená verzia %s (%s) pre %s\n" msgid "The update command takes no arguments" msgstr "Príkaz update neprijíma žiadne argumenty" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "Adresár zoznamov sa nedá zamknúť" @@ -954,21 +954,21 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "Vnútorná chyba, AllUpgrade pokazil veci" -#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498 +#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 #, c-format msgid "Couldn't find package %s" msgstr "Balík %s sa nedá nájsť" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, 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:1515 +#: cmdline/apt-get.cc:1524 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:1518 +#: cmdline/apt-get.cc:1527 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -976,7 +976,7 @@ msgstr "" "Nesplnené závislosti. Skúste spustiť 'apt-get -f install' bez balíkov (alebo " "navrhnite riešenie)." -#: cmdline/apt-get.cc:1530 +#: cmdline/apt-get.cc:1539 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -988,7 +988,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:1538 +#: cmdline/apt-get.cc:1547 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -998,114 +998,114 @@ 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:1543 +#: cmdline/apt-get.cc:1552 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:" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "Poškodené balíky" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "Nainštalujú sa nasledovné extra balíky:" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "Navrhované balíky:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "Odporúčané balíky:" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "Prepočítava sa aktualizácia... " -#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99 +#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 msgid "Failed" msgstr "Chyba" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "Hotovo" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 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:1872 cmdline/apt-get.cc:2079 +#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 #, c-format msgid "Unable to find a source package for %s" msgstr "Nedá sa nájsť zdrojový balík pre %s" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, 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:1924 +#: cmdline/apt-get.cc:1933 #, 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:1927 +#: cmdline/apt-get.cc:1936 #, 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:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "Stiahnuť zdroj %s\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "Zlyhalo stiahnutie niektorých archívov." -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, 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:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Príkaz pre rozbalenie '%s' zlyhal.\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "Príkaz pre zostavenie '%s' zlyhal.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "Proces potomka zlyhal" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 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:2084 +#: cmdline/apt-get.cc:2093 #, 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:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "%s nemá žiadne závislosti pre zostavenie.\n" -#: cmdline/apt-get.cc:2156 +#: cmdline/apt-get.cc:2165 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%s závislosť pre %s sa nemôže splniť, pretože sa nedá nájsť balík %s" -#: cmdline/apt-get.cc:2208 +#: cmdline/apt-get.cc:2217 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1114,31 +1114,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:2243 +#: cmdline/apt-get.cc:2252 #, 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:2268 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Zlyhalo splnenie %s závislosti pre %s: %s" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Závislosti pre zostavenie %s sa nedajú splniť." -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "Spracovanie závislostí pre zostavenie zlyhalo" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "Podporované moduly:" -#: cmdline/apt-get.cc:2359 +#: cmdline/apt-get.cc:2368 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1387,8 +1387,8 @@ msgid "Duplicate conf file %s/%s" msgstr "Duplicitný konfiguračný súbor %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "Zápis do súboru %s zlyhal" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1534,8 +1534,9 @@ msgid "Internal error adding a diversion" msgstr "Vnútorná chyba pri pridávaní diverzie" #: apt-inst/deb/dpkgdb.cc:383 +#, fuzzy msgid "The pkg cache must be initialized first" -msgstr "Vyrovnávacia pamäť balíkov sa najprv musí inicializovať" +msgstr "Vyrovnávacia pamäť balíkov sa musí najprv inicializovať" #: apt-inst/deb/dpkgdb.cc:386 msgid "Reading file list" @@ -1741,7 +1742,7 @@ msgstr "Uplynulo spojenie dátového socketu" msgid "Unable to accept connection" msgstr "Spojenie sa nedá prijať" -#: methods/ftp.cc:864 methods/http.cc:916 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problém s hashovaním súboru" @@ -1868,43 +1869,43 @@ msgstr "Tento HTTP server má poškodenú podporu rozsahov" msgid "Unknown date format" msgstr "Neznámy formát dátumu" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "Výber zlyhal" -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "Uplynul čas spojenia" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "Chyba zápisu do výstupného súboru" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "Chyba zápisu do súboru" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "Chyba zápisu do súboru" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "Chyba pri čítaní zo servera. Druhá strana ukončila spojenie" -#: methods/http.cc:834 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "Chyba pri čítaní zo servera" -#: methods/http.cc:1065 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "Zlé dátové záhlavie" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "Spojenie zlyhalo" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "Vnútorná chyba" @@ -2358,39 +2359,39 @@ msgid "Cache has an incompatible versioning system" msgstr "Vyrovnávacia pamäť má nezlučiteľný systém na správu verzií" #: apt-pkg/pkgcachegen.cc:117 -#, c-format +#, fuzzy, c-format msgid "Error occurred while processing %s (NewPackage)" -msgstr "Pri spracovaní %s sa objavila chyba (NewPackage)" +msgstr "Chyba pri spracovaní %s (NewPackage)" #: apt-pkg/pkgcachegen.cc:129 -#, c-format +#, fuzzy, c-format msgid "Error occurred while processing %s (UsePackage1)" -msgstr "Pri spracovaní %s sa objavila chyba (UsePackage1)" +msgstr "Chyba pri spracovaní %s (UsePackage1)" #: apt-pkg/pkgcachegen.cc:150 -#, c-format +#, fuzzy, c-format msgid "Error occurred while processing %s (UsePackage2)" -msgstr "Pri spracovaní %s sa objavila chyba (UsePackage2)" +msgstr "Chyba pri spracovaní %s (UsePackage2)" #: apt-pkg/pkgcachegen.cc:154 -#, c-format +#, fuzzy, c-format msgid "Error occurred while processing %s (NewFileVer1)" -msgstr "Pri spracovaní %s sa objavila chyba (NewFileVer1)" +msgstr "Chyba pri spracovaní %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:184 -#, c-format +#, fuzzy, c-format msgid "Error occurred while processing %s (NewVersion1)" -msgstr "Pri spracovaní %s sa objavila chyba (NewVersion1)" +msgstr "Chyba pri spracovaní %s (NewVersion1)" #: apt-pkg/pkgcachegen.cc:188 -#, c-format +#, fuzzy, c-format msgid "Error occurred while processing %s (UsePackage3)" -msgstr "Pri spracovaní %s sa objavila chyba (UsePackage3)" +msgstr "Chyba pri spracovaní %s (UsePackage3)" #: apt-pkg/pkgcachegen.cc:192 -#, c-format +#, fuzzy, c-format msgid "Error occurred while processing %s (NewVersion2)" -msgstr "Pri spracovaní %s sa objavila chyba (NewVersion2)" +msgstr "Chyba pri spracovaní %s (NewVersion2)" #: apt-pkg/pkgcachegen.cc:207 msgid "Wow, you exceeded the number of package names this APT is capable of." @@ -2407,14 +2408,14 @@ msgstr "" "Fíha, prekročili ste počet závislostí, ktoré toto APT zvládne spracovať." #: apt-pkg/pkgcachegen.cc:241 -#, c-format +#, fuzzy, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Chyba pri spracovaní %s (FindPkg)" #: apt-pkg/pkgcachegen.cc:254 -#, c-format +#, fuzzy, c-format msgid "Error occurred while processing %s (CollectFileProvides)" -msgstr "Pri spracovaní %s sa objavila chyba (CollectFileProvides)" +msgstr "Chyba pri spracovaní %s (CollectFileProvides)" #: apt-pkg/pkgcachegen.cc:260 #, c-format @@ -2439,11 +2440,11 @@ 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:235 apt-pkg/acquire-item.cc:894 +#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 msgid "MD5Sum mismatch" msgstr "Nezhoda MD5 súčtov" -#: apt-pkg/acquire-item.cc:708 +#: apt-pkg/acquire-item.cc:714 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2452,7 +2453,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:761 +#: apt-pkg/acquire-item.cc:767 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2461,13 +2462,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:797 +#: apt-pkg/acquire-item.cc:803 #, 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:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "Veľkosti sa nezhodujú" diff --git a/po/sl.po b/po/sl.po index 2147c6f53..ad8aea470 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: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" "PO-Revision-Date: 2005-02-16 22:18+0100\n" "Last-Translator: Jure uhalev <gandalf@owca.info>\n" "Language-Team: Slovenian <sl@li.org>\n" @@ -145,7 +145,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545 -#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s za %s %s preveden na %s %s\n" @@ -616,7 +616,7 @@ msgstr "Ni mogo msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 #, c-format msgid "Regex compilation error - %s" msgstr "Napaka pri prevajanju regex - %s" @@ -685,8 +685,9 @@ msgid "%s (due to %s) " msgstr "%s (zaradi %s) " #: cmdline/apt-get.cc:544 +#, fuzzy msgid "" -"WARNING: The following essential packages will be removed\n" +"WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" "OPOZORILO: Naslednji kljuni paketi bodo odstranjeni.\n" @@ -765,11 +766,11 @@ msgstr "Pri msgid "Packages need to be removed but remove is disabled." msgstr "Odstraniti je potrebno pakete, a je Odstranjevanje onemogoeno." -#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802 +#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 msgid "Unable to lock the download directory" msgstr "Ni mogoe zakleniti imenika za prenose" -#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061 +#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Seznama virov ni mogoe brati." @@ -808,9 +809,9 @@ msgid "Yes, do as I say!" msgstr "Da, naredi tako kot pravim!" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, c-format msgid "" -"You are about to do something potentially harmful\n" +"You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" " ?] " msgstr "" @@ -826,7 +827,7 @@ msgstr "Prekini." msgid "Do you want to continue [Y/n]? " msgstr "Ali elite nadaljevati [Y/n]? " -#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959 +#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Ni mogoe dobiti %s %s\n" @@ -835,7 +836,7 @@ msgstr "Ni mogo msgid "Some files failed to download" msgstr "Prenos nekaterih datotek ni uspel" -#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 msgid "Download complete and in download only mode" msgstr "Prenos dokonan in uporabljen nain samo prenos" @@ -936,7 +937,7 @@ msgstr "Izbrana razli msgid "The update command takes no arguments" msgstr "Ukaz update ne potrebuje argumentov" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "Imenika seznamov ni mogoe zakleniti" @@ -952,21 +953,21 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "Notranja napaka zaradi AllUpgrade." -#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498 +#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 #, c-format msgid "Couldn't find package %s" msgstr "Ni mogoe najti paketa %s" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Opomba: izbran %s namesto regex '%s'\n" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1524 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Poskusite zagnati 'apt-get -f install', e elite popraviti:" -#: cmdline/apt-get.cc:1518 +#: cmdline/apt-get.cc:1527 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -974,7 +975,7 @@ msgstr "" "Nereene odvisnosti. Poskusite 'apt-get -f install' brez paketov (ali " "podajte reitev)." -#: cmdline/apt-get.cc:1530 +#: cmdline/apt-get.cc:1539 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -985,7 +986,7 @@ msgstr "" "nemogo poloaj, e uporabljate nestabilno izdajo pa, da nekateri zahtevani " "paketi e niso ustvarjeni ali preneeni iz Prihajajoe." -#: cmdline/apt-get.cc:1538 +#: cmdline/apt-get.cc:1547 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -995,115 +996,115 @@ msgstr "" "preprosto ne da namestiti in je potrebno vloiti poroilo o hrou\n" "o tem paketu." -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "Naslednji podatki vam bodo morda pomagali reiti teavo:" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "Pokvarjeni paketi" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "Naslednji dodatni paketi bodo nameeni:" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "Predlagani paketi:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "Priporoeni paketi:" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "Preraunavanje nadgradnje ... " -#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99 +#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 msgid "Failed" msgstr "Spodletelo" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "Opravljeno" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 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:1872 cmdline/apt-get.cc:2079 +#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 #, c-format msgid "Unable to find a source package for %s" msgstr "Izvornega paketa za %s ni mogoe najti" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, c-format msgid "You don't have enough free space in %s" msgstr "Nimate dovolj prostora na %s" -#: cmdline/apt-get.cc:1924 +#: cmdline/apt-get.cc:1933 #, 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:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Potrebno je dobiti %sB izvornih arhivov.\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "Dobi vir %s\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "Nekaterih arhivov ni mogoe dobiti." -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Odpakiranje e odpakiranih izvornih paketov v %s preskoeno\n" -#: cmdline/apt-get.cc:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Ukaz odpakiranja '%s' ni uspel.\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "Ukaz gradnje '%s' ni uspel.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "Otroki proces ni uspel" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 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:2084 +#: cmdline/apt-get.cc:2093 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Ni mogoe dobiti informacij o odvisnostih za gradnjo za %s" -#: cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "%s nima odvisnosti za gradnjo.\n" -#: cmdline/apt-get.cc:2156 +#: cmdline/apt-get.cc:2165 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%s odvisnosti za %s ni mogoe zadostiti, ker ni mogoe najti paketa %s" -#: cmdline/apt-get.cc:2208 +#: cmdline/apt-get.cc:2217 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1112,31 +1113,31 @@ msgstr "" "%s odvisnosti za %s ni mogoe zadostiti, ker nobena razliica paketa %s ne " "more zadostiti zahtevi po razliici" -#: cmdline/apt-get.cc:2243 +#: cmdline/apt-get.cc:2252 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Ni mogoe zadostiti %s odvisnosti za %s. Nameen paket %s je preve nov" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Ni mogoe zadostiti %s odvisnosti za %s. %s" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Odvisnostim za gradnjo %s ni mogoe zadostiti." -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "Obdelava odvisnosti za gradnjo ni uspela" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "Podprti moduli:" -#: cmdline/apt-get.cc:2359 +#: cmdline/apt-get.cc:2368 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1387,8 +1388,8 @@ msgid "Duplicate conf file %s/%s" msgstr "Dvojnik datoteke z nastavitvami %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "Napaka pri pisanju datoteke %s" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1740,7 +1741,7 @@ msgstr "Povezava podatkovne vti msgid "Unable to accept connection" msgstr "Ni mogoe sprejeti povezave" -#: methods/ftp.cc:864 methods/http.cc:916 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Teava pri razprevanju datoteke" @@ -1867,43 +1868,43 @@ msgstr "Ta stre msgid "Unknown date format" msgstr "Neznana oblika datuma" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "Izbira ni uspela" -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "as za povezavo se je iztekel" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "Napaka pri pisanju v izhodno datoteko" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "Napaka pri pisanju v datoteko" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "Napaka pri pisanju v datoteko" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "Napaka pri branju oddaljene in zaprte povezave s strenika " -#: methods/http.cc:834 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "Napaka pri branju s strenika" -#: methods/http.cc:1065 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "Napani podatki glave" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "Povezava ni uspela" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "Notranja napaka" @@ -2437,11 +2438,11 @@ msgstr "Napaka IO pri shranjevanju predpomnilnika virov" msgid "rename failed, %s (%s -> %s)." msgstr "preimenovanje spodletelo, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:894 +#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 msgid "MD5Sum mismatch" msgstr "Neujemanje vsote MD5" -#: apt-pkg/acquire-item.cc:708 +#: apt-pkg/acquire-item.cc:714 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2450,7 +2451,7 @@ msgstr "" "Ni bilo mogoe najti datoteke za paket %s. Morda boste morali rono " "popraviti ta paket (zaradi manjkajoega arhiva)." -#: apt-pkg/acquire-item.cc:761 +#: apt-pkg/acquire-item.cc:767 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2459,7 +2460,7 @@ msgstr "" "Ni bilo mogoe najti datoteke za paket %s. Morda boste morali rono " "popraviti ta paket." -#: apt-pkg/acquire-item.cc:797 +#: apt-pkg/acquire-item.cc:803 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2467,7 +2468,7 @@ msgstr "" "Datoteke s kazali paketov so pokvarjene. Brez imena datotek: polje alu paket " "%s." -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "Neujemanje velikosti" diff --git a/po/sv.po b/po/sv.po index 17827b7cc..367f6680e 100644 --- a/po/sv.po +++ b/po/sv.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" "PO-Revision-Date: 2005-01-15 15:30+0100\n" "Last-Translator: Peter Karlsson <peterk@debian.org>\n" "Language-Team: Swedish <sv@li.org>\n" @@ -150,7 +150,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545 -#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s fr %s %s kompilerad den %s %s\n" @@ -628,7 +628,7 @@ msgstr "Misslyckades att byta namn p msgid "Y" msgstr "J" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 #, c-format msgid "Regex compilation error - %s" msgstr "Fel vid tolkning av reguljrt uttryck - %s" @@ -697,8 +697,9 @@ msgid "%s (due to %s) " msgstr "%s (p grund av %s) " #: cmdline/apt-get.cc:544 +#, fuzzy msgid "" -"WARNING: The following essential packages will be removed\n" +"WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" "VARNING: Fljande systemkritiska paket kommer att tas bort\n" @@ -777,11 +778,11 @@ msgstr "Problem har uppst msgid "Packages need to be removed but remove is disabled." msgstr "Paket mste tas bort men \"Remove\" r inaktiverat." -#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802 +#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 msgid "Unable to lock the download directory" msgstr "Kunde inte lsa hmtningskatalogen." -#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061 +#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Listan ver kllor kunde inte lsas." @@ -820,9 +821,9 @@ msgid "Yes, do as I say!" msgstr "Ja, gr som jag sger!" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, c-format msgid "" -"You are about to do something potentially harmful\n" +"You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" " ?] " msgstr "" @@ -839,7 +840,7 @@ msgstr "Avbryter." msgid "Do you want to continue [Y/n]? " msgstr "Vill du fortstta [J/n]? " -#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959 +#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Misslyckades att hmta %s %s\n" @@ -848,7 +849,7 @@ msgstr "Misslyckades att h msgid "Some files failed to download" msgstr "Misslyckades att hmta vissa filer" -#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 msgid "Download complete and in download only mode" msgstr "Hmtningen frdig i \"endast-hmta\"-lge" @@ -950,7 +951,7 @@ msgstr "Vald version %s (%s) f msgid "The update command takes no arguments" msgstr "Uppdateringskommandot tar inga argument" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "Kunde inte lsa listkatalogen" @@ -966,21 +967,21 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "Internt fel, AllUpgrade frstrde ngot" -#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498 +#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 #, c-format msgid "Couldn't find package %s" msgstr "Kunde inte hitta paketet %s" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Observera, vljer %s fr regex \"%s\"\n" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1524 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Du kan mjligen rtta detta genom att kra \"apt-get -f install\":" -#: cmdline/apt-get.cc:1518 +#: cmdline/apt-get.cc:1527 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -988,7 +989,7 @@ msgstr "" "Otillfredsstllda beroenden. Frsk med \"apt-get -f install\" utan paket " "(eller ange en lsning)." -#: cmdline/apt-get.cc:1530 +#: cmdline/apt-get.cc:1539 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1000,7 +1001,7 @@ msgstr "" "distributionen, att ngra krvda paket nnu inte har skapats eller\n" "lagts in frn \"Incoming\"." -#: cmdline/apt-get.cc:1538 +#: cmdline/apt-get.cc:1547 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1010,105 +1011,105 @@ msgstr "" "helt enkelt inte kan installeras och att en felrapport om detta br\n" "skrivas." -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "Fljande information kan vara till hjlp fr att lsa situationen:" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "Trasiga paket" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "Fljande ytterligare paket kommer att installeras:" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "Freslagna paket:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "Rekommenderade paket:" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "Berknar uppgradering... " -#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99 +#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 msgid "Failed" msgstr "Misslyckades" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "Frdig" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 msgid "Must specify at least one package to fetch source for" msgstr "Du mste ange tminstone ett paket att hmta kllkod fr" -#: cmdline/apt-get.cc:1872 cmdline/apt-get.cc:2079 +#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 #, c-format msgid "Unable to find a source package for %s" msgstr "Kunde inte hitta ngot kllkodspaket fr %s" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har inte tillrckligt ledigt utrymme i %s" -#: cmdline/apt-get.cc:1924 +#: cmdline/apt-get.cc:1933 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Behver hmta %sB/%sB kllkodsarkiv.\n" -#: cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Behver hmta %sB kllkodsarkiv.\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "Hmtar kllkod %s\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "Misslyckades att hmta vissa arkiv." -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Packar inte upp redan redan uppackad kllkod i %s\n" -#: cmdline/apt-get.cc:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Uppackningskommandot \"%s\" misslyckades.\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "Byggkommandot \"%s\" misslyckades.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "Barnprocessen misslyckades" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 msgid "Must specify at least one package to check builddeps for" msgstr "Du mste ange tminstone ett paket att inhmta byggberoenden fr" -#: cmdline/apt-get.cc:2084 +#: cmdline/apt-get.cc:2093 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Kunde inte hmta byggberoendeinformation fr %s" -#: cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "%s har inga byggberoenden.\n" -#: cmdline/apt-get.cc:2156 +#: cmdline/apt-get.cc:2165 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1116,7 +1117,7 @@ msgid "" msgstr "" "%s-beroendet p %s kan inte tillfredsstllas eftersom paketet %s inte hittas" -#: cmdline/apt-get.cc:2208 +#: cmdline/apt-get.cc:2217 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1125,32 +1126,32 @@ msgstr "" "%s-beroendet p %s kan inte tillfredsstllas eftersom inga tillgngliga " "versioner av paketet %s uppfyller versionskraven" -#: cmdline/apt-get.cc:2243 +#: cmdline/apt-get.cc:2252 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Misslyckades att uppfylla %s-beroendet fr %s: Det installerade paketet %s " "r fr nytt" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Misslyckades att uppfylla %s-beroendet fr %s: %s" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Byggberoenden fr %s kunde inte uppfyllas." -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "Kunde inte hantera byggberoenden" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "Moduler som stds:" -#: cmdline/apt-get.cc:2359 +#: cmdline/apt-get.cc:2368 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1406,8 +1407,8 @@ msgid "Duplicate conf file %s/%s" msgstr "Duplicerad konfigurationsfil %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "Misslyckades att skriva filen %s" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1762,7 +1763,7 @@ msgstr "Anslutet datauttag (socket) fick inte svar inom tidsgr msgid "Unable to accept connection" msgstr "Kunde inte ta emot anslutning" -#: methods/ftp.cc:864 methods/http.cc:916 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem med att lgga filen till hashtabellen" @@ -1894,43 +1895,43 @@ msgstr "Denna http-servers st msgid "Unknown date format" msgstr "Oknt datumformat" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "\"Select\" misslyckades" -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "Tidsgrnsen fr anslutningen nddes" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "Fel vid skrivning till utdatafil" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "Fel vid skrivning till fil" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "Fel vid skrivning till filen" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "Fel vid lsning frn server: Andra nden stngde frbindelsen" -#: methods/http.cc:834 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "Fel vid lsning frn server" -#: methods/http.cc:1065 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "Trasigt data i huvud" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "Anslutning misslyckades" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "Internt fel" @@ -2472,11 +2473,11 @@ msgstr "In-/utfel vid lagring av k msgid "rename failed, %s (%s -> %s)." msgstr "namnbyte misslyckades, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:894 +#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 msgid "MD5Sum mismatch" msgstr "MD5-kontrollsumma stmmer inte" -#: apt-pkg/acquire-item.cc:708 +#: apt-pkg/acquire-item.cc:714 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2485,7 +2486,7 @@ msgstr "" "Jag kunde inte lokalisera ngon fil fr paketet %s. Detta kan betyda att du " "manuellt mste reparera detta paket (p grund av saknad arkitektur)." -#: apt-pkg/acquire-item.cc:761 +#: apt-pkg/acquire-item.cc:767 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2494,13 +2495,13 @@ msgstr "" "Jag kunde inte lokalisera ngon fil fr paketet %s. Detta kan betyda att du " "manuellt mste reparera detta paket." -#: apt-pkg/acquire-item.cc:797 +#: apt-pkg/acquire-item.cc:803 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Paketindexfilerna r trasiga. Inget \"Filename:\"-flt fr paketet %s." -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "Storleken stmmer inte" diff --git a/po/tl.po b/po/tl.po index f4d26b826..9fc7a93ba 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: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" "PO-Revision-Date: 2005-02-09 16:36+0800\n" "Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n" "Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n" @@ -152,7 +152,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545 -#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s para sa %s %s kinompile noong %s %s\n" @@ -628,7 +628,7 @@ msgstr "Sawi ang pagpangalan muli ng %s tungong %s" msgid "Y" msgstr "O" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 #, c-format msgid "Regex compilation error - %s" msgstr "Error sa pag-compile ng regex - %s" @@ -697,8 +697,9 @@ msgid "%s (due to %s) " msgstr "%s (dahil sa %s) " #: cmdline/apt-get.cc:544 +#, fuzzy msgid "" -"WARNING: The following essential packages will be removed\n" +"WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" "BABALA: Ang susunod na mga paketeng esensyal ay tatanggalin\n" @@ -779,11 +780,11 @@ msgid "Packages need to be removed but remove is disabled." msgstr "" "May mga paketeng kailangang tanggalin ngunit naka-disable ang Tanggal/Remove." -#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802 +#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 msgid "Unable to lock the download directory" msgstr "Di maaldaba ang directory ng download" -#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061 +#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Hindi mabasa ang talaan ng pagkukunan (sources)." @@ -822,9 +823,9 @@ msgid "Yes, do as I say!" msgstr "Oo, gawin ang sinasabi ko!" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, c-format msgid "" -"You are about to do something potentially harmful\n" +"You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" " ?] " msgstr "" @@ -840,7 +841,7 @@ msgstr "Abort." msgid "Do you want to continue [Y/n]? " msgstr "Nais niyo bang magpatuloy [O/h]? " -#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959 +#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Sawi sa pagkuha ng %s %s\n" @@ -849,7 +850,7 @@ msgstr "Sawi sa pagkuha ng %s %s\n" msgid "Some files failed to download" msgstr "May mga tipunang hindi nakuha" -#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 msgid "Download complete and in download only mode" msgstr "Kumpleto ang pagkakuha ng mga tipunan sa modong pagkuha lamang" @@ -951,7 +952,7 @@ msgstr "Ang napiling bersyon %s (%s) para sa %s\n" msgid "The update command takes no arguments" msgstr "Ang utos na update ay hindi tumatanggap ng mga argumento" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "Hindi maaldaba ang directory ng talaan" @@ -967,22 +968,22 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "Internal error, nakasira ng bagay-bagay ang AllUpgrade" -#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498 +#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 #, c-format msgid "Couldn't find package %s" msgstr "Hindi mahanap ang paketeng %s" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Paunawa, pinili ang %s para sa regex '%s'\n" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1524 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "Maaaring patakbuhin niyo ang `apt-get -f install' upang ayusin ang mga ito:" -#: cmdline/apt-get.cc:1518 +#: cmdline/apt-get.cc:1527 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -990,7 +991,7 @@ msgstr "" "May mga dependensiyang kulang. Subukan ang 'apt-get -f install' na walang " "mga pakete (o magtakda ng solusyon)." -#: cmdline/apt-get.cc:1530 +#: cmdline/apt-get.cc:1539 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1001,7 +1002,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:1538 +#: cmdline/apt-get.cc:1547 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1011,106 +1012,106 @@ msgstr "" "hindi talaga ma-instol at kailangang magpadala ng bug report tungkol sa\n" "pakete na ito." -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "" "Ang sumusunod na impormasyon ay maaaring makatulong sa pag-ayos ng problema:" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "Sirang mga pakete" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "Ang mga sumusunod na extra na pakete ay iinstolahin:" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "Mga paketeng mungkahi:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "Mga paketeng rekomendado:" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "Kinakalkula ang upgrade... " -#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99 +#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 msgid "Failed" msgstr "Sawi" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "Tapos" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 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:1872 cmdline/apt-get.cc:2079 +#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 #, c-format msgid "Unable to find a source package for %s" msgstr "Hindi mahanap ang paketeng source para sa %s" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, c-format msgid "You don't have enough free space in %s" msgstr "Kulang kayo ng libreng puwang sa %s" -#: cmdline/apt-get.cc:1924 +#: cmdline/apt-get.cc:1933 #, 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:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Kailangang kumuha ng %sB ng arkibong source.\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "Kunin ang Source %s\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "Sawi sa pagkuha ng ilang mga arkibo." -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, 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:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Sawi ang utos ng pagbuklat '%s'.\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "Utos na build '%s' ay sawi.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "Sawi ang prosesong anak" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 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:2084 +#: cmdline/apt-get.cc:2093 #, 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:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "Walang build depends ang %s.\n" -#: cmdline/apt-get.cc:2156 +#: cmdline/apt-get.cc:2165 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1119,7 +1120,7 @@ msgstr "" "Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi " "mahanap" -#: cmdline/apt-get.cc:2208 +#: cmdline/apt-get.cc:2217 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1128,32 +1129,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:2243 +#: cmdline/apt-get.cc:2252 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Sawi sa pagbuo ng dependensiyang %s para sa %s: Ang naka-instol na paketeng %" "s ay bagong-bago pa lamang." -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Sawi sa pagbuo ng dependensiyang %s para sa %s: %s" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Hindi mabuo ang build-dependencies para sa %s." -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "Sawi sa pagproseso ng build dependencies" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "Suportadong mga Module:" -#: cmdline/apt-get.cc:2359 +#: cmdline/apt-get.cc:2368 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1405,8 +1406,8 @@ msgid "Duplicate conf file %s/%s" msgstr "Nadobleng tipunang conf %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "Sawi sa pagsulat ng tipunang %s" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1760,7 +1761,7 @@ msgstr "Nag-timeout ang socket ng datos" msgid "Unable to accept connection" msgstr "Hindi makatanggap ng koneksyon" -#: methods/ftp.cc:864 methods/http.cc:916 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problema sa pag-hash ng tipunan" @@ -1887,43 +1888,43 @@ msgstr "Sira ang range support ng HTTP server na ito" msgid "Unknown date format" msgstr "Di kilalang anyo ng petsa" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "Sawi ang pagpili" -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "Nag-timeout ang koneksyon" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "Error sa pagsulat ng tipunang output" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "Error sa pagsulat sa tipunan" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "Error sa pagsusulat sa tipunan" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "Error sa pagbasa mula sa server, sinarhan ng remote ang koneksyon" -#: methods/http.cc:834 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "Error sa pagbasa mula sa server" -#: methods/http.cc:1065 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "Maling datos sa header" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "Sawi ang koneksyon" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "Internal na error" @@ -2469,11 +2470,11 @@ msgstr "IO Error sa pag-imbak ng source cache" msgid "rename failed, %s (%s -> %s)." msgstr "pagpalit ng pangalan ay sawi, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:894 +#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 msgid "MD5Sum mismatch" msgstr "Di tugmang MD5Sum" -#: apt-pkg/acquire-item.cc:708 +#: apt-pkg/acquire-item.cc:714 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2482,7 +2483,7 @@ msgstr "" "Hindi ko mahanap ang tipunan para sa paketeng %s. Maaaring kailanganin " "niyong ayusin ng de kamay ang paketeng ito. (dahil sa walang arch)" -#: apt-pkg/acquire-item.cc:761 +#: apt-pkg/acquire-item.cc:767 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2491,7 +2492,7 @@ msgstr "" "Hindi ko mahanap ang tipunan para sa paketeng %s. Maaaring kailanganin " "niyong ayusin ng de kamay ang paketeng ito." -#: apt-pkg/acquire-item.cc:797 +#: apt-pkg/acquire-item.cc:803 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2499,7 +2500,7 @@ msgstr "" "Sira ang tipunang index ng mga pakete. Walang Filename: field para sa " "paketeng %s." -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "Di tugmang laki" diff --git a/po/zh_CN.po b/po/zh_CN.po index d6fa9be1d..f7c0ae1b3 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: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" "PO-Revision-Date: 2005-02-09 17:34+0800\n" "Last-Translator: Tchaikov <chaisave@263.net>\n" "Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n" @@ -148,7 +148,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545 -#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s for %s %s ，编译于 %s %s\n" @@ -618,7 +618,7 @@ msgstr "无法将 %s 重命名为 %s" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 #, c-format msgid "Regex compilation error - %s" msgstr "编译正则表达式时出错 - %s" @@ -687,8 +687,9 @@ msgid "%s (due to %s) " msgstr "%s (是由于 %s) " #: cmdline/apt-get.cc:544 +#, fuzzy msgid "" -"WARNING: The following essential packages will be removed\n" +"WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" "【警告】：下列的重要软件包将被卸载 \n" @@ -767,11 +768,11 @@ msgstr "碰到了一些问题，您使用了 -y 选项，但是没有用 --force msgid "Packages need to be removed but remove is disabled." msgstr "有软件包需要被卸载，但是卸载动作被程序设置所禁止。" -#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802 +#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 msgid "Unable to lock the download directory" msgstr "无法对下载目录加锁" -#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061 +#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "无法读取安装源列表。" @@ -810,9 +811,9 @@ msgid "Yes, do as I say!" msgstr "Yes, do as I say!" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, c-format msgid "" -"You are about to do something potentially harmful\n" +"You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" " ?] " msgstr "" @@ -828,7 +829,7 @@ msgstr "中止执行。" msgid "Do you want to continue [Y/n]? " msgstr "您希望继续执行吗？[Y/n]" -#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959 +#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 #, c-format msgid "Failed to fetch %s %s\n" msgstr "无法下载 %s %s\n" @@ -837,7 +838,7 @@ msgstr "无法下载 %s %s\n" msgid "Some files failed to download" msgstr "有一些文件下载失败" -#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 msgid "Download complete and in download only mode" msgstr "下载完毕，目前是“仅下载”模式" @@ -938,7 +939,7 @@ msgstr "选定了版本为 %s (%s) 的 %s\n" msgid "The update command takes no arguments" msgstr " update 命令是不需任何参数的" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "无法对状态列表目录加锁" @@ -953,21 +954,21 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "内部错误，AllUpgrade 造成某些故障" -#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498 +#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 #, c-format msgid "Couldn't find package %s" msgstr "无法找到软件包 %s" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "注意，根据正则表达式“%2$s”选中了 %1$s\n" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1524 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "您可能需要运行“apt-get -f install”来纠正下列错误：" -#: cmdline/apt-get.cc:1518 +#: cmdline/apt-get.cc:1527 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -975,7 +976,7 @@ msgstr "" "有未能满足的依赖关系。请尝试不指明软件包的名字来运行“apt-get -f install”(也可" "以指定一个解决办法)。" -#: cmdline/apt-get.cc:1530 +#: cmdline/apt-get.cc:1539 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -986,7 +987,7 @@ msgstr "" "因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n" "包尚未被创建或是它们还在新到(incoming)目录中。" -#: cmdline/apt-get.cc:1538 +#: cmdline/apt-get.cc:1547 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -995,112 +996,112 @@ msgstr "" "您仅要求对单一软件包进行操作，这极有可能是因为该软件包安装不上，同时，\n" "您最好提交一个针对这个软件包的故障报告。" -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "下列的信息可能会对问题的解决有所帮助：" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "受损安装包" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "将会安装下列的额外的软件包：" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "建议安装的软件包：" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "推荐安装的软件包：" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "正在筹划升级... " -#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99 +#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 msgid "Failed" msgstr "失败" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "完成" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 msgid "Must specify at least one package to fetch source for" msgstr "要下载源代码，必须指定至少一个对应的软件包" -#: cmdline/apt-get.cc:1872 cmdline/apt-get.cc:2079 +#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 #, c-format msgid "Unable to find a source package for %s" msgstr "无法找到与 %s 对应的源代码包" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, c-format msgid "You don't have enough free space in %s" msgstr "您在 %s 上没有足够的空余空间" -#: cmdline/apt-get.cc:1924 +#: cmdline/apt-get.cc:1933 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "需要下载 %sB/%sB 的源代码包。\n" -#: cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "需要下载 %sB 的源代码包。\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "下载源代码 %s\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "有一些包文件无法下载。" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "对于已经被解包到 %s 目录的源代码包就不再解开了\n" -#: cmdline/apt-get.cc:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "运行解包的命令“%s”出错。\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "执行构造软件包命令“%s”失败。\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "子进程出错" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 msgid "Must specify at least one package to check builddeps for" msgstr "要检查生成软件包的构建依赖关系(builddeps)，必须指定至少一个软件包" -#: cmdline/apt-get.cc:2084 +#: cmdline/apt-get.cc:2093 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "无法获得 %s 的构建依赖关系(build-dependency)信息" -#: cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr " %s 没有构建依赖关系信息。\n" -#: cmdline/apt-get.cc:2156 +#: cmdline/apt-get.cc:2165 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "由于无法找到软件包 %3$s ，因此不能满足 %2$s 所要求的 %1$s 依赖关系" -#: cmdline/apt-get.cc:2208 +#: cmdline/apt-get.cc:2217 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1109,30 +1110,30 @@ msgstr "" "由于无法找到符合要求的软件包 %3$s 的可用版本，因此不能满足 %2$s 所要求的 %1" "$s 依赖关系" -#: cmdline/apt-get.cc:2243 +#: cmdline/apt-get.cc:2252 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：已安装的软件包 %3$s 太新了" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：%3$s" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "不能满足软件包 %s 所要求的构建依赖关系。" -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "无法处理构建依赖关系" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "被支持模块：" -#: cmdline/apt-get.cc:2359 +#: cmdline/apt-get.cc:2368 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1378,8 +1379,8 @@ msgid "Duplicate conf file %s/%s" msgstr "重复的配置文件 %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "无法写入文件 %s" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1730,7 +1731,7 @@ msgstr "数据套接字连接超时" msgid "Unable to accept connection" msgstr "无法接受连接" -#: methods/ftp.cc:864 methods/http.cc:916 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "把文件加入散列表时出错" @@ -1857,43 +1858,43 @@ msgstr "该 http 服务器的 range 支持不正常" msgid "Unknown date format" msgstr "无法识别的日期格式" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "select 调用出错" -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "连接服务器超时" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "写输出文件时出错" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "写文件时出错" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "写文件时出错" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "从服务器读取数据时出错，对方关闭了连接" -#: methods/http.cc:834 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "从服务器读取数据出错" -#: methods/http.cc:1065 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "错误的报头数据" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "连接失败" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "内部错误" @@ -2427,11 +2428,11 @@ msgstr "无法写入来源缓存文件" msgid "rename failed, %s (%s -> %s)." msgstr "无法重命名文件，%s (%s -> %s)。" -#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:894 +#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 msgid "MD5Sum mismatch" msgstr "MD5 校验和不符" -#: apt-pkg/acquire-item.cc:708 +#: apt-pkg/acquire-item.cc:714 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2440,7 +2441,7 @@ msgstr "" "我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件" "包。(缘于架构缺失)" -#: apt-pkg/acquire-item.cc:761 +#: apt-pkg/acquire-item.cc:767 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2448,13 +2449,13 @@ msgid "" msgstr "" "我无法找到对应 %s 软件包的文件。在这种情况下您可能需要手动修正这个软件包。" -#: apt-pkg/acquire-item.cc:797 +#: apt-pkg/acquire-item.cc:803 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段" -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "大小不符" diff --git a/po/zh_TW.po b/po/zh_TW.po index cafc2bd5f..f3b425929 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: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" "PO-Revision-Date: 2005-02-19 22:24+0800\n" "Last-Translator: Asho Yeh <asho@debian.org.tw>\n" "Language-Team: Chinese/Traditional <zh-l10n@linux.org.tw>\n" @@ -149,7 +149,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545 -#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s 是針對於 %s %s 並編譯在 %s %s\n" @@ -620,7 +620,7 @@ msgstr "無法將 %s 更名為 %s" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 #, c-format msgid "Regex compilation error - %s" msgstr "編譯正規表示法出錯 - %s" @@ -689,8 +689,9 @@ msgid "%s (due to %s) " msgstr "%s（因為 %s）" #: cmdline/apt-get.cc:544 +#, fuzzy msgid "" -"WARNING: The following essential packages will be removed\n" +"WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" "警告：下列的重要套件都將被刪除\n" @@ -769,11 +770,11 @@ msgstr "出現一些問題,您使用了 -y 選項但是沒有用 --force-yes" msgid "Packages need to be removed but remove is disabled." msgstr "有套件需要被移除,但移除動作被禁止。" -#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802 +#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 msgid "Unable to lock the download directory" msgstr "無法鎖定下載的目錄" -#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061 +#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "無法讀取來源單。" @@ -812,9 +813,9 @@ msgid "Yes, do as I say!" msgstr "是的,請執行我所指定的" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, c-format msgid "" -"You are about to do something potentially harmful\n" +"You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" " ?] " msgstr "" @@ -830,7 +831,7 @@ msgstr "放棄執行。" msgid "Do you want to continue [Y/n]? " msgstr "繼續執行嗎？ 是按 [Y] 鍵，否按 [n] 鍵 " -#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959 +#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 #, c-format msgid "Failed to fetch %s %s\n" msgstr "無法下載『%s』檔案。%s\n" @@ -839,7 +840,7 @@ msgstr "無法下載『%s』檔案。%s\n" msgid "Some files failed to download" msgstr "部份檔案無法下載" -#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 msgid "Download complete and in download only mode" msgstr "下載完畢,目前是“僅下載”模式" @@ -940,7 +941,7 @@ msgstr "選定的版本為 %s (%s) 的 %s\n" msgid "The update command takes no arguments" msgstr "update 指令不需任何參數" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "無法鎖定列表目錄" @@ -954,21 +955,21 @@ msgstr "有一些索引檔案不能下載,它們可能被忽略了,也可能轉 msgid "Internal error, AllUpgrade broke stuff" msgstr "內部錯誤,AllUpgrade 造成錯誤" -#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498 +#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 #, c-format msgid "Couldn't find package %s" msgstr "無法找到 %s 套件。" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "注意,根據正規表示法“%2$s”選擇了 %1$s\n" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1524 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "用『apt-get -f install』指令或許能修正這些問題。" -#: cmdline/apt-get.cc:1518 +#: cmdline/apt-get.cc:1527 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -976,7 +977,7 @@ msgstr "" "無法滿足的相依關係。請嘗試不指定套件明成來執行“apt-get -f install”(或指>\n" "定一個解決辦法)。" -#: cmdline/apt-get.cc:1530 +#: cmdline/apt-get.cc:1539 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -987,7 +988,7 @@ msgstr "" "或是您使用不穩定(unstable)發行版而這些需要的套件尚未完成\n" "或從 Incoming 目錄移除。" -#: cmdline/apt-get.cc:1538 +#: cmdline/apt-get.cc:1547 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -997,112 +998,112 @@ msgstr "" "該套件無法安裝,您最好提交一個針對這個套件\n" "的臭蟲報告。" -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "底下的資訊有助於解決現在的情況:" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "損毀的套件" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "下列的【新】套件都將被安裝：" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "建議(Suggested)的套件:" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "推薦(Recommended)的套件:" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "籌畫升級套件中..." -#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99 +#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 msgid "Failed" msgstr "失敗" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "完成" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 msgid "Must specify at least one package to fetch source for" msgstr "必須指定至少一個對應的套件才能下載源碼" -#: cmdline/apt-get.cc:1872 cmdline/apt-get.cc:2079 +#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 #, c-format msgid "Unable to find a source package for %s" msgstr "無法找到 %s 套件的源碼" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, c-format msgid "You don't have enough free space in %s" msgstr "『%s』內沒有足夠的空間。" -#: cmdline/apt-get.cc:1924 +#: cmdline/apt-get.cc:1933 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "需要下載 %2$sB 中 %1$sB 的原始檔案。\n" -#: cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "需要下載 %sB 的原始檔案。\n" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "下載源碼 %s\n" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "無法下載某些檔案。" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "略過已經被解開到 %s 目錄的源碼檔案\n" -#: cmdline/apt-get.cc:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "執行解開套件指令 '%s' 時失敗。\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "執行建立套件指令 '%s' 時失敗。\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "子程序失敗" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 msgid "Must specify at least one package to check builddeps for" msgstr "必須指定至少一個套件才能檢查其建立相依關係(builddeps)" -#: cmdline/apt-get.cc:2084 +#: cmdline/apt-get.cc:2093 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "無法取得 %s 的建構相依關係。" -#: cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "%s 無建立相依關係訊息。\n" -#: cmdline/apt-get.cc:2156 +#: cmdline/apt-get.cc:2165 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "由於無法找到套件 %3$s ,因此不能滿足 %2$s 所要求的 %1$s 相依關係" -#: cmdline/apt-get.cc:2208 +#: cmdline/apt-get.cc:2217 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1111,30 +1112,30 @@ msgstr "" "由於無法找到符合要求的套件 %3$s 的可用版本,因此不能滿足 %2$s 所要求的 %1$s 的" "相依關係" -#: cmdline/apt-get.cc:2243 +#: cmdline/apt-get.cc:2252 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "無法滿足 %2$s 所要求 %1$s 相依關係:已安裝的套件 %3$s 太新了" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "無法滿足 %2$s 所要求 %1$s 相依關係:%3$s" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "無法滿足套件 %s 所要求的建構相依關係。" -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "無法處理建構相依關係" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "支援模組:" -#: cmdline/apt-get.cc:2359 +#: cmdline/apt-get.cc:2368 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1382,8 +1383,8 @@ msgid "Duplicate conf file %s/%s" msgstr "重複的設定檔 %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" +#, fuzzy, c-format +msgid "Failed to write file %s" msgstr "寫入檔案 %s 失敗" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 @@ -1733,7 +1734,7 @@ msgstr "Data socket 連線逾時" msgid "Unable to accept connection" msgstr "無法允許連線" -#: methods/ftp.cc:864 methods/http.cc:916 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "問題雜湊表" @@ -1860,43 +1861,43 @@ msgstr "http 伺服器有損毀的範圍支援" msgid "Unknown date format" msgstr "未知的資料格式" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "Select 失敗" -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "連線逾時" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "寫入輸出檔時發生錯誤" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "寫入檔案時發生錯誤" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "寫入檔案時發生錯誤" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "從遠端主機讀取錯誤，關閉連線" -#: methods/http.cc:834 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "從伺服器讀取發生錯誤" -#: methods/http.cc:1065 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "壞的標頭資料" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "連線失敗" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "內部錯誤" @@ -2425,31 +2426,31 @@ msgstr "無法寫入來源暫存檔。" msgid "rename failed, %s (%s -> %s)." msgstr "檔名因『%s』更換失敗 (%s → %s)。" -#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:894 +#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 msgid "MD5Sum mismatch" msgstr "MD5 檢查碼不符合。" -#: apt-pkg/acquire-item.cc:708 +#: apt-pkg/acquire-item.cc:714 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "找不到套件『%s』需要的某檔案。請您修理這個套件再試試。" -#: apt-pkg/acquire-item.cc:761 +#: apt-pkg/acquire-item.cc:767 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "找不到套件『%s』需要的某檔案。請您修理這個套件再試試。" -#: apt-pkg/acquire-item.cc:797 +#: apt-pkg/acquire-item.cc:803 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "套件『%s』索引檔損壞—缺少『Filename:』欄。" -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "檔案大小不符合。" diff --git a/share/debian-archive.gpg b/share/debian-archive.gpg index 0db59e674..c391d8fa1 100644 Binary files a/share/debian-archive.gpg and b/share/debian-archive.gpg differ diff --git a/test/conf_clear.cc b/test/conf_clear.cc new file mode 100644 index 000000000..259aa0f39 --- /dev/null +++ b/test/conf_clear.cc @@ -0,0 +1,23 @@ +#include <apt-pkg/configuration.h> +#include <apt-pkg/error.h> + +using namespace std; + +int main(int argc,const char *argv[]) +{ + Configuration Cnf; + + cout << "adding elements" << endl; + Cnf.Set("APT::Keep-Fds::",28); + Cnf.Set("APT::Keep-Fds::",17); + Cnf.Set("APT::Keep-Fds::",47); + Cnf.Dump(); + + cout << "Removing elements" << endl; + Cnf.Clear("APT::Keep-Fds",17); + Cnf.Clear("APT::Keep-Fds",28); + Cnf.Clear("APT::Keep-Fds",47); + Cnf.Dump(); + + return 0; +} diff --git a/test/makefile b/test/makefile index 9ad6233c2..a9dbdc34d 100644 --- a/test/makefile +++ b/test/makefile @@ -38,6 +38,12 @@ LIB_MAKES = apt-pkg/makefile apt-inst/makefile SOURCE = testextract.cc include $(PROGRAM_H) +# Program for testing the config file parser +PROGRAM=conftest_clear +SLIBS = -lapt-pkg +SOURCE = conf_clear.cc +include $(PROGRAM_H) + # Program for testing the config file parser PROGRAM=conftest SLIBS = -lapt-pkg -- cgit v1.2.3 From 59a704f0efe9cf243f1b27ac833558b89728aa9c Mon Sep 17 00:00:00 2001 From: Michael Vogt <michael.vogt@ubuntu.com> Date: Mon, 22 Aug 2005 08:48:50 +0000 Subject: * rred.cc: use the d'tor of FileFd to close the file-fd; acquuire-item.cc: make the QueueNextDiff() code more robust --- apt-pkg/acquire-item.cc | 15 +++++++++------ methods/rred.cc | 11 ++--------- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 166845868..43d29c737 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -218,9 +218,8 @@ string pkgAcqIndexDiffs::Custom600Headers() void pkgAcqIndexDiffs::Failed(string Message,pkgAcquire::MethodConfig *Cnf) { - if(Debug) - std::clog << "Failed(): " << Desc.URI << std::endl - << "Falling back to big package file" << std::endl; + std::clog << "pkgAcqIndexDiffs failed: " << Desc.URI << std::endl + << "Falling back to normal index file aquire" << std::endl; new pkgAcqIndex(Owner, RealURI, Desc.Description,Desc.ShortDesc, ExpectedMD5); Finish(); @@ -268,9 +267,11 @@ bool pkgAcqIndexDiffs::QueueNextDiff() // remove all patches until the next matching patch is found // this requires the Index file to be ordered for(vector<DiffInfo>::iterator I=available_patches.begin(); - I != available_patches.end() && (*I).sha1 != local_sha1; - I++) + available_patches.size() > 0 && I != available_patches.end() + && (*I).sha1 != local_sha1; + I++) { available_patches.erase(I); + } // error checking and falling back if no patch was found if(available_patches.size() == 0) { @@ -433,9 +434,11 @@ void pkgAcqIndexDiffs::Done(string Message,unsigned long Size,string Md5Hash, available_patches.erase(available_patches.begin()); // move into place - if(Debug) + if(Debug) + { std::clog << "Moving patched file in place: " << std::endl << DestFile << " -> " << FinalFile << std::endl; + } Rename(DestFile,FinalFile); // see if there is more to download diff --git a/methods/rred.cc b/methods/rred.cc index e28dc6855..3097fca02 100644 --- a/methods/rred.cc +++ b/methods/rred.cc @@ -178,7 +178,8 @@ bool RredMethod::Fetch(FetchItem *Itm) URIStart(Res); // Res.Filename the destination filename - // Open the source and destination files + // Open the source and destination files (the d'tor of FileFd will do + // the cleanup/closing of the fds) FileFd From(Path,FileFd::ReadOnly); FileFd Patch(Path+".ed",FileFd::ReadOnly); FileFd To(Itm->DestFile,FileFd::WriteEmpty); @@ -193,14 +194,6 @@ bool RredMethod::Fetch(FetchItem *Itm) // now do the actual patching ed_file(fPatch, fFrom, fTo, &Hash); - // clean up - fclose(fFrom); - fclose(fPatch); - fclose(fTo); - To.Close(); - From.Close(); - Patch.Close(); - // XXX need to get the size // Res.Size = Buf.st_size; Res.TakeHashes(Hash); -- cgit v1.2.3 From 3de9ff77a811d67632c9948a953e628ed6a2b78a Mon Sep 17 00:00:00 2001 From: Michael Vogt <michael.vogt@ubuntu.com> Date: Mon, 22 Aug 2005 10:19:43 +0000 Subject: * bugfix/updates in the rred.cc code (big thanks for helping Robert!) --- apt-pkg/acquire-item.cc | 4 ++++ debian/changelog | 2 +- methods/rred.cc | 44 +++++++++++++++++++++++++++++++++++--------- 3 files changed, 40 insertions(+), 10 deletions(-) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 43d29c737..b8886a750 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -255,6 +255,7 @@ void pkgAcqIndexDiffs::Finish(bool allDone) bool pkgAcqIndexDiffs::QueueNextDiff() { + // calc sha1 of the just patched file string FinalFile = _config->FindDir("Dir::State::lists"); FinalFile += URItoFileName(RealURI); @@ -263,6 +264,9 @@ bool pkgAcqIndexDiffs::QueueNextDiff() SHA1Summation SHA1; SHA1.AddFD(fd.Fd(), fd.Size()); string local_sha1 = string(SHA1.Result()); + if(Debug) + std::clog << "QueueNextDiff: " + << FinalFile << " (" << local_sha1 << ")"<<std::endl; // remove all patches until the next matching patch is found // this requires the Index file to be ordered diff --git a/debian/changelog b/debian/changelog index 614041acf..fa1e88244 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,7 +4,7 @@ apt (0.6.40.2) unstable; urgency=low dpkg, added the format to README.progress-reporting * added README.progress-reporting to the apt-doc package - -- + -- apt (0.6.40.1) unstable; urgency=low diff --git a/methods/rred.cc b/methods/rred.cc index 3097fca02..ab73398f5 100644 --- a/methods/rred.cc +++ b/methods/rred.cc @@ -25,15 +25,17 @@ class RredMethod : public pkgAcqMethod #define BUF_SIZE (1024) -// XX use enums +// XXX use enums #define MODE_CHANGED 0 #define MODE_DELETED 1 #define MODE_ADDED 2 +#define ED_OK 0 #define ED_ORDERING 1 #define ED_PARSER 2 #define ED_FAILURE 3 +// XXX someone better go out and understand the error reporting/handling here... int ed_rec(FILE *ed_cmds, FILE *in_file, FILE *out_file, int line, char *buffer, unsigned int bufsize, Hashes *hash) { int pos; @@ -154,8 +156,7 @@ int ed_file(FILE *ed_cmds, FILE *in_file, FILE *out_file, Hashes *hash) { if (result > 0) { while (fgets(buffer, BUF_SIZE, in_file) != NULL) { written = fwrite(buffer, 1, strlen(buffer), out_file); - // XXX add to hash - // sha_process_bytes(buffer, written, &sha); + hash->Add((unsigned char*)buffer, written); } } else { @@ -163,7 +164,7 @@ int ed_file(FILE *ed_cmds, FILE *in_file, FILE *out_file, Hashes *hash) { fprintf(stderr, "Error: %i\n", result); return ED_FAILURE; } - return 0; + return ED_OK; } @@ -192,13 +193,38 @@ bool RredMethod::Fetch(FetchItem *Itm) FILE* fPatch = fdopen(Patch.Fd(), "r"); FILE* fTo = fdopen(To.Fd(), "w"); // now do the actual patching - ed_file(fPatch, fFrom, fTo, &Hash); - - // XXX need to get the size - // Res.Size = Buf.st_size; + if (ed_file(fPatch, fFrom, fTo, &Hash) != ED_OK) { + return false; + } + + // write out the result + fflush(fFrom); + fflush(fPatch); + fflush(fTo); + From.Close(); + Patch.Close(); + To.Close(); + + // Transfer the modification times + struct stat Buf; + if (stat(Path.c_str(),&Buf) != 0) + return _error->Errno("stat",_("Failed to stat")); + + struct utimbuf TimeBuf; + TimeBuf.actime = Buf.st_atime; + TimeBuf.modtime = Buf.st_mtime; + if (utime(Itm->DestFile.c_str(),&TimeBuf) != 0) + return _error->Errno("utime",_("Failed to set modification time")); + + if (stat(Itm->DestFile.c_str(),&Buf) != 0) + return _error->Errno("stat",_("Failed to stat")); + + // return done + Res.LastModified = Buf.st_mtime; + Res.Size = Buf.st_size; Res.TakeHashes(Hash); URIDone(Res); - + return true; } /*}}}*/ -- cgit v1.2.3 From d84cd8651bce12774b8bc5f471c4a3c59fe992de Mon Sep 17 00:00:00 2001 From: Michael Vogt <michael.vogt@ubuntu.com> Date: Tue, 23 Aug 2005 11:29:43 +0000 Subject: * method/rred.cc cleanup (thanks to robertle) --- debian/changelog | 2 +- methods/rred.cc | 292 ++++++++++++++++++++++++++++--------------------------- 2 files changed, 150 insertions(+), 144 deletions(-) diff --git a/debian/changelog b/debian/changelog index fa1e88244..67a42a46c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,7 +4,7 @@ apt (0.6.40.2) unstable; urgency=low dpkg, added the format to README.progress-reporting * added README.progress-reporting to the apt-doc package - -- + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 22 Aug 2005 12:22:04 +0200 apt (0.6.40.1) unstable; urgency=low diff --git a/methods/rred.cc b/methods/rred.cc index ab73398f5..f4d77c64c 100644 --- a/methods/rred.cc +++ b/methods/rred.cc @@ -11,164 +11,170 @@ #include <errno.h> #include <apti18n.h> +/* this method implements a patch functionality similar to "patch --ed" that is + * used by the "tiffany" incremental packages download stuff. it differs from + * "ed" insofar that it is way more restricted (and therefore secure). in the + * moment only the "c", "a" and "d" commands of ed are implemented (diff + * doesn't output any other). additionally the records must be reverse sorted + * by line number and may not overlap (diff *seems* to produce this kind of + * output). + * */ + const char *Prog; class RredMethod : public pkgAcqMethod { + // the size of this doesn't really matter (except for performance) + const static int BUF_SIZE = 1024; + // the ed commands + enum Mode {MODE_CHANGED, MODE_DELETED, MODE_ADDED}; + // return values + enum State {ED_OK, ED_ORDERING, ED_PARSER, ED_FAILURE}; + // this applies a single hunk, it uses a tail recursion to + // reverse the hunks in the file + int ed_rec(FILE *ed_cmds, FILE *in_file, FILE *out_file, int line, + char *buffer, unsigned int bufsize, Hashes *hash); + // apply a patch file + int ed_file(FILE *ed_cmds, FILE *in_file, FILE *out_file, Hashes *hash); + // the methods main method virtual bool Fetch(FetchItem *Itm); public: RredMethod() : pkgAcqMethod("1.1",SingleInstance | SendConfig) {}; - }; -#define BUF_SIZE (1024) - -// XXX use enums -#define MODE_CHANGED 0 -#define MODE_DELETED 1 -#define MODE_ADDED 2 - -#define ED_OK 0 -#define ED_ORDERING 1 -#define ED_PARSER 2 -#define ED_FAILURE 3 - -// XXX someone better go out and understand the error reporting/handling here... -int ed_rec(FILE *ed_cmds, FILE *in_file, FILE *out_file, int line, - char *buffer, unsigned int bufsize, Hashes *hash) { - int pos; - int startline; - int stopline; - int mode; - int written; - char *idx; - - /* get the current command and parse it*/ - if (fgets(buffer, bufsize, ed_cmds) == NULL) { - return line; - } - startline = strtol(buffer, &idx, 10); - if (startline < line) { - return ED_ORDERING; - } - if (*idx == ',') { - idx++; - stopline = strtol(idx, &idx, 10); - } - else { - stopline = startline; - } - if (*idx == 'c') { - mode = MODE_CHANGED; - } - else if (*idx == 'a') { - mode = MODE_ADDED; - } - else if (*idx == 'd') { - mode = MODE_DELETED; - } - else { - return ED_PARSER; - } - /* get the current position */ - pos = ftell(ed_cmds); - /* if this is add or change then go to the next full stop */ - if ((mode == MODE_CHANGED) || (mode == MODE_ADDED)) { - do { - fgets(buffer, bufsize, ed_cmds); - while ((strlen(buffer) == (bufsize - 1)) - && (buffer[bufsize - 2] != '\n')) { - fgets(buffer, bufsize, ed_cmds); - buffer[0] = ' '; - } - } while (strncmp(buffer, ".", 1) != 0); - } - /* do the recursive call */ - line = ed_rec(ed_cmds, in_file, out_file, line, buffer, bufsize, - hash); - /* pass on errors */ - if (line < 0) { - return line; - } - /* apply our hunk */ - fseek(ed_cmds, pos, SEEK_SET); - /* first wind to the current position */ - if (mode != MODE_ADDED) { - startline -= 1; - } - while (line < startline) { - fgets(buffer, bufsize, in_file); - written = fwrite(buffer, 1, strlen(buffer), out_file); - hash->Add((unsigned char*)buffer, written); - while ((strlen(buffer) == (bufsize - 1)) - && (buffer[bufsize - 2] != '\n')) { - fgets(buffer, bufsize, in_file); - written = fwrite(buffer, 1, strlen(buffer), out_file); - hash->Add((unsigned char*)buffer, written); - } - line++; - } - /* include from ed script */ - if ((mode == MODE_ADDED) || (mode == MODE_CHANGED)) { - do { - fgets(buffer, bufsize, ed_cmds); - if (strncmp(buffer, ".", 1) != 0) { - written = fwrite(buffer, 1, strlen(buffer), out_file); - hash->Add((unsigned char*)buffer, written); - while ((strlen(buffer) == (bufsize - 1)) - && (buffer[bufsize - 2] != '\n')) { - fgets(buffer, bufsize, ed_cmds); - written = fwrite(buffer, 1, strlen(buffer), out_file); - hash->Add((unsigned char*)buffer, written); - } - } - else { - break; - } - } while (1); - } - /* ignore the corresponding number of lines from input */ - if ((mode == MODE_DELETED) || (mode == MODE_CHANGED)) { - while (line < stopline) { - fgets(buffer, bufsize, in_file); - while ((strlen(buffer) == (bufsize - 1)) - && (buffer[bufsize - 2] != '\n')) { - fgets(buffer, bufsize, in_file); - } - line++; - } - } - return line; +int RredMethod::ed_rec(FILE *ed_cmds, FILE *in_file, FILE *out_file, int line, + char *buffer, unsigned int bufsize, Hashes *hash) { + int pos; + int startline; + int stopline; + int mode; + int written; + char *idx; + + /* get the current command and parse it*/ + if (fgets(buffer, bufsize, ed_cmds) == NULL) { + return line; + } + startline = strtol(buffer, &idx, 10); + if (startline < line) { + return ED_ORDERING; + } + if (*idx == ',') { + idx++; + stopline = strtol(idx, &idx, 10); + } + else { + stopline = startline; + } + if (*idx == 'c') { + mode = MODE_CHANGED; + } + else if (*idx == 'a') { + mode = MODE_ADDED; + } + else if (*idx == 'd') { + mode = MODE_DELETED; + } + else { + return ED_PARSER; + } + /* get the current position */ + pos = ftell(ed_cmds); + /* if this is add or change then go to the next full stop */ + if ((mode == MODE_CHANGED) || (mode == MODE_ADDED)) { + do { + fgets(buffer, bufsize, ed_cmds); + while ((strlen(buffer) == (bufsize - 1)) + && (buffer[bufsize - 2] != '\n')) { + fgets(buffer, bufsize, ed_cmds); + buffer[0] = ' '; + } + } while (strncmp(buffer, ".", 1) != 0); + } + /* do the recursive call */ + line = ed_rec(ed_cmds, in_file, out_file, line, buffer, bufsize, + hash); + /* pass on errors */ + if (line < 0) { + return line; + } + /* apply our hunk */ + fseek(ed_cmds, pos, SEEK_SET); + /* first wind to the current position */ + if (mode != MODE_ADDED) { + startline -= 1; + } + while (line < startline) { + fgets(buffer, bufsize, in_file); + written = fwrite(buffer, 1, strlen(buffer), out_file); + hash->Add((unsigned char*)buffer, written); + while ((strlen(buffer) == (bufsize - 1)) + && (buffer[bufsize - 2] != '\n')) { + fgets(buffer, bufsize, in_file); + written = fwrite(buffer, 1, strlen(buffer), out_file); + hash->Add((unsigned char*)buffer, written); + } + line++; + } + /* include from ed script */ + if ((mode == MODE_ADDED) || (mode == MODE_CHANGED)) { + do { + fgets(buffer, bufsize, ed_cmds); + if (strncmp(buffer, ".", 1) != 0) { + written = fwrite(buffer, 1, strlen(buffer), out_file); + hash->Add((unsigned char*)buffer, written); + while ((strlen(buffer) == (bufsize - 1)) + && (buffer[bufsize - 2] != '\n')) { + fgets(buffer, bufsize, ed_cmds); + written = fwrite(buffer, 1, strlen(buffer), out_file); + hash->Add((unsigned char*)buffer, written); + } + } + else { + break; + } + } while (1); + } + /* ignore the corresponding number of lines from input */ + if ((mode == MODE_DELETED) || (mode == MODE_CHANGED)) { + while (line < stopline) { + fgets(buffer, bufsize, in_file); + while ((strlen(buffer) == (bufsize - 1)) + && (buffer[bufsize - 2] != '\n')) { + fgets(buffer, bufsize, in_file); + } + line++; + } + } + return line; } -int ed_file(FILE *ed_cmds, FILE *in_file, FILE *out_file, Hashes *hash) { - char buffer[BUF_SIZE]; - int result; - int written; - - /* we do a tail recursion to read the commands in the right order */ - result = ed_rec(ed_cmds, in_file, out_file, 0, buffer, BUF_SIZE, - hash); - - /* read the rest from infile */ - if (result > 0) { - while (fgets(buffer, BUF_SIZE, in_file) != NULL) { - written = fwrite(buffer, 1, strlen(buffer), out_file); - hash->Add((unsigned char*)buffer, written); - } - } - else { - // XXX better error handling - fprintf(stderr, "Error: %i\n", result); - return ED_FAILURE; - } - return ED_OK; +int RredMethod::ed_file(FILE *ed_cmds, FILE *in_file, FILE *out_file, + Hashes *hash) { + char buffer[BUF_SIZE]; + int result; + int written; + + /* we do a tail recursion to read the commands in the right order */ + result = ed_rec(ed_cmds, in_file, out_file, 0, buffer, BUF_SIZE, + hash); + + /* read the rest from infile */ + if (result > 0) { + while (fgets(buffer, BUF_SIZE, in_file) != NULL) { + written = fwrite(buffer, 1, strlen(buffer), out_file); + hash->Add((unsigned char*)buffer, written); + } + } + else { + return ED_FAILURE; + } + return ED_OK; } -// XXX do we need modification times as well? bool RredMethod::Fetch(FetchItem *Itm) { URI Get = Itm->Uri; @@ -194,6 +200,7 @@ bool RredMethod::Fetch(FetchItem *Itm) FILE* fTo = fdopen(To.Fd(), "w"); // now do the actual patching if (ed_file(fPatch, fFrom, fTo, &Hash) != ED_OK) { + _error->Errno("rred", _("Could not patch file")); return false; } @@ -227,7 +234,6 @@ bool RredMethod::Fetch(FetchItem *Itm) return true; } - /*}}}*/ int main(int argc, char *argv[]) { -- cgit v1.2.3 From 6040f5893a85c0206d3fd234c46a608b87a5e9ac Mon Sep 17 00:00:00 2001 From: Michael Vogt <michael.vogt@ubuntu.com> Date: Mon, 29 Aug 2005 14:57:50 +0000 Subject: * debug support (Debug::pkgAcquire::RRed) for rred method added --- apt-pkg/deb/debindexfile.cc | 15 +++++++++++++++ apt-pkg/deb/debindexfile.h | 2 +- methods/rred.cc | 16 ++++++++++++++++ 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc index ff8bce85d..3ceeffdca 100644 --- a/apt-pkg/deb/debindexfile.cc +++ b/apt-pkg/deb/debindexfile.cc @@ -158,6 +158,21 @@ debPackagesIndex::debPackagesIndex(string URI,string Dist,string Section,bool Tr { } /*}}}*/ + +string debPackagesIndex::ArchiveURI(string File) const +{ + // FIXME: Remove as soon as pdiff support is offical + string remap = _config->Find("APT::Diffs::Remap::"+URI,""); + if(!remap.empty()) + { + std::cout << "doing a evil remapping to the URI as requested!\n"; + std::cout << URI << " -> " << remap << std::endl; + return remap+File; + } + + return URI + File; +} + // PackagesIndex::ArchiveInfo - Short version of the archive url /*{{{*/ // --------------------------------------------------------------------- /* This is a shorter version that is designed to be < 60 chars or so */ diff --git a/apt-pkg/deb/debindexfile.h b/apt-pkg/deb/debindexfile.h index a1b9583a4..48a345adf 100644 --- a/apt-pkg/deb/debindexfile.h +++ b/apt-pkg/deb/debindexfile.h @@ -59,7 +59,7 @@ class debPackagesIndex : public pkgIndexFile // Stuff for accessing files on remote items virtual string ArchiveInfo(pkgCache::VerIterator Ver) const; - virtual string ArchiveURI(string File) const {return URI + File;}; + virtual string ArchiveURI(string File) const; // Interface for acquire virtual string Describe(bool Short) const; diff --git a/methods/rred.cc b/methods/rred.cc index f4d77c64c..6fa57f3a6 100644 --- a/methods/rred.cc +++ b/methods/rred.cc @@ -24,6 +24,7 @@ const char *Prog; class RredMethod : public pkgAcqMethod { + bool Debug; // the size of this doesn't really matter (except for performance) const static int BUF_SIZE = 1024; // the ed commands @@ -70,12 +71,23 @@ int RredMethod::ed_rec(FILE *ed_cmds, FILE *in_file, FILE *out_file, int line, } if (*idx == 'c') { mode = MODE_CHANGED; + if (Debug == true) { + std::clog << "changing from line " << startline + << " to " << stopline << std::endl; + } } else if (*idx == 'a') { mode = MODE_ADDED; + if (Debug == true) { + std::clog << "adding after line " << startline << std::endl; + } } else if (*idx == 'd') { mode = MODE_DELETED; + if (Debug == true) { + std::clog << "deleting from line " << startline + << " to " << stopline << std::endl; + } } else { return ED_PARSER; @@ -177,6 +189,7 @@ int RredMethod::ed_file(FILE *ed_cmds, FILE *in_file, FILE *out_file, bool RredMethod::Fetch(FetchItem *Itm) { + Debug = _config->FindB("Debug::pkgAcquire::RRed",false); URI Get = Itm->Uri; string Path = Get.Host + Get.Path; // To account for relative paths // Path contains the filename to patch @@ -185,6 +198,9 @@ bool RredMethod::Fetch(FetchItem *Itm) URIStart(Res); // Res.Filename the destination filename + if (Debug == true) + std::clog << "Patching " << Path << " with " << Path + << ".ed and putting result into " << Itm->DestFile << std::endl; // Open the source and destination files (the d'tor of FileFd will do // the cleanup/closing of the fds) FileFd From(Path,FileFd::ReadOnly); -- cgit v1.2.3 From 2237bd010018aedc2c301cd9357eb5ea6affb436 Mon Sep 17 00:00:00 2001 From: Michael Vogt <michael.vogt@ubuntu.com> Date: Mon, 29 Aug 2005 23:23:31 +0000 Subject: * split the diff acquire code in a bit that gets the index file and one that gets the patches. that make the code cleaner and the list-cleaner happy --- apt-pkg/acquire-item.cc | 323 ++++++++++++++++++++++++++++-------------------- apt-pkg/acquire-item.h | 23 +++- 2 files changed, 211 insertions(+), 135 deletions(-) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index b8886a750..aab8b7ed1 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -134,35 +134,37 @@ void pkgAcquire::Item::Rename(string From,string To) } /*}}}*/ -// AcqIndexDiffs::AcqIndexDiffs - Constructor + +// AcqDiffIndex::AcqDiffIndex - Constructor // --------------------------------------------------------------------- -/* The package diff is added to the queue. one object is constructed - * for each diff and the index +/* Get the DiffIndex file first and see if there are patches availabe + * If so, create a pkgAcqIndexDiffs fetcher that will get and apply the + * patches. If anything goes wrong in that process, it will fall back to + * the original packages file */ -pkgAcqIndexDiffs::pkgAcqIndexDiffs(pkgAcquire *Owner, - string URI,string URIDesc,string ShortDesc, - string ExpectedMD5, vector<DiffInfo> diffs) - : Item(Owner), RealURI(URI), ExpectedMD5(ExpectedMD5), - available_patches(diffs) +pkgAcqDiffIndex::pkgAcqDiffIndex(pkgAcquire *Owner, + string URI,string URIDesc,string ShortDesc, + string ExpectedMD5) + : Item(Owner), RealURI(URI), ExpectedMD5(ExpectedMD5), Description(URIDesc) { - DestFile = _config->FindDir("Dir::State::lists") + "partial/"; - DestFile += URItoFileName(URI); - Debug = _config->FindB("Debug::pkgAcquire::Diffs",false); - Desc.Description = URIDesc; + Desc.Description = URIDesc + "/DiffIndex"; Desc.Owner = this; Desc.ShortDesc = ShortDesc; + Desc.URI = URI + ".diff/Index"; + + DestFile = _config->FindDir("Dir::State::lists") + "partial/"; + DestFile += URItoFileName(URI) + string(".DiffIndex"); + + if(Debug) + std::clog << "pkgAcqDiffIndex: " << Desc.URI << std::endl; + // look for the current package file CurrentPackagesFile = _config->FindDir("Dir::State::lists"); CurrentPackagesFile += URItoFileName(RealURI); - if(Debug) { - std::clog << "pkgAcqIndexDiffs::pkgAcqIndexDiffs(): " - << CurrentPackagesFile << std::endl; - } - if(!FileExists(CurrentPackagesFile) || !_config->FindB("Acquire::Diffs",true)) { // we don't have a pkg file or we don't want to queue @@ -172,37 +174,20 @@ pkgAcqIndexDiffs::pkgAcqIndexDiffs(pkgAcquire *Owner, return; } - if(available_patches.size() == 0) { - State = StateFetchIndex; - QueueDiffIndex(URI); - } else { - State = StateFetchDiff; - QueueNextDiff(); + if(Debug) { + std::clog << "pkgAcqIndexDiffs::pkgAcqIndexDiffs(): " + << CurrentPackagesFile << std::endl; } -} - -void pkgAcqIndexDiffs::QueueDiffIndex(string URI) -{ - Desc.URI = URI + ".diff/Index"; - Desc.Description = Description + "IndexDiff"; - DestFile = _config->FindDir("Dir::State::lists") + "partial/"; - DestFile += URItoFileName(URI) + string(".IndexDiff"); - - if(Debug) - std::clog << "QueueDiffIndex: " << Desc.URI << std::endl; QueueURI(Desc); + } // AcqIndex::Custom600Headers - Insert custom request headers /*{{{*/ // --------------------------------------------------------------------- /* The only header we use is the last-modified header. */ -string pkgAcqIndexDiffs::Custom600Headers() +string pkgAcqDiffIndex::Custom600Headers() { - // we only care for the IndexDiff file - if(State != StateFetchIndex) - return string(""); - string Final = _config->FindDir("Dir::State::lists"); Final += URItoFileName(RealURI) + string(".IndexDiff"); @@ -216,11 +201,170 @@ string pkgAcqIndexDiffs::Custom600Headers() return "\nIndex-File: true\nLast-Modified: " + TimeRFC1123(Buf.st_mtime); } + +bool pkgAcqDiffIndex::ParseDiffIndex(string IndexDiffFile) +{ + if(Debug) + std::clog << "pkgAcqIndexDiffs::ParseIndexDiff() " << IndexDiffFile + << std::endl; + + pkgTagSection Tags; + string ServerSha1; + vector<DiffInfo> available_patches; + + FileFd Fd(IndexDiffFile,FileFd::ReadOnly); + pkgTagFile TF(&Fd); + if (_error->PendingError() == true) + return false; + + if(TF.Step(Tags) == true) + { + string local_sha1; + string tmp = Tags.FindS("SHA1-Current"); + std::stringstream ss(tmp); + ss >> ServerSha1; + + FileFd fd(CurrentPackagesFile, FileFd::ReadOnly); + SHA1Summation SHA1; + SHA1.AddFD(fd.Fd(), fd.Size()); + local_sha1 = string(SHA1.Result()); + + if(local_sha1 == ServerSha1) { + if(Debug) + std::clog << "Package file is up-to-date" << std::endl; + new pkgAcqIndexDiffs(Owner, RealURI, Description, Desc.ShortDesc, + ExpectedMD5, available_patches); + Complete = false; + Status = StatDone; + Dequeue(); + return true; + } + if(Debug) + std::clog << "SHA1-Current: " << ServerSha1 << std::endl; + + // check the historie and see what patches we need + string history = Tags.FindS("SHA1-History"); + std::stringstream hist(history); + DiffInfo d; + string size; + bool found = false; + while(hist >> d.sha1 >> size >> d.file) { + d.size = atoi(size.c_str()); + // read until the first match is found + if(d.sha1 == local_sha1) + found=true; + // from that point on, we probably need all diffs + if(found) { + if(Debug) + std::clog << "Need to get diff: " << d.file << std::endl; + available_patches.push_back(d); + } + } + + // no information how to get the patches, bail out + if(!found) { + if(Debug) + std::clog << "Can't find a patch in the index file" << std::endl; + // Failed will queue a big package file + Failed("", NULL); + } else { + // queue the diffs + new pkgAcqIndexDiffs(Owner, RealURI, Description, Desc.ShortDesc, + ExpectedMD5, available_patches); + Complete = false; + Status = StatDone; + Dequeue(); + return true; + } + } + + return false; +} + +void pkgAcqDiffIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf) +{ + if(Debug) + std::clog << "pkgAcqDiffIndex failed: " << Desc.URI << std::endl + << "Falling back to normal index file aquire" << std::endl; + + new pkgAcqIndex(Owner, RealURI, Description,Desc.ShortDesc, + ExpectedMD5); + + Complete = false; + Status = StatDone; + Dequeue(); +} + +void pkgAcqDiffIndex::Done(string Message,unsigned long Size,string Md5Hash, + pkgAcquire::MethodConfig *Cnf) +{ + if(Debug) + std::clog << "pkgAcqDiffIndex::Done(): " << Desc.URI << std::endl; + + Item::Done(Message,Size,Md5Hash,Cnf); + + string FinalFile; + FinalFile = _config->FindDir("Dir::State::lists")+URItoFileName(RealURI); + + // sucess in downloading the index + // rename the index + FinalFile += string(".IndexDiff"); + if(Debug) + std::clog << "Renaming: " << DestFile << " -> " << FinalFile + << std::endl; + Rename(DestFile,FinalFile); + chmod(FinalFile.c_str(),0644); + DestFile = FinalFile; + + if(!ParseDiffIndex(DestFile)) + return Failed("", NULL); + + Complete = true; + Status = StatDone; + Dequeue(); + return; +} + + + +// AcqIndexDiffs::AcqIndexDiffs - Constructor +// --------------------------------------------------------------------- +/* The package diff is added to the queue. one object is constructed + * for each diff and the index + */ +pkgAcqIndexDiffs::pkgAcqIndexDiffs(pkgAcquire *Owner, + string URI,string URIDesc,string ShortDesc, + string ExpectedMD5, vector<DiffInfo> diffs) + : Item(Owner), RealURI(URI), ExpectedMD5(ExpectedMD5), + available_patches(diffs) +{ + + DestFile = _config->FindDir("Dir::State::lists") + "partial/"; + DestFile += URItoFileName(URI); + + Debug = _config->FindB("Debug::pkgAcquire::Diffs",false); + + Desc.Description = URIDesc; + Desc.Owner = this; + Desc.ShortDesc = ShortDesc; + + if(available_patches.size() == 0) { + // we are done (yeah!) + Finish(true); + } else { + // get the next diff + State = StateFetchDiff; + QueueNextDiff(); + } +} + + 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, Desc.Description,Desc.ShortDesc, + if(Debug) + 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); Finish(); } @@ -240,7 +384,6 @@ void pkgAcqIndexDiffs::Finish(bool allDone) if(Debug) std::clog << "\n\nallDone: " << DestFile << "\n" << std::endl; return; - } if(Debug) @@ -284,11 +427,11 @@ bool pkgAcqIndexDiffs::QueueNextDiff() } // queue the right diff - Desc.URI = string(RealURI) + string(".diff/") + available_patches[0].file + string(".gz"); + Desc.URI = string(RealURI) + ".diff/" + available_patches[0].file + ".gz"; Desc.Description = available_patches[0].file + string(".pdiff"); DestFile = _config->FindDir("Dir::State::lists") + "partial/"; - DestFile += URItoFileName(RealURI + string(".diff/") + available_patches[0].file); + DestFile += URItoFileName(RealURI + ".diff/" + available_patches[0].file); if(Debug) std::clog << "pkgAcqIndexDiffs::QueueNextDiff(): " << Desc.URI << std::endl; @@ -298,74 +441,6 @@ bool pkgAcqIndexDiffs::QueueNextDiff() return true; } -bool pkgAcqIndexDiffs::ParseIndexDiff(string IndexDiffFile) -{ - if(Debug) - std::clog << "pkgAcqIndexDiffs::ParseIndexDiff() " << IndexDiffFile - << std::endl; - - FileFd Fd(IndexDiffFile,FileFd::ReadOnly); - pkgTagFile TF(&Fd); - if (_error->PendingError() == true) - return false; - pkgTagSection Tags; - if(TF.Step(Tags) == true) - { - string local_sha1; - string tmp = Tags.FindS("SHA1-Current"); - std::stringstream ss(tmp); - ss >> ServerSha1; - - FileFd fd(CurrentPackagesFile, FileFd::ReadOnly); - SHA1Summation SHA1; - SHA1.AddFD(fd.Fd(), fd.Size()); - local_sha1 = string(SHA1.Result()); - - if(local_sha1 == ServerSha1) { - if(Debug) - std::clog << "Package file is up-to-date" << std::endl; - Finish(true); - return true; - } - if(Debug) - std::clog << "SHA1-Current: " << ServerSha1 << std::endl; - - // check the historie and see what patches we need - string history = Tags.FindS("SHA1-History"); - std::stringstream hist(history); - DiffInfo d; - string size; - bool found = false; - while(hist >> d.sha1 >> size >> d.file) { - d.size = atoi(size.c_str()); - // read until the first match is found - if(d.sha1 == local_sha1) - found=true; - // from that point on, we probably need all diffs - if(found) { - if(Debug) - std::clog << "Need to get diff: " << d.file << std::endl; - available_patches.push_back(d); - } - } - - // no information how to get the patches, bail out - if(!found) { - if(Debug) - std::clog << "Can't find a patch in the index file" << std::endl; - // Failed will queue a big package file - Failed("", NULL); - } else { - // queue the diffs - new pkgAcqIndexDiffs(Owner, RealURI, Description, Desc.ShortDesc, - ExpectedMD5, available_patches); - Finish(); - return true; - } - } - - return false; -} void pkgAcqIndexDiffs::Done(string Message,unsigned long Size,string Md5Hash, @@ -379,24 +454,6 @@ void pkgAcqIndexDiffs::Done(string Message,unsigned long Size,string Md5Hash, string FinalFile; FinalFile = _config->FindDir("Dir::State::lists")+URItoFileName(RealURI); - // sucess in downloading the index - if(State == StateFetchIndex) - { - // rename the index - FinalFile += string(".IndexDiff"); - if(Debug) - std::clog << "Renaming: " << DestFile << " -> " << FinalFile - << std::endl; - Rename(DestFile,FinalFile); - chmod(FinalFile.c_str(),0644); - DestFile = FinalFile; - - if(!ParseIndexDiff(DestFile)) - return Failed("", NULL); - else - return Finish(); - } - // sucess in downloading a diff, enter ApplyDiff state if(State == StateFetchDiff) { @@ -924,8 +981,8 @@ void pkgAcqMetaIndex::QueueIndexes(bool verify) } // Queue Packages file - new pkgAcqIndexDiffs(Owner, (*Target)->URI, (*Target)->Description, - (*Target)->ShortDesc, ExpectedIndexMD5); + new pkgAcqDiffIndex(Owner, (*Target)->URI, (*Target)->Description, + (*Target)->ShortDesc, ExpectedIndexMD5); } } diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h index 99629216a..f9c1b5b2d 100644 --- a/apt-pkg/acquire-item.h +++ b/apt-pkg/acquire-item.h @@ -83,6 +83,27 @@ class pkgAcquire::Item }; // item for index diffs +class pkgAcqDiffIndex : public pkgAcquire::Item +{ + protected: + bool Debug; + string RealURI; + + public: + // Specialized action members + virtual void Failed(string Message,pkgAcquire::MethodConfig *Cnf); + virtual void Done(string Message,unsigned long Size,string Md5Hash, + pkgAcquire::MethodConfig *Cnf); + virtual string DescURI() {return RealURI + "Index";}; + virtual string Custom600Headers(); + + // helpers + bool ParseDiffIndex(string IndexDiffFile); + + pkgAcqDiffIndex(pkgAcquire *Owner,string URI,string URIDesc, + string ShortDesct, string ExpectedMD5); +} + class pkgAcqIndexDiffs : public pkgAcquire::Item { protected: @@ -113,8 +134,6 @@ class pkgAcqIndexDiffs : public pkgAcquire::Item virtual string Custom600Headers(); // various helpers - bool ParseIndexDiff(string IndexDiffFile); - void QueueDiffIndex(string URI); bool QueueNextDiff(); bool ApplyDiff(string PatchFile); void Finish(bool allDone=false); -- cgit v1.2.3 From 002d99439f800af38ee08fb89ef9651db727f36b Mon Sep 17 00:00:00 2001 From: Michael Vogt <michael.vogt@ubuntu.com> Date: Mon, 29 Aug 2005 23:48:15 +0000 Subject: * fixed apt-pkg/acquire-item.h (looks like the last commit didn't include it?) --- apt-pkg/acquire-item.cc | 53 ++++++++++++++++++++++++------------------------- apt-pkg/acquire-item.h | 21 +++++++++++--------- 2 files changed, 38 insertions(+), 36 deletions(-) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index aab8b7ed1..a1bd2336f 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -220,6 +220,10 @@ bool pkgAcqDiffIndex::ParseDiffIndex(string IndexDiffFile) if(TF.Step(Tags) == true) { string local_sha1; + bool found = false; + DiffInfo d; + string size; + string tmp = Tags.FindS("SHA1-Current"); std::stringstream ss(tmp); ss >> ServerSha1; @@ -232,32 +236,27 @@ bool pkgAcqDiffIndex::ParseDiffIndex(string IndexDiffFile) if(local_sha1 == ServerSha1) { if(Debug) std::clog << "Package file is up-to-date" << std::endl; - new pkgAcqIndexDiffs(Owner, RealURI, Description, Desc.ShortDesc, - ExpectedMD5, available_patches); - Complete = false; - Status = StatDone; - Dequeue(); - return true; - } - if(Debug) - std::clog << "SHA1-Current: " << ServerSha1 << std::endl; - - // check the historie and see what patches we need - string history = Tags.FindS("SHA1-History"); - std::stringstream hist(history); - DiffInfo d; - string size; - bool found = false; - while(hist >> d.sha1 >> size >> d.file) { - d.size = atoi(size.c_str()); - // read until the first match is found - if(d.sha1 == local_sha1) - found=true; - // from that point on, we probably need all diffs - if(found) { - if(Debug) - std::clog << "Need to get diff: " << d.file << std::endl; - available_patches.push_back(d); + // set found to true, this will queue a pkgAcqIndexDiffs with + // a empty availabe_patches + found = true; + } else { + if(Debug) + std::clog << "SHA1-Current: " << ServerSha1 << std::endl; + + // check the historie and see what patches we need + string history = Tags.FindS("SHA1-History"); + std::stringstream hist(history); + while(hist >> d.sha1 >> size >> d.file) { + d.size = atoi(size.c_str()); + // read until the first match is found + if(d.sha1 == local_sha1) + found=true; + // from that point on, we probably need all diffs + if(found) { + if(Debug) + std::clog << "Need to get diff: " << d.file << std::endl; + available_patches.push_back(d); + } } } @@ -287,7 +286,7 @@ void pkgAcqDiffIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf) std::clog << "pkgAcqDiffIndex failed: " << Desc.URI << std::endl << "Falling back to normal index file aquire" << std::endl; - new pkgAcqIndex(Owner, RealURI, Description,Desc.ShortDesc, + new pkgAcqIndex(Owner, RealURI, Description, Desc.ShortDesc, ExpectedMD5); Complete = false; diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h index f9c1b5b2d..b55ac526b 100644 --- a/apt-pkg/acquire-item.h +++ b/apt-pkg/acquire-item.h @@ -83,11 +83,22 @@ class pkgAcquire::Item }; // item for index diffs + +struct DiffInfo { + string file; + string sha1; + unsigned long size; +}; + class pkgAcqDiffIndex : public pkgAcquire::Item { protected: bool Debug; + pkgAcquire::ItemDesc Desc; string RealURI; + string ExpectedMD5; + string CurrentPackagesFile; + string Description; public: // Specialized action members @@ -102,7 +113,7 @@ class pkgAcqDiffIndex : public pkgAcquire::Item pkgAcqDiffIndex(pkgAcquire *Owner,string URI,string URIDesc, string ShortDesct, string ExpectedMD5); -} +}; class pkgAcqIndexDiffs : public pkgAcquire::Item { @@ -113,14 +124,7 @@ class pkgAcqIndexDiffs : public pkgAcquire::Item string ExpectedMD5; // this is the SHA-1 sum we expect after the patching - string ServerSha1; - string CurrentPackagesFile; string Description; - struct DiffInfo { - string file; - string sha1; - unsigned long size; - }; vector<DiffInfo> available_patches; enum {StateFetchIndex,StateFetchDiff,StateUnzipDiff,StateApplyDiff} State; @@ -131,7 +135,6 @@ class pkgAcqIndexDiffs : public pkgAcquire::Item virtual void Done(string Message,unsigned long Size,string Md5Hash, pkgAcquire::MethodConfig *Cnf); virtual string DescURI() {return RealURI + "Index";}; - virtual string Custom600Headers(); // various helpers bool QueueNextDiff(); -- cgit v1.2.3 From cffc2ddd412bb0af8e0fe716dacb2da07fe6ddbc Mon Sep 17 00:00:00 2001 From: Michael Vogt <michael.vogt@ubuntu.com> Date: Tue, 30 Aug 2005 00:23:07 +0000 Subject: * fix a missing StatDone if nothing needs to be fetched --- apt-pkg/acquire-item.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index a1bd2336f..5265ef3a6 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -379,6 +379,7 @@ void pkgAcqIndexDiffs::Finish(bool allDone) DestFile = _config->FindDir("Dir::State::lists"); DestFile += URItoFileName(RealURI); Complete = true; + Status = StatDone; Dequeue(); if(Debug) std::clog << "\n\nallDone: " << DestFile << "\n" << std::endl; -- cgit v1.2.3 From 8bbf85bf0561b8f2fad4bab82b230d4d5e13dd1f Mon Sep 17 00:00:00 2001 From: Michael Vogt <michael.vogt@ubuntu.com> Date: Tue, 30 Aug 2005 00:31:06 +0000 Subject: * be less verbose and call the Url-Remap: APT::URL-Remap --- apt-pkg/deb/debindexfile.cc | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc index 3ceeffdca..b3b77dad7 100644 --- a/apt-pkg/deb/debindexfile.cc +++ b/apt-pkg/deb/debindexfile.cc @@ -161,14 +161,10 @@ debPackagesIndex::debPackagesIndex(string URI,string Dist,string Section,bool Tr string debPackagesIndex::ArchiveURI(string File) const { - // FIXME: Remove as soon as pdiff support is offical - string remap = _config->Find("APT::Diffs::Remap::"+URI,""); + // FIXME: EVIL! Remove as soon as pdiff support is offical + string remap = _config->Find("APT::URL-Remap::"+URI,""); if(!remap.empty()) - { - std::cout << "doing a evil remapping to the URI as requested!\n"; - std::cout << URI << " -> " << remap << std::endl; return remap+File; - } return URI + File; } -- cgit v1.2.3 From f8ad6f9b0dbcef95d3bbbe6481d3e10e9ed684d0 Mon Sep 17 00:00:00 2001 From: Michael Vogt <michael.vogt@ubuntu.com> Date: Tue, 6 Sep 2005 09:40:22 +0000 Subject: * dont bump the soname, it doesn't break the abi! --- apt-pkg/makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apt-pkg/makefile b/apt-pkg/makefile index 0e6aecc65..8de7d945e 100644 --- a/apt-pkg/makefile +++ b/apt-pkg/makefile @@ -13,7 +13,7 @@ include ../buildlib/defaults.mak # methods/makefile - FIXME LIBRARY=apt-pkg LIBEXT=$(GLIBC_VER)$(LIBSTDCPP_VER) -MAJOR=3.11 +MAJOR=3.10 MINOR=0 SLIBS=$(PTHREADLIB) $(INTLLIBS) APT_DOMAIN:=libapt-pkg$(MAJOR) -- cgit v1.2.3 From 2d4722e202421007bc34f5439ab4a7cd0bd1148f Mon Sep 17 00:00:00 2001 From: Michael Vogt <michael.vogt@ubuntu.com> Date: Fri, 9 Sep 2005 00:06:10 +0000 Subject: * don't forget the final md5sum checking! --- apt-pkg/acquire-item.cc | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index c4c0b73a9..8a9a4c5bb 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -375,9 +375,26 @@ void pkgAcqIndexDiffs::Finish(bool allDone) // we restore the original name, this is required, otherwise // the file will be cleaned if(allDone) { - // this is for the "real" finish 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) + { + Status = StatAuthError; + ErrorText = _("MD5Sum mismatch"); + Rename(DestFile,DestFile + ".FAILED"); + Dequeue(); + return; + } + + // this is for the "real" finish Complete = true; Status = StatDone; Dequeue(); -- cgit v1.2.3 From cec6091772ae3463cb04c417e3f598f9b6814516 Mon Sep 17 00:00:00 2001 From: Michael Vogt <michael.vogt@ubuntu.com> Date: Mon, 17 Oct 2005 14:33:58 +0000 Subject: * removed the URL-Reamp hack (we have pdiff support in the main archive now), removed bw-limit support (NO idea how that got into this archive in the first place) --- apt-pkg/acquire.cc | 4 ---- apt-pkg/deb/debindexfile.cc | 11 ----------- apt-pkg/deb/debindexfile.h | 2 +- debian/rules | 2 +- methods/http.cc | 38 +------------------------------------- methods/http.h | 5 ----- 6 files changed, 3 insertions(+), 59 deletions(-) diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc index 47655af80..62209e65b 100644 --- a/apt-pkg/acquire.cc +++ b/apt-pkg/acquire.cc @@ -267,10 +267,6 @@ pkgAcquire::MethodConfig *pkgAcquire::GetConfig(string Access) if (Work.Start() == false) return 0; - /* if a method uses DownloadLimit, we switch to SingleInstance mode */ - if(_config->FindI("Acquire::"+Access+"::DlLimit",0) > 0) - Conf->SingleInstance = true; - return Conf; } /*}}}*/ diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc index b3b77dad7..ff8bce85d 100644 --- a/apt-pkg/deb/debindexfile.cc +++ b/apt-pkg/deb/debindexfile.cc @@ -158,17 +158,6 @@ debPackagesIndex::debPackagesIndex(string URI,string Dist,string Section,bool Tr { } /*}}}*/ - -string debPackagesIndex::ArchiveURI(string File) const -{ - // FIXME: EVIL! Remove as soon as pdiff support is offical - string remap = _config->Find("APT::URL-Remap::"+URI,""); - if(!remap.empty()) - return remap+File; - - return URI + File; -} - // PackagesIndex::ArchiveInfo - Short version of the archive url /*{{{*/ // --------------------------------------------------------------------- /* This is a shorter version that is designed to be < 60 chars or so */ diff --git a/apt-pkg/deb/debindexfile.h b/apt-pkg/deb/debindexfile.h index 48a345adf..a1b9583a4 100644 --- a/apt-pkg/deb/debindexfile.h +++ b/apt-pkg/deb/debindexfile.h @@ -59,7 +59,7 @@ class debPackagesIndex : public pkgIndexFile // Stuff for accessing files on remote items virtual string ArchiveInfo(pkgCache::VerIterator Ver) const; - virtual string ArchiveURI(string File) const; + virtual string ArchiveURI(string File) const {return URI + File;}; // Interface for acquire virtual string Describe(bool Short) const; diff --git a/debian/rules b/debian/rules index 40f5add37..cd026b4a4 100755 --- a/debian/rules +++ b/debian/rules @@ -36,7 +36,7 @@ endif # Default rule build: -DEB_BUILD_PROG:=debuild --preserve-envvar PATH --preserve-envvar CCACHE_DIR -us -uc $(DEBUILD_DPKG_BUILDPACKAGE_OPTS) +DEB_BUILD_PROG:=debuild --preserve-envvar PATH --preserve-envvar CCACHE_DIR -us -uc $(DEB_BUILD_PROG_OPTS) APT_DEBVER=$(shell dpkg-parsechangelog |sed -n -e '/^Version:/s/^Version: //p') APT_CONFVER=$(shell sed -n -e 's/^AC_DEFINE_UNQUOTED(VERSION,"\(.*\)")/\1/p' configure.in) APT_CVSTAG=$(shell echo "$(APT_DEBVER)" | sed -e 's/^/v/' -e 's/\./_/g') diff --git a/methods/http.cc b/methods/http.cc index 2ec1fe631..e2337a9ba 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -59,11 +59,6 @@ unsigned long TimeOut = 120; bool Debug = false; -unsigned long CircleBuf::BwReadLimit=0; -unsigned long CircleBuf::BwTickReadData=0; -struct timeval CircleBuf::BwReadTick={0,0}; -const unsigned int CircleBuf::BW_HZ=10; - // CircleBuf::CircleBuf - Circular input buffer /*{{{*/ // --------------------------------------------------------------------- /* */ @@ -71,8 +66,6 @@ CircleBuf::CircleBuf(unsigned long Size) : Size(Size), Hash(0) { Buf = new unsigned char[Size]; Reset(); - - CircleBuf::BwReadLimit = _config->FindI("Acquire::http::DlLimit",0)*1024; } /*}}}*/ // CircleBuf::Reset - Reset to the default state /*{{{*/ @@ -98,45 +91,16 @@ void CircleBuf::Reset() is non-blocking.. */ bool CircleBuf::Read(int Fd) { - unsigned long BwReadMax; - while (1) { // Woops, buffer is full if (InP - OutP == Size) return true; - // what's left to read in this tick - BwReadMax = CircleBuf::BwReadLimit/BW_HZ; - - if(CircleBuf::BwReadLimit) { - struct timeval now; - gettimeofday(&now,0); - - unsigned long d = (now.tv_sec-CircleBuf::BwReadTick.tv_sec)*1000000 + - now.tv_usec-CircleBuf::BwReadTick.tv_usec; - if(d > 1000000/BW_HZ) { - CircleBuf::BwReadTick = now; - CircleBuf::BwTickReadData = 0; - } - - if(CircleBuf::BwTickReadData >= BwReadMax) { - usleep(1000000/BW_HZ); - return true; - } - } - // Write the buffer segment int Res; - if(CircleBuf::BwReadLimit) { - Res = read(Fd,Buf + (InP%Size), - BwReadMax > LeftRead() ? LeftRead() : BwReadMax); - } else - Res = read(Fd,Buf + (InP%Size),LeftRead()); + Res = read(Fd,Buf + (InP%Size),LeftRead()); - if(Res > 0 && BwReadLimit > 0) - CircleBuf::BwTickReadData += Res; - if (Res == 0) return false; if (Res < 0) diff --git a/methods/http.h b/methods/http.h index 541e2952c..c5a4d0e86 100644 --- a/methods/http.h +++ b/methods/http.h @@ -31,11 +31,6 @@ class CircleBuf unsigned long MaxGet; struct timeval Start; - static unsigned long BwReadLimit; - static unsigned long BwTickReadData; - static struct timeval BwReadTick; - static const unsigned int BW_HZ; - unsigned long LeftRead() { unsigned long Sz = Size - (InP - OutP); -- cgit v1.2.3