diff options
| -rw-r--r-- | .bzrignore | 10 | ||||
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | apt-pkg/acquire-item.cc | 302 | ||||
| -rw-r--r-- | apt-pkg/acquire-item.h | 108 | ||||
| -rw-r--r-- | apt-pkg/acquire-worker.cc | 3 | ||||
| -rw-r--r-- | apt-pkg/acquire.cc | 7 | ||||
| -rw-r--r-- | apt-pkg/cachefile.cc | 34 | ||||
| -rw-r--r-- | apt-pkg/contrib/fileutl.cc | 17 | ||||
| -rw-r--r-- | apt-pkg/contrib/fileutl.h | 1 | ||||
| -rw-r--r-- | apt-pkg/deb/debindexfile.cc | 10 | ||||
| -rw-r--r-- | apt-pkg/deb/debmetaindex.cc | 21 | ||||
| -rw-r--r-- | apt-pkg/init.cc | 3 | ||||
| -rw-r--r-- | apt-pkg/packagemanager.cc | 6 | ||||
| -rwxr-xr-x | aptget | 2 | ||||
| -rwxr-xr-x | aptget2 | 2 | ||||
| -rwxr-xr-x | buildproject | 4 | ||||
| -rw-r--r-- | cmdline/apt-get.cc | 1 | ||||
| -rw-r--r-- | doc/po/apt-doc.pot | 140 | ||||
| -rw-r--r-- | doc/po/de.po | 241 | ||||
| -rw-r--r-- | doc/po/es.po | 160 | ||||
| -rw-r--r-- | doc/po/fr.po | 160 | ||||
| -rw-r--r-- | doc/po/it.po | 139 | ||||
| -rw-r--r-- | doc/po/ja.po | 159 | ||||
| -rw-r--r-- | doc/po/pl.po | 139 | ||||
| -rw-r--r-- | doc/po/pt.po | 160 | ||||
| -rw-r--r-- | doc/po/pt_BR.po | 139 | ||||
| -rw-r--r-- | methods/debdelta.cc | 168 | ||||
| -rw-r--r-- | methods/makefile | 7 | ||||
| -rw-r--r-- | po/apt-all.pot | 904 | ||||
| -rwxr-xr-x | test/methods/debdelta/test-signature | 47 | ||||
| -rw-r--r-- | test/methods/debdelta/test.txt | 3 |
31 files changed, 2674 insertions, 427 deletions
diff --git a/.bzrignore b/.bzrignore index 7c4b11b10..1fedc3e60 100644 --- a/.bzrignore +++ b/.bzrignore @@ -25,3 +25,13 @@ abicheck/tests/ ./doc/*/ !./doc/examples/ !./doc/po/ + +doc/po/apt-doc.pot +doc/po/de.po +doc/po/es.po +doc/po/fr.po +doc/po/it.po +doc/po/ja.po +doc/po/pl.po +doc/po/pt.po +doc/po/pt_BR.po @@ -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 215615bdd..b85e5d19b 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -727,7 +727,7 @@ void pkgAcqIndexDiffs::Done(string Message,unsigned long Size,string Md5Hash, /* // rred excepts the patch as $FinalFile.ed Rename(DestFile,FinalFile+".ed"); - + std::clog << " Sending to rred method FinalFile: " << FinalFile << std::endl; if(Debug) std::clog << "Sending to rred method: " << FinalFile << std::endl; @@ -2066,7 +2066,305 @@ string pkgAcqFile::Custom600Headers() return "\nIndex-File: true"; return ""; } - /*}}}*/ +/*}}}*/ + +pkgAcqDebdelta::pkgAcqDebdelta(pkgAcquire *Owner,pkgSourceList *Sources, + pkgRecords *Recs,pkgCache::VerIterator const &Version, + string &StoreFilename) : + Item(Owner), Version(Version), Sources(Sources), Recs(Recs), + StoreFilename(StoreFilename), Vf(Version.FileList()), + Trusted(false) +{ + DebdeltaName = string(Version.ParentPkg().Name()) + "_" + + string(Version.ParentPkg().CurVersion()) + "_" + + string(Version.ParentPkg().CandVersion()) + "_" + + string(Version.Arch()) + ".debdelta"; + Retries = _config->FindI("Acquire::Retries",0); + Debug = true; + if (Version.Arch() == 0) + { + _error->Error(_("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)"), + Version.ParentPkg().Name()); + return; + } + + /* We need to find a filename to determine the extension. We make the + assumption here that all the available sources for this version share + the same extension.. */ + // Skip not source sources, they do not have file fields. + for (; Vf.end() == false; Vf++) + { + if ((Vf.File()->Flags & pkgCache::Flag::NotSource) != 0) + continue; + break; + } + + // Does not really matter here.. we are going to fail out below + if (Vf.end() != true) + { + // If this fails to get a file name we will bomb out below. + pkgRecords::Parser &Parse = Recs->Lookup(Vf); + if (_error->PendingError() == true) + return; + + DebdeltaName = StoreFilename = QuoteString(DebdeltaName, ":"); + DestFile = _config->FindDir("Dir::Cache::Archives") + "partial/" + flNotDir(StoreFilename); + } + + // check if we have one trusted source for the package. if so, switch + // to "TrustedOnly" mode + for (pkgCache::VerFileIterator i = Version.FileList(); i.end() == false; i++) + { + pkgIndexFile *Index; + if (Sources->FindIndex(i.File(),Index) == false) + continue; + if (_config->FindB("Debug::pkgAcquire::Auth", false)) + { + std::cerr << "Checking index: " << Index->Describe() + << "(Trusted=" << Index->IsTrusted() << ")\n"; + } + if (Index->IsTrusted()) { + Trusted = true; + break; + } + } + + // "allow-unauthenticated" restores apts old fetching behaviour + // that means that e.g. unauthenticated file:// uris are higher + // priority than authenticated http:// uris + if (_config->FindB("APT::Get::AllowUnauthenticated",false) == true) + Trusted = false; + if (Debug) { + std::cerr << "\n[Debdelta] pkgAcqDebdelta::pkgAcqDebdelta()" << std::endl; + std::cerr << " DebdeltaName : " << DebdeltaName << std::endl; + std::cerr << " StoreFilename: " << StoreFilename << std::endl; + std::cerr << " DestFile : " << DestFile << std::endl; + } + DebdeltaStatus = Fetching; + if (QueueNext() == false && _error->PendingError() == false) + _error->Error(_("I wasn't able to locate a file for the %s package. " + "This might mean you need to manually fix this package."), + Version.ParentPkg().Name()); +} + +bool pkgAcqDebdelta::QueueNext() +{ + string const ForceHash = _config->Find("Acquire::ForceHash"); + + for (; Vf.end() == false; Vf++) + { + // Ignore not source sources + if ((Vf.File()->Flags & pkgCache::Flag::NotSource) != 0) + continue; + + // Try to cross match against the source list + pkgIndexFile *Index; + if (Sources->FindIndex(Vf.File(),Index) == false) + continue; + + // only try to get a trusted package from another source if that source + // is also trusted + if(Trusted && !Index->IsTrusted()) + continue; + + // Grab the text package record + pkgRecords::Parser &Parse = Recs->Lookup(Vf); + if (_error->PendingError() == true) + return false; + + string PkgFile = Parse.FileName(); + //std::cerr << " PkgFile:" << PkgFile << std::endl; + if (ForceHash.empty() == false) + { + if(stringcasecmp(ForceHash, "sha256") == 0) + ExpectedHash = HashString("SHA256", Parse.SHA256Hash()); + else if (stringcasecmp(ForceHash, "sha1") == 0) + ExpectedHash = HashString("SHA1", Parse.SHA1Hash()); + else + ExpectedHash = HashString("MD5Sum", Parse.MD5Hash()); + } + else + { + string Hash; + if ((Hash = Parse.SHA256Hash()).empty() == false) + ExpectedHash = HashString("SHA256", Hash); + else if ((Hash = Parse.SHA1Hash()).empty() == false) + ExpectedHash = HashString("SHA1", Hash); + else + ExpectedHash = HashString("MD5Sum", Parse.MD5Hash()); + } + if (PkgFile.empty() == true) + return _error->Error(_("The package index files are corrupted. No Filename: " + "field for package %s."), + Version.ParentPkg().Name()); + // See if we already have the deb + FileSize = Version->Size; + string FinalFile = _config->FindDir("Dir::Cache::Archives") + flNotDir(PkgFile); + struct stat Buf; + if (stat(FinalFile.c_str(),&Buf) == 0) + { + if (Debug) + std::cerr << "[Debdelta] File already exists. " << FinalFile << std::endl; + // TODO: check if this ok. Make sure the size matches + if ((unsigned)Buf.st_size == Version->Size) + { + Complete = true; + Local = true; + Status = StatDone; + DebdeltaStatus = Completed; + StoreFilename = DestFile = FinalFile; + return true; + } + /* Hmm, we have a file and its size does not match, this means it is + an old style mismatched arch */ + unlink(FinalFile.c_str()); + } + + // Create the item + Local = false; + // See if we already have the debdelta in the partial dir. + if (FileExists(DestFile)) + { + // TODO: verify the sum/size of it. + if (Debug) + std::cerr << "[Debdelta] File already exists. " << DestFile << std::endl; + Desc.URI = "debdelta:" + DestFile; + Mode = "debdelta"; + DebdeltaStatus = Patching; + Local = true; + } + else + { + Desc.URI = flNotFile(Index->ArchiveURI(PkgFile)) + DebdeltaName; + ReplaceURI(); + } + Desc.Description = "[Debdelta] " + Index->ArchiveInfo(Version); + Desc.Owner = this; + Desc.ShortDesc = "[Debdelta] " + string(Version.ParentPkg().Name()); + if (Debug) { + std::cerr << "[Debdelta] pkgAcqDebdelta::QueueNext()" << std::endl; + std::cerr << " DestFile : " << DestFile << std::endl; + std::cerr << " Desc.URI : " << Desc.URI << std::endl; + std::cerr << " StoreFileName: " << StoreFilename << std::endl; + } + Vf++; + QueueURI(Desc); + return true; + } + return false; +} + +void pkgAcqDebdelta::Failed(string Message,pkgAcquire::MethodConfig *Cnf) +{ + if (Debug) { + std::cerr << "\n[Debdelta] Failed to download " << Desc.URI << std::endl; + std::cerr << "[Debdelta] Message:\n" << Message << std::endl; + } + // TODO: find out what went wrong and display to the user + new pkgAcqArchive(Owner, Sources, Recs, Version, StoreFilename); + Complete = false; + Status = StatError; + DebdeltaStatus = FetchingFailure; + Item::Failed(Message, Cnf); + Dequeue(); +} + +void pkgAcqDebdelta::Done(string Message,unsigned long Size,string Hash, + pkgAcquire::MethodConfig *Cnf) +{ + // TODO: there must be two stages within this method. + // one for downloading debdelta. another for verifying the resulting .deb + if (Debug) std::cerr << "[Debdelta] pkgAcqDebdelta::Done() state: " << DebdeltaStatus << std::endl; + // Grab the output filename + string FileName = LookupTag(Message,"Filename"); + if (Debug) { + std::cerr << " StoreFileName: " << StoreFilename + << "\n DestFile : " << DestFile + << "\n Desc.URI : " << Desc.URI + << "\n FileName : " << FileName << std::endl; + } + if (DebdeltaStatus == Patching) + { + if (Debug) std::cerr << "[Debdelta] Patching Done. Verifying "<< FileName << "..." << std::endl; + if (ExpectedHash.toStr() != Hash) + { + Status = StatError; + ErrorText = _("[Debdelta] Hash Sum mismatch"); + if(FileExists(DestFile)) + if (!Local) + Rename(DestFile, DestFile + ".FAILED"); + //return; // TODO: UNCOMMENT + } + // Check the size + if (Size != Version->Size) + { + Status = StatError; + ErrorText = _("[Debdelta] Size mismatch"); + //return; // TODO: UNCOMMEnT + } + DebdeltaStatus = Completed; + Complete = true; + Status = StatDone; + StoreFilename = FileName; + Item::Done(Message,Size,Hash,Cnf); + return; + } + // TODO: Check the sum/size + //std::cerr << "[Debdelta] Verifying " << DestFile << std::endl; + if (FileName.empty() == true) + { + Status = StatError; + ErrorText = "[Debdelta] Method gave a blank filename"; + return; + } + if (FileName != DestFile) // this is set in the file/http methods + { + // file => FileName != DestFile (i.e. FileName is the local file) + // http => FileName == DestFile (i.e. FileName is some local place. may be within "partial" dir) + Local = true; + } + DebdeltaStatus = Patching; + Rename(DestFile, FileName); + DestFile = StoreFilename = FileName; + chmod(DestFile.c_str(), 0644); + Desc.URI = "debdelta:" + StoreFilename; + Mode = "debdelta"; + QueueURI(Desc); +} + +void pkgAcqDebdelta::Finished() +{ + if (Debug) + std::cerr << "[Debdelta] pkgAcqDebdelta::Finished() state: " << DebdeltaStatus << std::endl; + if (Status == pkgAcquire::Item::StatDone && + Complete == true) + return; + StoreFilename = string(); +} + +bool pkgAcqDebdelta::ReplaceURI() +{ + const Configuration::Item* item = _config->Tree("Aquire::Debdelta::Replace-Rule"); + for (item = item->Child; item != 0; item = item->Next) + { + size_t pos = 0; + // see if the Des.URI is available in the URI-Space + if ((pos = Desc.URI.find(item->Tag, pos)) != std::string::npos) + { + Desc.URI.replace(pos, item->Tag.length(), item->Value); + if (Debug) + { + std::cerr << "[Debdelta] Replaced " << item->Tag << " => " << item->Value << std::endl; + std::cerr << " New URI: " << Desc.URI << std::endl; + } + return true; + } + } + return _error->Error("[Debdelta] Could not find a replacement URI."); +} + bool IndexTarget::IsOptional() const { if (strncmp(ShortDesc.c_str(), "Translation", 11) != 0) return false; diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h index f763577ee..aa852ccc9 100644 --- a/apt-pkg/acquire-item.h +++ b/apt-pkg/acquire-item.h @@ -1018,6 +1018,114 @@ class pkgAcqFile : public pkgAcquire::Item bool IsIndexFile=false); }; /*}}}*/ + +/** \brief An item that is responsible for fetching a debdelta file. {{{ + * + * If the package file already exists in the cache, nothing will be + * done + */ +class pkgAcqDebdelta : public pkgAcquire::Item +{ + protected: + string DebdeltaName; + /** \brief The package version being fetched. */ + pkgCache::VerIterator Version; + + /** \brief The fetch command that is currently being processed. */ + pkgAcquire::ItemDesc Desc; + + /** \brief The list of sources from which to pick archives to + * download this package from. + */ + pkgSourceList *Sources; + + /** \brief A package records object, used to look up the file + * corresponding to each version of the package. + */ + pkgRecords *Recs; + + /** \brief The hashsum of this package. */ + HashString ExpectedHash; + + /** \brief A location in which the actual filename of the package + * should be stored. + */ + string &StoreFilename; + + /** \brief The next file for this version to try to download. */ + pkgCache::VerFileIterator Vf; + + /** \brief How many (more) times to try to find a new source from + * which to download this package version if it fails. + * + * Set from Acquire::Retries. + */ + unsigned int Retries; + + /** \brief \b true if this version file is being downloaded from a + * trusted source. + */ + bool Trusted; + + /** + * \brief used to debug the class + */ + bool Debug; + /** \brief Queue up the next available file for this version. */ + bool QueueNext(); + + public: + + virtual void Failed(string Message,pkgAcquire::MethodConfig *Cnf); + virtual void Done(string Message,unsigned long Size,string Hash, + pkgAcquire::MethodConfig *Cnf); + virtual string DescURI() {return Desc.URI;}; + virtual string ShortDesc() {return Desc.ShortDesc;}; + virtual void Finished(); + virtual string HashSum() {return ExpectedHash.toStr(); }; + virtual bool IsTrusted() {return Trusted;}; + virtual bool ReplaceURI(); + /** \brief Create a new pkgAcqArchive. + * + * \param Owner The pkgAcquire object with which this item is + * associated. + * + * \param Sources The sources from which to download version + * files. + * + * \param Recs A package records object, used to look up the file + * corresponding to each version of the package. + * + * \param Version The package version to download. + * + * \param StoreFilename A location in which the actual filename of + * the package should be stored. It will be set to a guessed + * basename in the constructor, and filled in with a fully + * qualified filename once the download finishes. + */ + pkgAcqDebdelta(pkgAcquire *Owner,pkgSourceList *Sources, + pkgRecords *Recs,pkgCache::VerIterator const &Version, + string &StoreFilename); + enum DebdeltaState + { + Fetching, + Patching, + Completed, + FetchingFailure + } DebdeltaStatus; +}; + /*}}}*/ + +/** \brief Retrieve an arbitrary file to the current directory. {{{ + * + * The file is retrieved even if it is accessed via a URL type that + * normally is a NOP, such as "file". If the download fails, the + * partial file is renamed to get a ".FAILED" extension. + */ +class pkgAcqDebdeltaIndex : public pkgAcquire::Item +{}; + /*}}}*/ + /** @} */ #endif diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc index 75e03232a..1a17dfa5c 100644 --- a/apt-pkg/acquire-worker.cc +++ b/apt-pkg/acquire-worker.cc @@ -332,6 +332,7 @@ bool pkgAcquire::Worker::RunMessages() // 400 URI Failure case 400: { + std::cerr <<" 400 URI Failure" << std::endl; if (Itm == 0) { _error->Error("Method gave invalid 400 URI Failure message"); @@ -364,11 +365,13 @@ bool pkgAcquire::Worker::RunMessages() // 401 General Failure case 401: + std::cerr <<" 401 General Failure" << std::endl; _error->Error("Method %s General failure: %s",Access.c_str(),LookupTag(Message,"Message").c_str()); break; // 403 Media Change case 403: + std::cerr <<" 403 Media Change" << std::endl; MediaChange(Message); break; } diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc index 9478cdfb4..7596aa956 100644 --- a/apt-pkg/acquire.cc +++ b/apt-pkg/acquire.cc @@ -228,9 +228,10 @@ void pkgAcquire::Enqueue(ItemDesc &Item) // Some trace stuff if (Debug == true) { - clog << "Fetching " << Item.URI << endl; - clog << " to " << Item.Owner->DestFile << endl; - clog << " Queue is: " << Name << endl; + clog << "pkgAcquire::Enqueue()" << endl; + clog << " Fetching " << Item.URI << endl; + clog << " to " << Item.Owner->DestFile << endl; + clog << " Queue is: " << Name << endl; } } /*}}}*/ diff --git a/apt-pkg/cachefile.cc b/apt-pkg/cachefile.cc index 964c5bd8b..a253f17f6 100644 --- a/apt-pkg/cachefile.cc +++ b/apt-pkg/cachefile.cc @@ -50,23 +50,23 @@ pkgCacheFile::~pkgCacheFile() /* */ bool pkgCacheFile::BuildCaches(OpProgress *Progress, bool WithLock) { - if (Cache != NULL) - return true; - - if (_config->FindB("pkgCacheFile::Generate", true) == false) - { - Map = new MMap(*new FileFd(_config->FindFile("Dir::Cache::pkgcache"), - FileFd::ReadOnly),MMap::Public|MMap::ReadOnly); - Cache = new pkgCache(Map); - if (_error->PendingError() == true) - return false; - return true; - } - - const bool ErrorWasEmpty = _error->empty(); - if (WithLock == true) - if (_system->Lock() == false) - return false; + if (Cache != NULL) + return true; + + if (_config->FindB("pkgCacheFile::Generate", true) == false) + { + Map = new MMap(*new FileFd(_config->FindFile("Dir::Cache::pkgcache"), + FileFd::ReadOnly),MMap::Public|MMap::ReadOnly); + Cache = new pkgCache(Map); + if (_error->PendingError() == true) + return false; + return true; + } + + const bool ErrorWasEmpty = _error->empty(); + if (WithLock == true) + if (_system->Lock() == false) + return false; if (_config->FindB("Debug::NoLocking",false) == true) WithLock = false; diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index 50019872e..f65f7cf28 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -275,7 +275,22 @@ bool CreateDirectory(string const &Parent, string const &Path) } return true; } - /*}}}*/ + +// Rename - Rename a file /*{{{*/ +// --------------------------------------------------------------------- +/* This helper function is used by alot of item methods as thier final + step */ +bool Rename(string From, string To) +{ + if (rename(From.c_str(),To.c_str()) != 0) + { + return _error->Error("Rename failed. %s (%s -> %s).",strerror(errno), + From.c_str(),To.c_str()); + } + return true; +} + +/*}}}*/ // CreateAPTDirectoryIfNeeded - ensure that the given directory exists /*{{{*/ // --------------------------------------------------------------------- /* a small wrapper around CreateDirectory to check if it exists and to diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h index cde288ad2..7c1127798 100644 --- a/apt-pkg/contrib/fileutl.h +++ b/apt-pkg/contrib/fileutl.h @@ -97,6 +97,7 @@ bool FileExists(string File); bool RealFileExists(string File); bool DirectoryExists(string const &Path) __attrib_const; bool CreateDirectory(string const &Parent, string const &Path); +bool Rename(string From, string To); /** \brief Ensure the existence of the given Path * diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc index c9e7f1176..057a99a86 100644 --- a/apt-pkg/deb/debindexfile.cc +++ b/apt-pkg/deb/debindexfile.cc @@ -176,8 +176,14 @@ debPackagesIndex::debPackagesIndex(string const &URI, string const &Dist, string bool const &Trusted, string const &Arch) : pkgIndexFile(Trusted), URI(URI), Dist(Dist), Section(Section), Architecture(Arch) { - if (Architecture == "native") - Architecture = _config->Find("APT::Architecture"); + if (Architecture == "native") + Architecture = _config->Find("APT::Architecture"); + string ReplacementItem = "Aquire::Debdelta::Replace-Rule::" + URI;//::URI::URI(URI); + string ReplacementDefault = _config->Find("Aquire::Debdelta::Replace-Rule::Default"); + _config->Set(ReplacementItem, _config->Find(ReplacementItem, ReplacementDefault)); + + //std::cerr << "==== Replacement rule: " << ReplacementItem + // << " => "<< ReplacementDefault << std::endl; } /*}}}*/ // PackagesIndex::ArchiveInfo - Short version of the archive url /*{{{*/ diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc index a91cc34e9..b9946bc16 100644 --- a/apt-pkg/deb/debmetaindex.cc +++ b/apt-pkg/deb/debmetaindex.cc @@ -425,8 +425,27 @@ class debSLTypeDebSrc : public debSLTypeDebian { Name = "deb-src"; Label = "Standard Debian source tree"; - } + } +}; + +class debSLTypeDebdelta : public debSLTypeDebian +{ +public: + + bool CreateItem(vector<metaIndex *> &List, string const &URI, + string const &Dist, string const &Section, + std::map<string, string> const &Options) const + { + return CreateItemInternal(List, URI, Dist, Section, false, Options); + } + + debSLTypeDebdelta() + { + Name = "debdelta"; + Label = "Standard Debdelta tree"; + } }; debSLTypeDeb _apt_DebType; debSLTypeDebSrc _apt_DebSrcType; +debSLTypeDebdelta _apt_DebdeltaType;
\ No newline at end of file diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc index 38a0814e5..4d2eae913 100644 --- a/apt-pkg/init.cc +++ b/apt-pkg/init.cc @@ -40,6 +40,9 @@ bool pkgInitConfig(Configuration &Cnf) Cnf.CndSet("APT::Install-Suggests", false); Cnf.CndSet("Dir","/"); + // Debdelta replacement rule + Cnf.Set("Aquire::Debdelta::Replace-Rule::Default", "http://debdeltas.debian.net/debian-deltas/");// http://www.bononia.it/debian-deltas/ + Cnf.Set("Aquire::Debdelta::Replace-Rule::http://security.debian.org/", "http://debdeltas.debian.net/debian-security-deltas/"); // http://security.ubuntu.com/ubuntu/ => http://www.bononia.it/debian-security-deltas/ // State Cnf.CndSet("Dir::State","var/lib/apt/"); diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc index fe9f6eb68..9982dc737 100644 --- a/apt-pkg/packagemanager.cc +++ b/apt-pkg/packagemanager.cc @@ -80,8 +80,10 @@ bool pkgPackageManager::GetArchives(pkgAcquire *Owner,pkgSourceList *Sources, // Skip already processed packages if (List->IsNow(Pkg) == false) continue; - - new pkgAcqArchive(Owner,Sources,Recs,Cache[Pkg].InstVerIter(Cache), + + //new pkgAcqArchive(Owner,Sources,Recs,Cache[Pkg].InstVerIter(Cache), + // FileNames[Pkg->ID]); + new pkgAcqDebdelta(Owner,Sources,Recs,Cache[Pkg].InstVerIter(Cache), FileNames[Pkg->ID]); } @@ -0,0 +1,2 @@ +#!/bin/bash +LD_LIBRARY_PATH=./build/bin ./build/bin/apt-get -o Dir=/home/ishan/devel/apt/my/experiments/workingdir/rootdir -o Dir::Bin::methods=./build/bin/methods -o Dir::State::status=/home/ishan/devel/apt/my/experiments/workingdir/rootdir/var/lib/dpkg/status -o Dir::Bin::dpkg=fakeroot $* diff --git a/aptget2 b/aptget2 new file mode 100755 index 000000000..ac032d343 --- /dev/null +++ b/aptget2 @@ -0,0 +1,2 @@ +#!/bin/bash +LD_LIBRARY_PATH=$PWD/build/bin $PWD/build/bin/apt-get -o Dir::Bin::methods=$PWD/build/bin/methods $* diff --git a/buildproject b/buildproject new file mode 100755 index 000000000..7b6e98281 --- /dev/null +++ b/buildproject @@ -0,0 +1,4 @@ +#!/bin/bash + +sudo rm -Rf /home/ishan/devel/debian-squeeze/home/apt-test/apt/* +sudo cp -r /home/ishan/devel/apt-ishan/build/bin/* /home/ishan/devel/debian-squeeze/home/apt-test/apt/ diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 3292ae745..0da3965be 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -3226,6 +3226,7 @@ void SigWinch(int) /*}}}*/ int main(int argc,const char *argv[]) /*{{{*/ { + std::cout << "Starting apt-get" << std::endl; CommandLine::Args Args[] = { {'h',"help","help",0}, {'v',"version","version",0}, diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index 47a7c38d7..586e0378c 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -7,7 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" +<<<<<<< TREE +"POT-Creation-Date: 2011-06-09 08:32+0530\n" +======= "POT-Creation-Date: 2011-06-28 16:42+0200\n" +>>>>>>> MERGE-SOURCE "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -967,7 +971,11 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393 apt-sortpkgs.1.xml:61 +======= #: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:393 apt-sortpkgs.1.xml:61 +>>>>>>> MERGE-SOURCE msgid "<option>-s</option>" msgstr "" @@ -987,12 +995,20 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 +======= #: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383 +>>>>>>> MERGE-SOURCE msgid "<option>-q</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 +======= #: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383 +>>>>>>> MERGE-SOURCE msgid "<option>--quiet</option>" msgstr "" @@ -1091,7 +1107,11 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583 +======= #: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584 +>>>>>>> MERGE-SOURCE msgid "<option>-a</option>" msgstr "" @@ -1187,7 +1207,11 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist> +<<<<<<< TREE +#: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570 apt-mark.8.xml:140 apt-sortpkgs.1.xml:67 +======= #: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:612 apt-get.8.xml:570 apt-mark.8.xml:140 apt-sortpkgs.1.xml:67 +>>>>>>> MERGE-SOURCE msgid "&apt-commonoptions;" msgstr "" @@ -1202,7 +1226,11 @@ msgid "&file-sourceslist; &file-statelists;" msgstr "" #. type: Content of: <refentry><refsect1><title> +<<<<<<< TREE +#: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106 apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585 apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185 apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704 sources.list.5.xml:234 +======= #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106 apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:628 apt-get.8.xml:585 apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185 apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704 sources.list.5.xml:234 +>>>>>>> MERGE-SOURCE msgid "See Also" msgstr "" @@ -1212,7 +1240,11 @@ msgid "&apt-conf;, &sources-list;, &apt-get;" msgstr "" #. type: Content of: <refentry><refsect1><title> +<<<<<<< TREE +#: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111 apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591 apt-mark.8.xml:154 apt-sortpkgs.1.xml:76 +======= #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111 apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:632 apt-get.8.xml:591 apt-mark.8.xml:154 apt-sortpkgs.1.xml:76 +>>>>>>> MERGE-SOURCE msgid "Diagnostics" msgstr "" @@ -1316,7 +1348,11 @@ msgid "Options" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345 +======= #: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 apt-get.8.xml:345 +>>>>>>> MERGE-SOURCE msgid "<option>-d</option>" msgstr "" @@ -1519,7 +1555,11 @@ msgid "Just show the contents of the configuration space." msgstr "" #. type: Content of: <refentry><refsect1><para> +<<<<<<< TREE +#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628 apt-sortpkgs.1.xml:73 +======= #: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:629 apt-sortpkgs.1.xml:73 +>>>>>>> MERGE-SOURCE msgid "&apt-conf;" msgstr "" @@ -2443,28 +2483,47 @@ msgid "" "Configuration Items: " "<literal>APT::FTPArchive::<replaceable>Checksum</replaceable></literal> and " "<literal>APT::FTPArchive::<replaceable>Index</replaceable>::<replaceable>Checksum</replaceable></literal> " +<<<<<<< TREE +"where <literal>Index</literal> can be <literal>Packages</literal>, " +"<literal>Sources</literal> or <literal>Release</literal> and " +"<literal>Checksum</literal> can be <literal>MD5</literal>, " +"<literal>SHA1</literal> or <literal>SHA256</literal>." +======= "where <literal><replaceable>Index</replaceable></literal> can be " "<literal>Packages</literal>, <literal>Sources</literal> or " "<literal>Release</literal> and " "<literal><replaceable>Checksum</replaceable></literal> can be " "<literal>MD5</literal>, <literal>SHA1</literal> or " "<literal>SHA256</literal>." +>>>>>>> MERGE-SOURCE msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-ftparchive.1.xml:539 +======= #: apt-ftparchive.1.xml:540 +>>>>>>> MERGE-SOURCE msgid "<option>--db</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:541 +======= #: apt-ftparchive.1.xml:542 +>>>>>>> MERGE-SOURCE msgid "" "Use a binary caching DB. This has no effect on the generate command. " "Configuration Item: <literal>APT::FTPArchive::DB</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:547 +======= #: apt-ftparchive.1.xml:548 +>>>>>>> MERGE-SOURCE msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quiet up to a maximum of 2. You can also use " @@ -2473,12 +2532,20 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-ftparchive.1.xml:553 +======= #: apt-ftparchive.1.xml:554 +>>>>>>> MERGE-SOURCE msgid "<option>--delink</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:555 +======= #: apt-ftparchive.1.xml:556 +>>>>>>> MERGE-SOURCE msgid "" "Perform Delinking. If the <literal>External-Links</literal> setting is used " "then this option actually enables delinking of the files. It defaults to on " @@ -2487,12 +2554,20 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-ftparchive.1.xml:561 +======= #: apt-ftparchive.1.xml:562 +>>>>>>> MERGE-SOURCE msgid "<option>--contents</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:563 +======= #: apt-ftparchive.1.xml:564 +>>>>>>> MERGE-SOURCE msgid "" "Perform contents generation. When this option is set and package indexes are " "being generated with a cache DB then the file listing will also be extracted " @@ -2502,12 +2577,20 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-ftparchive.1.xml:571 +======= #: apt-ftparchive.1.xml:572 +>>>>>>> MERGE-SOURCE msgid "<option>--source-override</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:573 +======= #: apt-ftparchive.1.xml:574 +>>>>>>> MERGE-SOURCE msgid "" "Select the source override file to use with the <literal>sources</literal> " "command. Configuration Item: " @@ -2515,24 +2598,40 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-ftparchive.1.xml:577 +======= #: apt-ftparchive.1.xml:578 +>>>>>>> MERGE-SOURCE msgid "<option>--readonly</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:579 +======= #: apt-ftparchive.1.xml:580 +>>>>>>> MERGE-SOURCE msgid "" "Make the caching databases read only. Configuration Item: " "<literal>APT::FTPArchive::ReadOnlyDB</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-ftparchive.1.xml:583 +======= #: apt-ftparchive.1.xml:584 +>>>>>>> MERGE-SOURCE msgid "<option>--arch</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:584 +======= #: apt-ftparchive.1.xml:585 +>>>>>>> MERGE-SOURCE msgid "" "Accept in the <literal>packages</literal> and <literal>contents</literal> " "commands only package files matching <literal>*_arch.deb</literal> or " @@ -2541,12 +2640,20 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-ftparchive.1.xml:590 +======= #: apt-ftparchive.1.xml:591 +>>>>>>> MERGE-SOURCE msgid "<option>APT::FTPArchive::AlwaysStat</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:592 +======= #: apt-ftparchive.1.xml:593 +>>>>>>> MERGE-SOURCE msgid "" "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If " "packages are recompiled and/or republished with the same version again, this " @@ -2560,12 +2667,20 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-ftparchive.1.xml:602 +======= #: apt-ftparchive.1.xml:603 +>>>>>>> MERGE-SOURCE msgid "<option>APT::FTPArchive::LongDescription</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:604 +======= #: apt-ftparchive.1.xml:605 +>>>>>>> MERGE-SOURCE msgid "" "This configuration option defaults to \"<literal>true</literal>\" and should " "only be set to <literal>\"false\"</literal> if the Archive generated with " @@ -2575,12 +2690,20 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> +<<<<<<< TREE +#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:544 sources.list.5.xml:198 +======= #: apt-ftparchive.1.xml:617 apt.conf.5.xml:1087 apt_preferences.5.xml:544 sources.list.5.xml:198 +>>>>>>> MERGE-SOURCE msgid "Examples" msgstr "" #. type: Content of: <refentry><refsect1><para><programlisting> +<<<<<<< TREE +#: apt-ftparchive.1.xml:622 +======= #: apt-ftparchive.1.xml:623 +>>>>>>> MERGE-SOURCE #, no-wrap msgid "" "<command>apt-ftparchive</command> packages " @@ -2589,14 +2712,22 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:618 +======= #: apt-ftparchive.1.xml:619 +>>>>>>> MERGE-SOURCE msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:632 +======= #: apt-ftparchive.1.xml:633 +>>>>>>> MERGE-SOURCE msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@ -6200,8 +6331,13 @@ msgid "" "APT also supports pinning by glob() expressions and regular expressions " "surrounded by /. For example, the following example assigns the priority 500 " "to all packages from experimental where the name starts with gnome (as a " +<<<<<<< TREE +"glob()-like expression or contains the word kde (as a POSIX extended regular " +"expression surrounded by slashes)." +======= "glob()-like expression) or contains the word kde (as a POSIX extended " "regular expression surrounded by slashes)." +>>>>>>> MERGE-SOURCE msgstr "" #. type: Content of: <refentry><refsect1><refsect2><programlisting> @@ -6217,7 +6353,11 @@ msgstr "" #: apt_preferences.5.xml:279 msgid "" "The rule for those expressions is that they can occur anywhere where a " +<<<<<<< TREE +"string can occur. Those, the following pin assigns the priority 990 to all " +======= "string can occur. Thus, the following pin assigns the priority 990 to all " +>>>>>>> MERGE-SOURCE "packages from a release starting with karmic." msgstr "" diff --git a/doc/po/de.po b/doc/po/de.po index dc4d34b81..b10c657d4 100644 --- a/doc/po/de.po +++ b/doc/po/de.po @@ -7,8 +7,13 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 0.8.14-1\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" +<<<<<<< TREE +"POT-Creation-Date: 2011-06-09 08:32+0530\n" +"PO-Revision-Date: 2010-09-16 19:04+0100\n" +======= "POT-Creation-Date: 2011-06-28 13:40+0300\n" "PO-Revision-Date: 2011-05-31 21:00+0100\n" +>>>>>>> MERGE-SOURCE "Last-Translator: Chris Leick <c.leick@vollbio.de>\n" "Language-Team: German <debian-l10n-german@lists.debian.org>\n" "Language: de\n" @@ -1282,7 +1287,11 @@ msgstr "" "pkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393 +======= #: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:393 +>>>>>>> MERGE-SOURCE #: apt-sortpkgs.1.xml:61 msgid "<option>-s</option>" msgstr "<option>-s</option>" @@ -1310,12 +1319,20 @@ msgstr "" "srcpkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 +======= #: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383 +>>>>>>> MERGE-SOURCE msgid "<option>-q</option>" msgstr "<option>-q</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 +======= #: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383 +>>>>>>> MERGE-SOURCE msgid "<option>--quiet</option>" msgstr "<option>--quiet</option>" @@ -1436,7 +1453,11 @@ msgstr "" "Konfigurationselement: <literal>APT::Cache::ShowFull</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583 +======= #: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584 +>>>>>>> MERGE-SOURCE msgid "<option>-a</option>" msgstr "<option>-a</option>" @@ -1553,7 +1574,11 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist> #: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101 +<<<<<<< TREE +#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570 +======= #: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:612 apt-get.8.xml:570 +>>>>>>> MERGE-SOURCE #: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67 msgid "&apt-commonoptions;" msgstr "&apt-commonoptions;" @@ -1571,7 +1596,11 @@ msgstr "&file-sourceslist; &file-statelists;" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106 +<<<<<<< TREE +#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585 +======= #: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:628 apt-get.8.xml:585 +>>>>>>> MERGE-SOURCE #: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185 #: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704 #: sources.list.5.xml:234 @@ -1585,7 +1614,11 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111 +<<<<<<< TREE +#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591 +======= #: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:632 apt-get.8.xml:591 +>>>>>>> MERGE-SOURCE #: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76 msgid "Diagnostics" msgstr "Diagnose" @@ -1720,7 +1753,11 @@ msgid "Options" msgstr "Optionen" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345 +======= #: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 apt-get.8.xml:345 +>>>>>>> MERGE-SOURCE msgid "<option>-d</option>" msgstr "<option>-d</option>" @@ -1974,7 +2011,11 @@ msgid "Just show the contents of the configuration space." msgstr "Nur der Inhalt des Konfigurationsbereichs wird angezeigt." #. type: Content of: <refentry><refsect1><para> +<<<<<<< TREE +#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628 +======= #: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:629 +>>>>>>> MERGE-SOURCE #: apt-sortpkgs.1.xml:73 msgid "&apt-conf;" msgstr "&apt-conf;" @@ -3137,21 +3178,51 @@ msgstr "" msgid "" "<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>" msgstr "" +<<<<<<< TREE +======= "<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>" +>>>>>>> MERGE-SOURCE #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:531 +#, fuzzy +#| msgid "" +#| "Values for the additional metadata fields in the Release file are taken " +#| "from the corresponding variables under <literal>APT::FTPArchive::Release</" +#| "literal>, e.g. <literal>APT::FTPArchive::Release::Origin</literal>. The " +#| "supported fields are: <literal>Origin</literal>, <literal>Label</" +#| "literal>, <literal>Suite</literal>, <literal>Version</literal>, " +#| "<literal>Codename</literal>, <literal>Date</literal>, <literal>Valid-" +#| "Until</literal>, <literal>Architectures</literal>, <literal>Components</" +#| "literal>, <literal>Description</literal>." msgid "" "Generate the given checksum. These options default to on, when turned off " "the generated index files will not have the checksum fields where possible. " "Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</" "replaceable></literal> and <literal>APT::FTPArchive::<replaceable>Index</" "replaceable>::<replaceable>Checksum</replaceable></literal> where " +<<<<<<< TREE +"<literal>Index</literal> can be <literal>Packages</literal>, " +"<literal>Sources</literal> or <literal>Release</literal> and " +"<literal>Checksum</literal> can be <literal>MD5</literal>, <literal>SHA1</" +"literal> or <literal>SHA256</literal>." +======= "<literal><replaceable>Index</replaceable></literal> can be " "<literal>Packages</literal>, <literal>Sources</literal> or <literal>Release</" "literal> and <literal><replaceable>Checksum</replaceable></literal> can be " "<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>." +>>>>>>> MERGE-SOURCE msgstr "" +<<<<<<< TREE +"Werte für zusätzliche Metadatenfelder in der Release-Datei werden den " +"entsprechenden Variablen unter <literal>APT::FTPArchive::Release</literal> " +"entnommen, z.B. <literal>APT::FTPArchive::Release::Origin</literal>. Die " +"unterstützten Felder sind: <literal>Origin</literal>, <literal>Label</" +"literal>, <literal>Suite</literal>, <literal>Version</literal>, " +"<literal>Codename</literal>, <literal>Date</literal>, <literal>Valid-Until</" +"literal>, <literal>Architectures</literal>, <literal>Components</literal>, " +"<literal>Description</literal>." +======= "erzeugt die vorgegebene Prüfsumme. Diese Optionen sind standardmäßig " "aktiviert. Wenn sie deaktiviert sind, werden die erzeugten Indexdateien nach " "Möglichkeit keine Prüfsummenfelder erhalten. Konfigurationselemente: " @@ -3162,14 +3233,23 @@ msgstr "" "<literal>Release</literal> sein kann und <literal><replaceable>Prüfsumme</replaceable></literal> " "<literal>MD5</literal>, <literal>SHA1</literal> oder <literal>SHA256</" "literal> sein kann." +>>>>>>> MERGE-SOURCE #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-ftparchive.1.xml:539 +======= #: apt-ftparchive.1.xml:540 +>>>>>>> MERGE-SOURCE msgid "<option>--db</option>" msgstr "<option>--db</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:541 +======= #: apt-ftparchive.1.xml:542 +>>>>>>> MERGE-SOURCE msgid "" "Use a binary caching DB. This has no effect on the generate command. " "Configuration Item: <literal>APT::FTPArchive::DB</literal>." @@ -3179,7 +3259,11 @@ msgstr "" "DB</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:547 +======= #: apt-ftparchive.1.xml:548 +>>>>>>> MERGE-SOURCE msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quiet up to a maximum of 2. You can also use " @@ -3193,12 +3277,20 @@ msgstr "" "Konfigurationselement: <literal>quiet</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-ftparchive.1.xml:553 +======= #: apt-ftparchive.1.xml:554 +>>>>>>> MERGE-SOURCE msgid "<option>--delink</option>" msgstr "<option>--delink</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:555 +======= #: apt-ftparchive.1.xml:556 +>>>>>>> MERGE-SOURCE msgid "" "Perform Delinking. If the <literal>External-Links</literal> setting is used " "then this option actually enables delinking of the files. It defaults to on " @@ -3212,12 +3304,20 @@ msgstr "" "DeLinkAct</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-ftparchive.1.xml:561 +======= #: apt-ftparchive.1.xml:562 +>>>>>>> MERGE-SOURCE msgid "<option>--contents</option>" msgstr "<option>--contents</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:563 +======= #: apt-ftparchive.1.xml:564 +>>>>>>> MERGE-SOURCE msgid "" "Perform contents generation. When this option is set and package indexes are " "being generated with a cache DB then the file listing will also be extracted " @@ -3233,12 +3333,20 @@ msgstr "" "Konfigurationselement: <literal>APT::FTPArchive::Contents</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-ftparchive.1.xml:571 +======= #: apt-ftparchive.1.xml:572 +>>>>>>> MERGE-SOURCE msgid "<option>--source-override</option>" msgstr "<option>--source-override</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:573 +======= #: apt-ftparchive.1.xml:574 +>>>>>>> MERGE-SOURCE msgid "" "Select the source override file to use with the <literal>sources</literal> " "command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</" @@ -3249,12 +3357,20 @@ msgstr "" "SourceOverride</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-ftparchive.1.xml:577 +======= #: apt-ftparchive.1.xml:578 +>>>>>>> MERGE-SOURCE msgid "<option>--readonly</option>" msgstr "<option>--readonly</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:579 +======= #: apt-ftparchive.1.xml:580 +>>>>>>> MERGE-SOURCE msgid "" "Make the caching databases read only. Configuration Item: <literal>APT::" "FTPArchive::ReadOnlyDB</literal>." @@ -3263,12 +3379,20 @@ msgstr "" "<literal>APT::FTPArchive::ReadOnlyDB</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-ftparchive.1.xml:583 +======= #: apt-ftparchive.1.xml:584 +>>>>>>> MERGE-SOURCE msgid "<option>--arch</option>" msgstr "<option>--arch</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:584 +======= #: apt-ftparchive.1.xml:585 +>>>>>>> MERGE-SOURCE msgid "" "Accept in the <literal>packages</literal> and <literal>contents</literal> " "commands only package files matching <literal>*_arch.deb</literal> or " @@ -3282,12 +3406,20 @@ msgstr "" "Architecture</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-ftparchive.1.xml:590 +======= #: apt-ftparchive.1.xml:591 +>>>>>>> MERGE-SOURCE msgid "<option>APT::FTPArchive::AlwaysStat</option>" msgstr "<option>APT::FTPArchive::AlwaysStat</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:592 +======= #: apt-ftparchive.1.xml:593 +>>>>>>> MERGE-SOURCE msgid "" "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If " "packages are recompiled and/or republished with the same version again, this " @@ -3311,12 +3443,20 @@ msgstr "" "haben sollte und all diese zusätzlichen Prüfungen daher nutzlos sind." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-ftparchive.1.xml:602 +======= #: apt-ftparchive.1.xml:603 +>>>>>>> MERGE-SOURCE msgid "<option>APT::FTPArchive::LongDescription</option>" msgstr "<option>APT::FTPArchive::LongDescription</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:604 +======= #: apt-ftparchive.1.xml:605 +>>>>>>> MERGE-SOURCE msgid "" "This configuration option defaults to \"<literal>true</literal>\" and should " "only be set to <literal>\"false\"</literal> if the Archive generated with " @@ -3332,19 +3472,31 @@ msgstr "" "werden kann." #. type: Content of: <refentry><refsect1><title> +<<<<<<< TREE +#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:544 +======= #: apt-ftparchive.1.xml:617 apt.conf.5.xml:1087 apt_preferences.5.xml:544 +>>>>>>> MERGE-SOURCE #: sources.list.5.xml:198 msgid "Examples" msgstr "Beispiele" #. type: Content of: <refentry><refsect1><para><programlisting> +<<<<<<< TREE +#: apt-ftparchive.1.xml:622 +======= #: apt-ftparchive.1.xml:623 +>>>>>>> MERGE-SOURCE #, no-wrap msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" msgstr "<command>apt-ftparchive</command> Pakete <replaceable>Verzeichnis</replaceable> | <command>gzip</command> > <filename>Pakete.gz</filename>\n" #. type: Content of: <refentry><refsect1><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:618 +======= #: apt-ftparchive.1.xml:619 +>>>>>>> MERGE-SOURCE msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" @@ -3354,7 +3506,11 @@ msgstr "" ">" #. type: Content of: <refentry><refsect1><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:632 +======= #: apt-ftparchive.1.xml:633 +>>>>>>> MERGE-SOURCE msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@ -7986,9 +8142,14 @@ msgstr "Priorität 1" #, fuzzy #| msgid "" #| "to the versions coming from archives which in their <filename>Release</" +<<<<<<< TREE +#| "filename> files are marked as \"NotAutomatic: yes\" like the debian " +#| "experimental archive." +======= #| "filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</" #| "emphasis> as \"ButAutomaticUpgrades: yes\" like the debian " #| "<literal>experimental</literal> archive." +>>>>>>> MERGE-SOURCE msgid "" "to the versions coming from archives which in their <filename>Release</" "filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</" @@ -8007,17 +8168,31 @@ msgstr "Priorität 100" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #: apt_preferences.5.xml:114 +<<<<<<< TREE +#, fuzzy +#| msgid "" +#| "to the versions coming from archives which in their <filename>Release</" +#| "filename> files are marked as \"NotAutomatic: yes\" like the debian " +#| "experimental archive." +======= +>>>>>>> MERGE-SOURCE msgid "" "to the version that is already installed (if any) and to the versions coming " "from archives which in their <filename>Release</filename> files are marked " "as \"NotAutomatic: yes\" and \"ButAutomaticUpgrades: yes\" like the debian " "backports archive since <literal>squeeze-backports</literal>." msgstr "" +<<<<<<< TREE +"zu den Versionen, die von Archiven kommen, deren <filename>Release</" +"filename>-Dateien als »NotAutomatic: yes« markiert sind, wie das Debian-" +"Experimental-Archiv." +======= "zu der Version, die bereits installiert ist (wenn dies der Fall ist) und zu " "Versionen, die von Archiven kommen, die in deren <filename>Release</" "filename>-Dateien als »NotAutomatic: yes« und »ButAutomaticUpgrades: yes« " "markiert sind, wie das Debian-Backports-Archiv seit <literal>squeeze-" "backports</literal>." +>>>>>>> MERGE-SOURCE #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> #: apt_preferences.5.xml:121 @@ -8062,10 +8237,18 @@ msgstr "" #| msgid "" #| "If the target release has not been specified then APT simply assigns " #| "priority 100 to all installed package versions and priority 500 to all " +<<<<<<< TREE +#| "uninstalled package versions, expect versions coming from archives which " +======= #| "uninstalled package versions, except versions coming from archives which " +>>>>>>> MERGE-SOURCE #| "in their <filename>Release</filename> files are marked as \"NotAutomatic: " +<<<<<<< TREE +#| "yes\" - these versions get the priority 1." +======= #| "yes\" - these versions get the priority 1 or priority 100 if it is " #| "additionally marked as \"ButAutomaticUpgrades: yes\"." +>>>>>>> MERGE-SOURCE msgid "" "If the target release has not been specified then APT simply assigns " "priority 100 to all installed package versions and priority 500 to all " @@ -8382,7 +8565,11 @@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> #: apt_preferences.5.xml:262 msgid "Regular expressions and glob() syntax" +<<<<<<< TREE +msgstr "" +======= msgstr "Reguläre Ausdrücke und glob()-Syntax" +>>>>>>> MERGE-SOURCE #. type: Content of: <refentry><refsect1><refsect2><para> #: apt_preferences.5.xml:264 @@ -8390,60 +8577,114 @@ msgid "" "APT also supports pinning by glob() expressions and regular expressions " "surrounded by /. For example, the following example assigns the priority 500 " "to all packages from experimental where the name starts with gnome (as a glob" +<<<<<<< TREE +"()-like expression or contains the word kde (as a POSIX extended regular " +======= "()-like expression) or contains the word kde (as a POSIX extended regular " +>>>>>>> MERGE-SOURCE "expression surrounded by slashes)." msgstr "" +<<<<<<< TREE +======= "APT unterstützt außerdem Pinning mittels glob()-Ausdrücken und regulären " "Ausdrücken, die von »/« umschlossen sind. Das folgende Beispiel weist " "beispielsweise allen Paketen aus Experimental die Priorität 500 zu, bei " "denen der Name mit »gnome« beginnt (wie ein glob()-artiger Ausdruck) oder " "das Wort »kde« enthält (wie ein erweiterter regulärer POSIX-Ausdruck, der " "von Schrägstrichen umschlossen wird)." +>>>>>>> MERGE-SOURCE #. type: Content of: <refentry><refsect1><refsect2><programlisting> #: apt_preferences.5.xml:273 +<<<<<<< TREE +#, fuzzy, no-wrap +#| msgid "" +#| "Package: *\n" +#| "Pin: release a=unstable\n" +#| "Pin-Priority: 50\n" +======= #, no-wrap +>>>>>>> MERGE-SOURCE msgid "" "Package: gnome* /kde/\n" "Pin: release n=experimental\n" "Pin-Priority: 500\n" msgstr "" +<<<<<<< TREE +"Package: *\n" +"Pin: release a=unstable\n" +"Pin-Priority: 50\n" +======= "Package: gnome* /kde/\n" "Pin: release n=experimental\n" "Pin-Priority: 500\n" +>>>>>>> MERGE-SOURCE #. type: Content of: <refentry><refsect1><refsect2><para> #: apt_preferences.5.xml:279 msgid "" "The rule for those expressions is that they can occur anywhere where a " +<<<<<<< TREE +"string can occur. Those, the following pin assigns the priority 990 to all " +======= "string can occur. Thus, the following pin assigns the priority 990 to all " +>>>>>>> MERGE-SOURCE "packages from a release starting with karmic." msgstr "" +<<<<<<< TREE +======= "Die Regel für diese Ausdrücke ist, dass sie überall dort auftreten können, " "wo eine Zeichenkette auftreten kann. Somit weist die folgende Pin allen " "Paketen von einem Release seit Karmic die Priorität 900 zu." +>>>>>>> MERGE-SOURCE #. type: Content of: <refentry><refsect1><refsect2><programlisting> #: apt_preferences.5.xml:285 +<<<<<<< TREE +#, fuzzy, no-wrap +#| msgid "" +#| "Package: *\n" +#| "Pin: release a=unstable\n" +#| "Pin-Priority: 50\n" +======= #, no-wrap +>>>>>>> MERGE-SOURCE msgid "" "Package: *\n" "Pin: release n=karmic*\n" "Pin-Priority: 990\n" msgstr "" "Package: *\n" +<<<<<<< TREE +"Pin: release a=unstable\n" +"Pin-Priority: 50\n" +======= "Pin: release n=karmic*\n" "Pin-Priority: 990\n" +>>>>>>> MERGE-SOURCE #. type: Content of: <refentry><refsect1><refsect2><literal> #: apt_preferences.5.xml:290 +<<<<<<< TREE +#, fuzzy +#| msgid "Packages" +======= +>>>>>>> MERGE-SOURCE msgid "Package" +<<<<<<< TREE +msgstr "Packages" +======= msgstr "Package" +>>>>>>> MERGE-SOURCE #. type: Content of: <refentry><refsect1><refsect2><literal> #: apt_preferences.5.xml:296 msgid "*" +<<<<<<< TREE +msgstr "" +======= msgstr "*" +>>>>>>> MERGE-SOURCE #. type: Content of: <refentry><refsect1><refsect2><title> #: apt_preferences.5.xml:306 diff --git a/doc/po/es.po b/doc/po/es.po index c8fdc9fed..74a0807c3 100644 --- a/doc/po/es.po +++ b/doc/po/es.po @@ -36,7 +36,11 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.25\n" +<<<<<<< TREE +"POT-Creation-Date: 2011-06-09 08:32+0530\n" +======= "POT-Creation-Date: 2011-06-28 16:42+0200\n" +>>>>>>> MERGE-SOURCE "PO-Revision-Date: 2010-08-25 03:25+0200\n" "Last-Translator: Omar Campagne <ocampagne@gmail.com>\n" "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n" @@ -1354,7 +1358,11 @@ msgstr "" "configuración: <literal>Dir::Cache::pkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393 +======= #: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:393 +>>>>>>> MERGE-SOURCE #: apt-sortpkgs.1.xml:61 msgid "<option>-s</option>" msgstr "<option>-s</option>" @@ -1380,12 +1388,20 @@ msgstr "" "Opción de configuración: <literal>Dir::Cache::srcpkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 +======= #: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383 +>>>>>>> MERGE-SOURCE msgid "<option>-q</option>" msgstr "<option>-q</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 +======= #: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383 +>>>>>>> MERGE-SOURCE msgid "<option>--quiet</option>" msgstr "<option>--quiet</option>" @@ -1507,7 +1523,11 @@ msgstr "" "Opción de configuración: <literal>APT::Cache::ShowFull</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583 +======= #: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584 +>>>>>>> MERGE-SOURCE msgid "<option>-a</option>" msgstr "<option>-a</option>" @@ -1624,7 +1644,11 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist> #: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101 +<<<<<<< TREE +#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570 +======= #: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:612 apt-get.8.xml:570 +>>>>>>> MERGE-SOURCE #: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67 msgid "&apt-commonoptions;" msgstr "&apt-commonoptions;" @@ -1642,7 +1666,11 @@ msgstr "&file-sourceslist; &file-statelists;" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106 +<<<<<<< TREE +#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585 +======= #: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:628 apt-get.8.xml:585 +>>>>>>> MERGE-SOURCE #: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185 #: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704 #: sources.list.5.xml:234 @@ -1656,7 +1684,11 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111 +<<<<<<< TREE +#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591 +======= #: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:632 apt-get.8.xml:591 +>>>>>>> MERGE-SOURCE #: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76 msgid "Diagnostics" msgstr "Diagnósticos" @@ -1791,7 +1823,11 @@ msgid "Options" msgstr "Opciones" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345 +======= #: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 apt-get.8.xml:345 +>>>>>>> MERGE-SOURCE msgid "<option>-d</option>" msgstr "<option>-d</option>" @@ -2048,7 +2084,11 @@ msgid "Just show the contents of the configuration space." msgstr "Sólo muestra el contenido del espacio de configuración." #. type: Content of: <refentry><refsect1><para> +<<<<<<< TREE +#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628 +======= #: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:629 +>>>>>>> MERGE-SOURCE #: apt-sortpkgs.1.xml:73 msgid "&apt-conf;" msgstr "&apt-conf;" @@ -3205,25 +3245,61 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:531 +#, fuzzy +#| msgid "" +#| "Values for the additional metadata fields in the Release file are taken " +#| "from the corresponding variables under <literal>APT::FTPArchive::Release</" +#| "literal>, e.g. <literal>APT::FTPArchive::Release::Origin</literal>. The " +#| "supported fields are: <literal>Origin</literal>, <literal>Label</" +#| "literal>, <literal>Suite</literal>, <literal>Version</literal>, " +#| "<literal>Codename</literal>, <literal>Date</literal>, <literal>Valid-" +#| "Until</literal>, <literal>Architectures</literal>, <literal>Components</" +#| "literal>, <literal>Description</literal>." msgid "" "Generate the given checksum. These options default to on, when turned off " "the generated index files will not have the checksum fields where possible. " "Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</" "replaceable></literal> and <literal>APT::FTPArchive::<replaceable>Index</" "replaceable>::<replaceable>Checksum</replaceable></literal> where " +<<<<<<< TREE +"<literal>Index</literal> can be <literal>Packages</literal>, " +"<literal>Sources</literal> or <literal>Release</literal> and " +"<literal>Checksum</literal> can be <literal>MD5</literal>, <literal>SHA1</" +"literal> or <literal>SHA256</literal>." +======= "<literal><replaceable>Index</replaceable></literal> can be " "<literal>Packages</literal>, <literal>Sources</literal> or <literal>Release</" "literal> and <literal><replaceable>Checksum</replaceable></literal> can be " "<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>." +>>>>>>> MERGE-SOURCE msgstr "" +<<<<<<< TREE +"Los valores para los campos de metadatos adicionales en el fichero «Release» " +"se toman de las variables correspondientes en <literal>APT::FTPArchive::" +"Release</literal>, por ejemplo <literal>APT::FTPArchive::Release::Origin</" +"literal>. Los campos permitidos son: <literal>Origin</literal>, " +"<literal>Label</literal>, <literal>Suite</literal>, <literal>Version</" +"literal>, <literal>Codename</literal>, <literal>Date</literal>, " +"<literal>Valid-Until</literal>, <literal>Architectures</literal>, " +"<literal>Components</literal> y <literal>Description</literal>." +======= +>>>>>>> MERGE-SOURCE #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-ftparchive.1.xml:539 +======= #: apt-ftparchive.1.xml:540 +>>>>>>> MERGE-SOURCE msgid "<option>--db</option>" msgstr "<option>--db</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:541 +======= #: apt-ftparchive.1.xml:542 +>>>>>>> MERGE-SOURCE msgid "" "Use a binary caching DB. This has no effect on the generate command. " "Configuration Item: <literal>APT::FTPArchive::DB</literal>." @@ -3232,7 +3308,11 @@ msgstr "" "«generate». Opción de configuración: <literal>APT::FTPArchive::DB</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:547 +======= #: apt-ftparchive.1.xml:548 +>>>>>>> MERGE-SOURCE msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quiet up to a maximum of 2. You can also use " @@ -3246,12 +3326,20 @@ msgstr "" "configuración. Opción de configuración: <literal>quiet</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-ftparchive.1.xml:553 +======= #: apt-ftparchive.1.xml:554 +>>>>>>> MERGE-SOURCE msgid "<option>--delink</option>" msgstr "<option>--delink</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:555 +======= #: apt-ftparchive.1.xml:556 +>>>>>>> MERGE-SOURCE msgid "" "Perform Delinking. If the <literal>External-Links</literal> setting is used " "then this option actually enables delinking of the files. It defaults to on " @@ -3264,12 +3352,20 @@ msgstr "" "Opción de configuración: <literal>APT::FTPArchive::DeLinkAct</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-ftparchive.1.xml:561 +======= #: apt-ftparchive.1.xml:562 +>>>>>>> MERGE-SOURCE msgid "<option>--contents</option>" msgstr "<option>--contents</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:563 +======= #: apt-ftparchive.1.xml:564 +>>>>>>> MERGE-SOURCE msgid "" "Perform contents generation. When this option is set and package indexes are " "being generated with a cache DB then the file listing will also be extracted " @@ -3286,12 +3382,20 @@ msgstr "" "Contents</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-ftparchive.1.xml:571 +======= #: apt-ftparchive.1.xml:572 +>>>>>>> MERGE-SOURCE msgid "<option>--source-override</option>" msgstr "<option>--source-override</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:573 +======= #: apt-ftparchive.1.xml:574 +>>>>>>> MERGE-SOURCE msgid "" "Select the source override file to use with the <literal>sources</literal> " "command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</" @@ -3302,12 +3406,20 @@ msgstr "" "FTPArchive::SourceOverride</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-ftparchive.1.xml:577 +======= #: apt-ftparchive.1.xml:578 +>>>>>>> MERGE-SOURCE msgid "<option>--readonly</option>" msgstr "<option>--readonly</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:579 +======= #: apt-ftparchive.1.xml:580 +>>>>>>> MERGE-SOURCE msgid "" "Make the caching databases read only. Configuration Item: <literal>APT::" "FTPArchive::ReadOnlyDB</literal>." @@ -3316,12 +3428,20 @@ msgstr "" "Opción de configuración: <literal>APT::FTPArchive::ReadOnlyDB</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-ftparchive.1.xml:583 +======= #: apt-ftparchive.1.xml:584 +>>>>>>> MERGE-SOURCE msgid "<option>--arch</option>" msgstr "<option>--arch</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:584 +======= #: apt-ftparchive.1.xml:585 +>>>>>>> MERGE-SOURCE msgid "" "Accept in the <literal>packages</literal> and <literal>contents</literal> " "commands only package files matching <literal>*_arch.deb</literal> or " @@ -3335,12 +3455,20 @@ msgstr "" "FTPArchive::Architecture</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-ftparchive.1.xml:590 +======= #: apt-ftparchive.1.xml:591 +>>>>>>> MERGE-SOURCE msgid "<option>APT::FTPArchive::AlwaysStat</option>" msgstr "<option>APT::FTPArchive::AlwaysStat</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:592 +======= #: apt-ftparchive.1.xml:593 +>>>>>>> MERGE-SOURCE msgid "" "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If " "packages are recompiled and/or republished with the same version again, this " @@ -3364,12 +3492,20 @@ msgstr "" "comprobaciones adicionales son innecesarias." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-ftparchive.1.xml:602 +======= #: apt-ftparchive.1.xml:603 +>>>>>>> MERGE-SOURCE msgid "<option>APT::FTPArchive::LongDescription</option>" msgstr "<option>APT::FTPArchive::LongDescription</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:604 +======= #: apt-ftparchive.1.xml:605 +>>>>>>> MERGE-SOURCE msgid "" "This configuration option defaults to \"<literal>true</literal>\" and should " "only be set to <literal>\"false\"</literal> if the Archive generated with " @@ -3385,19 +3521,31 @@ msgstr "" "con la orden «generate»." #. type: Content of: <refentry><refsect1><title> +<<<<<<< TREE +#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:544 +======= #: apt-ftparchive.1.xml:617 apt.conf.5.xml:1087 apt_preferences.5.xml:544 +>>>>>>> MERGE-SOURCE #: sources.list.5.xml:198 msgid "Examples" msgstr "Ejemplos" #. type: Content of: <refentry><refsect1><para><programlisting> +<<<<<<< TREE +#: apt-ftparchive.1.xml:622 +======= #: apt-ftparchive.1.xml:623 +>>>>>>> MERGE-SOURCE #, no-wrap msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" msgstr "<command>apt-ftparchive</command> packages <replaceable>directorio</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" #. type: Content of: <refentry><refsect1><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:618 +======= #: apt-ftparchive.1.xml:619 +>>>>>>> MERGE-SOURCE msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" @@ -3406,7 +3554,11 @@ msgstr "" "paquetes binarios («.deb»): <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:632 +======= #: apt-ftparchive.1.xml:633 +>>>>>>> MERGE-SOURCE msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@ -8391,7 +8543,11 @@ msgid "" "APT also supports pinning by glob() expressions and regular expressions " "surrounded by /. For example, the following example assigns the priority 500 " "to all packages from experimental where the name starts with gnome (as a glob" +<<<<<<< TREE +"()-like expression or contains the word kde (as a POSIX extended regular " +======= "()-like expression) or contains the word kde (as a POSIX extended regular " +>>>>>>> MERGE-SOURCE "expression surrounded by slashes)." msgstr "" @@ -8415,7 +8571,11 @@ msgstr "" #: apt_preferences.5.xml:279 msgid "" "The rule for those expressions is that they can occur anywhere where a " +<<<<<<< TREE +"string can occur. Those, the following pin assigns the priority 990 to all " +======= "string can occur. Thus, the following pin assigns the priority 990 to all " +>>>>>>> MERGE-SOURCE "packages from a release starting with karmic." msgstr "" diff --git a/doc/po/fr.po b/doc/po/fr.po index 6e3977c43..3b0f486b1 100644 --- a/doc/po/fr.po +++ b/doc/po/fr.po @@ -9,7 +9,11 @@ msgid "" msgstr "" "Project-Id-Version: \n" +<<<<<<< TREE +"POT-Creation-Date: 2011-06-09 08:32+0530\n" +======= "POT-Creation-Date: 2011-06-28 16:42+0200\n" +>>>>>>> MERGE-SOURCE "PO-Revision-Date: 2011-02-17 07:50+0100\n" "Last-Translator: Christian Perrier <bubulle@debian.org>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" @@ -1277,7 +1281,11 @@ msgstr "" "<literal>Dir::Cache::pkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393 +======= #: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:393 +>>>>>>> MERGE-SOURCE #: apt-sortpkgs.1.xml:61 msgid "<option>-s</option>" msgstr "<option>-s</option>" @@ -1304,12 +1312,20 @@ msgstr "" "<literal>Dir::Cache::srcpkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 +======= #: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383 +>>>>>>> MERGE-SOURCE msgid "<option>-q</option>" msgstr "<option>-q</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 +======= #: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383 +>>>>>>> MERGE-SOURCE msgid "<option>--quiet</option>" msgstr "<option>--quiet</option>" @@ -1432,7 +1448,11 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583 +======= #: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584 +>>>>>>> MERGE-SOURCE msgid "<option>-a</option>" msgstr "<option>-a</option>" @@ -1552,7 +1572,11 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist> #: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101 +<<<<<<< TREE +#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570 +======= #: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:612 apt-get.8.xml:570 +>>>>>>> MERGE-SOURCE #: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67 msgid "&apt-commonoptions;" msgstr "&apt-commonoptions;" @@ -1570,7 +1594,11 @@ msgstr "&file-sourceslist; &file-statelists;" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106 +<<<<<<< TREE +#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585 +======= #: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:628 apt-get.8.xml:585 +>>>>>>> MERGE-SOURCE #: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185 #: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704 #: sources.list.5.xml:234 @@ -1584,7 +1612,11 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;." #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111 +<<<<<<< TREE +#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591 +======= #: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:632 apt-get.8.xml:591 +>>>>>>> MERGE-SOURCE #: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76 msgid "Diagnostics" msgstr "Diagnostics" @@ -1719,7 +1751,11 @@ msgid "Options" msgstr "Options" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345 +======= #: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 apt-get.8.xml:345 +>>>>>>> MERGE-SOURCE msgid "<option>-d</option>" msgstr "<option>-d</option>" @@ -1976,7 +2012,11 @@ msgid "Just show the contents of the configuration space." msgstr "Affiche seulement le contenu de l'espace de configuration." #. type: Content of: <refentry><refsect1><para> +<<<<<<< TREE +#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628 +======= #: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:629 +>>>>>>> MERGE-SOURCE #: apt-sortpkgs.1.xml:73 msgid "&apt-conf;" msgstr "&apt-conf;" @@ -3133,25 +3173,61 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:531 +#, fuzzy +#| msgid "" +#| "Values for the additional metadata fields in the Release file are taken " +#| "from the corresponding variables under <literal>APT::FTPArchive::Release</" +#| "literal>, e.g. <literal>APT::FTPArchive::Release::Origin</literal>. The " +#| "supported fields are: <literal>Origin</literal>, <literal>Label</" +#| "literal>, <literal>Suite</literal>, <literal>Version</literal>, " +#| "<literal>Codename</literal>, <literal>Date</literal>, <literal>Valid-" +#| "Until</literal>, <literal>Architectures</literal>, <literal>Components</" +#| "literal>, <literal>Description</literal>." msgid "" "Generate the given checksum. These options default to on, when turned off " "the generated index files will not have the checksum fields where possible. " "Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</" "replaceable></literal> and <literal>APT::FTPArchive::<replaceable>Index</" "replaceable>::<replaceable>Checksum</replaceable></literal> where " +<<<<<<< TREE +"<literal>Index</literal> can be <literal>Packages</literal>, " +"<literal>Sources</literal> or <literal>Release</literal> and " +"<literal>Checksum</literal> can be <literal>MD5</literal>, <literal>SHA1</" +"literal> or <literal>SHA256</literal>." +======= "<literal><replaceable>Index</replaceable></literal> can be " "<literal>Packages</literal>, <literal>Sources</literal> or <literal>Release</" "literal> and <literal><replaceable>Checksum</replaceable></literal> can be " "<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>." +>>>>>>> MERGE-SOURCE msgstr "" +<<<<<<< TREE +"La valeur des autres champs de métadonnées du fichier Release sont tirées de " +"la valeur correspondante dans <literal>APT::FTPArchive::Release</literal>, " +"p. ex. <literal>APT::FTPArchive::Release::Origin</literal>. Les champs " +"reconnus sont : <literal>Origin</literal>, <literal>Label</literal>, " +"<literal>Suite</literal>, <literal>Version</literal>, <literal>Codename</" +"literal>, <literal>Date</literal>, <literal>Valid-Until</literal>, " +"<literal>Architectures</literal>, <literal>Components</literal>, " +"<literal>Description</literal>." +======= +>>>>>>> MERGE-SOURCE #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-ftparchive.1.xml:539 +======= #: apt-ftparchive.1.xml:540 +>>>>>>> MERGE-SOURCE msgid "<option>--db</option>" msgstr "<option>--db</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:541 +======= #: apt-ftparchive.1.xml:542 +>>>>>>> MERGE-SOURCE msgid "" "Use a binary caching DB. This has no effect on the generate command. " "Configuration Item: <literal>APT::FTPArchive::DB</literal>." @@ -3161,7 +3237,11 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:547 +======= #: apt-ftparchive.1.xml:548 +>>>>>>> MERGE-SOURCE msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quiet up to a maximum of 2. You can also use " @@ -3176,12 +3256,20 @@ msgstr "" "configuration : <literal>quiet</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-ftparchive.1.xml:553 +======= #: apt-ftparchive.1.xml:554 +>>>>>>> MERGE-SOURCE msgid "<option>--delink</option>" msgstr "<option>--delink</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:555 +======= #: apt-ftparchive.1.xml:556 +>>>>>>> MERGE-SOURCE msgid "" "Perform Delinking. If the <literal>External-Links</literal> setting is used " "then this option actually enables delinking of the files. It defaults to on " @@ -3195,12 +3283,20 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-ftparchive.1.xml:561 +======= #: apt-ftparchive.1.xml:562 +>>>>>>> MERGE-SOURCE msgid "<option>--contents</option>" msgstr "<option>--contents</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:563 +======= #: apt-ftparchive.1.xml:564 +>>>>>>> MERGE-SOURCE msgid "" "Perform contents generation. When this option is set and package indexes are " "being generated with a cache DB then the file listing will also be extracted " @@ -3216,12 +3312,20 @@ msgstr "" "de configuration : <literal>APT::FTPArchive::Contents</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-ftparchive.1.xml:571 +======= #: apt-ftparchive.1.xml:572 +>>>>>>> MERGE-SOURCE msgid "<option>--source-override</option>" msgstr "<option>--source-override</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:573 +======= #: apt-ftparchive.1.xml:574 +>>>>>>> MERGE-SOURCE msgid "" "Select the source override file to use with the <literal>sources</literal> " "command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</" @@ -3232,12 +3336,20 @@ msgstr "" "FTPArchive::SourceOverride</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-ftparchive.1.xml:577 +======= #: apt-ftparchive.1.xml:578 +>>>>>>> MERGE-SOURCE msgid "<option>--readonly</option>" msgstr "<option>--readonly</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:579 +======= #: apt-ftparchive.1.xml:580 +>>>>>>> MERGE-SOURCE msgid "" "Make the caching databases read only. Configuration Item: <literal>APT::" "FTPArchive::ReadOnlyDB</literal>." @@ -3246,12 +3358,20 @@ msgstr "" "configuration : <literal>APT::FTPArchive::ReadOnlyDB</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-ftparchive.1.xml:583 +======= #: apt-ftparchive.1.xml:584 +>>>>>>> MERGE-SOURCE msgid "<option>--arch</option>" msgstr "<option>--arch</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:584 +======= #: apt-ftparchive.1.xml:585 +>>>>>>> MERGE-SOURCE msgid "" "Accept in the <literal>packages</literal> and <literal>contents</literal> " "commands only package files matching <literal>*_arch.deb</literal> or " @@ -3265,12 +3385,20 @@ msgstr "" "<literal>APT::FTPArchive::Architecture</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-ftparchive.1.xml:590 +======= #: apt-ftparchive.1.xml:591 +>>>>>>> MERGE-SOURCE msgid "<option>APT::FTPArchive::AlwaysStat</option>" msgstr "<option>APT::FTPArchive::AlwaysStat</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:592 +======= #: apt-ftparchive.1.xml:593 +>>>>>>> MERGE-SOURCE msgid "" "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If " "packages are recompiled and/or republished with the same version again, this " @@ -3293,12 +3421,20 @@ msgstr "" "survenir et l'ensemble de ces contrôles devient inutile." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-ftparchive.1.xml:602 +======= #: apt-ftparchive.1.xml:603 +>>>>>>> MERGE-SOURCE msgid "<option>APT::FTPArchive::LongDescription</option>" msgstr "<option>APT::FTPArchive::LongDescription</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:604 +======= #: apt-ftparchive.1.xml:605 +>>>>>>> MERGE-SOURCE msgid "" "This configuration option defaults to \"<literal>true</literal>\" and should " "only be set to <literal>\"false\"</literal> if the Archive generated with " @@ -3314,19 +3450,31 @@ msgstr "" "generate." #. type: Content of: <refentry><refsect1><title> +<<<<<<< TREE +#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:544 +======= #: apt-ftparchive.1.xml:617 apt.conf.5.xml:1087 apt_preferences.5.xml:544 +>>>>>>> MERGE-SOURCE #: sources.list.5.xml:198 msgid "Examples" msgstr "Exemples" #. type: Content of: <refentry><refsect1><para><programlisting> +<<<<<<< TREE +#: apt-ftparchive.1.xml:622 +======= #: apt-ftparchive.1.xml:623 +>>>>>>> MERGE-SOURCE #, no-wrap msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" msgstr "<command>apt-ftparchive</command> packages <replaceable>répertoire</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" #. type: Content of: <refentry><refsect1><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:618 +======= #: apt-ftparchive.1.xml:619 +>>>>>>> MERGE-SOURCE msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" @@ -3335,7 +3483,11 @@ msgstr "" "des paquets binaires (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:632 +======= #: apt-ftparchive.1.xml:633 +>>>>>>> MERGE-SOURCE msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@ -8346,7 +8498,11 @@ msgid "" "APT also supports pinning by glob() expressions and regular expressions " "surrounded by /. For example, the following example assigns the priority 500 " "to all packages from experimental where the name starts with gnome (as a glob" +<<<<<<< TREE +"()-like expression or contains the word kde (as a POSIX extended regular " +======= "()-like expression) or contains the word kde (as a POSIX extended regular " +>>>>>>> MERGE-SOURCE "expression surrounded by slashes)." msgstr "" @@ -8370,7 +8526,11 @@ msgstr "" #: apt_preferences.5.xml:279 msgid "" "The rule for those expressions is that they can occur anywhere where a " +<<<<<<< TREE +"string can occur. Those, the following pin assigns the priority 990 to all " +======= "string can occur. Thus, the following pin assigns the priority 990 to all " +>>>>>>> MERGE-SOURCE "packages from a release starting with karmic." msgstr "" diff --git a/doc/po/it.po b/doc/po/it.po index 514e24442..1b92632a7 100644 --- a/doc/po/it.po +++ b/doc/po/it.po @@ -9,7 +9,11 @@ msgid "" msgstr "" "Project-Id-Version: \n" +<<<<<<< TREE +"POT-Creation-Date: 2011-06-09 08:32+0530\n" +======= "POT-Creation-Date: 2011-06-28 16:42+0200\n" +>>>>>>> MERGE-SOURCE "PO-Revision-Date: 2003-04-26 23:26+0100\n" "Last-Translator: Traduzione di Eugenia Franzoni <eugenia@linuxcare.com>\n" "Language-Team: <debian-l10n-italian@lists.debian.org>\n" @@ -934,7 +938,11 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393 +======= #: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:393 +>>>>>>> MERGE-SOURCE #: apt-sortpkgs.1.xml:61 msgid "<option>-s</option>" msgstr "" @@ -955,12 +963,20 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 +======= #: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383 +>>>>>>> MERGE-SOURCE msgid "<option>-q</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 +======= #: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383 +>>>>>>> MERGE-SOURCE msgid "<option>--quiet</option>" msgstr "" @@ -1059,7 +1075,11 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583 +======= #: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584 +>>>>>>> MERGE-SOURCE msgid "<option>-a</option>" msgstr "" @@ -1155,7 +1175,11 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist> #: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101 +<<<<<<< TREE +#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570 +======= #: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:612 apt-get.8.xml:570 +>>>>>>> MERGE-SOURCE #: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67 msgid "&apt-commonoptions;" msgstr "" @@ -1173,7 +1197,11 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106 +<<<<<<< TREE +#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585 +======= #: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:628 apt-get.8.xml:585 +>>>>>>> MERGE-SOURCE #: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185 #: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704 #: sources.list.5.xml:234 @@ -1187,7 +1215,11 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111 +<<<<<<< TREE +#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591 +======= #: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:632 apt-get.8.xml:591 +>>>>>>> MERGE-SOURCE #: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76 msgid "Diagnostics" msgstr "" @@ -1292,7 +1324,11 @@ msgid "Options" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345 +======= #: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 apt-get.8.xml:345 +>>>>>>> MERGE-SOURCE msgid "<option>-d</option>" msgstr "" @@ -1496,7 +1532,11 @@ msgid "Just show the contents of the configuration space." msgstr "" #. type: Content of: <refentry><refsect1><para> +<<<<<<< TREE +#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628 +======= #: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:629 +>>>>>>> MERGE-SOURCE #: apt-sortpkgs.1.xml:73 msgid "&apt-conf;" msgstr "" @@ -2419,26 +2459,45 @@ msgid "" "Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</" "replaceable></literal> and <literal>APT::FTPArchive::<replaceable>Index</" "replaceable>::<replaceable>Checksum</replaceable></literal> where " +<<<<<<< TREE +"<literal>Index</literal> can be <literal>Packages</literal>, " +"<literal>Sources</literal> or <literal>Release</literal> and " +"<literal>Checksum</literal> can be <literal>MD5</literal>, <literal>SHA1</" +"literal> or <literal>SHA256</literal>." +======= "<literal><replaceable>Index</replaceable></literal> can be " "<literal>Packages</literal>, <literal>Sources</literal> or <literal>Release</" "literal> and <literal><replaceable>Checksum</replaceable></literal> can be " "<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>." +>>>>>>> MERGE-SOURCE msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-ftparchive.1.xml:539 +======= #: apt-ftparchive.1.xml:540 +>>>>>>> MERGE-SOURCE msgid "<option>--db</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:541 +======= #: apt-ftparchive.1.xml:542 +>>>>>>> MERGE-SOURCE msgid "" "Use a binary caching DB. This has no effect on the generate command. " "Configuration Item: <literal>APT::FTPArchive::DB</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:547 +======= #: apt-ftparchive.1.xml:548 +>>>>>>> MERGE-SOURCE msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quiet up to a maximum of 2. You can also use " @@ -2447,12 +2506,20 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-ftparchive.1.xml:553 +======= #: apt-ftparchive.1.xml:554 +>>>>>>> MERGE-SOURCE msgid "<option>--delink</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:555 +======= #: apt-ftparchive.1.xml:556 +>>>>>>> MERGE-SOURCE msgid "" "Perform Delinking. If the <literal>External-Links</literal> setting is used " "then this option actually enables delinking of the files. It defaults to on " @@ -2461,12 +2528,20 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-ftparchive.1.xml:561 +======= #: apt-ftparchive.1.xml:562 +>>>>>>> MERGE-SOURCE msgid "<option>--contents</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:563 +======= #: apt-ftparchive.1.xml:564 +>>>>>>> MERGE-SOURCE msgid "" "Perform contents generation. When this option is set and package indexes are " "being generated with a cache DB then the file listing will also be extracted " @@ -2476,12 +2551,20 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-ftparchive.1.xml:571 +======= #: apt-ftparchive.1.xml:572 +>>>>>>> MERGE-SOURCE msgid "<option>--source-override</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:573 +======= #: apt-ftparchive.1.xml:574 +>>>>>>> MERGE-SOURCE msgid "" "Select the source override file to use with the <literal>sources</literal> " "command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</" @@ -2489,24 +2572,40 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-ftparchive.1.xml:577 +======= #: apt-ftparchive.1.xml:578 +>>>>>>> MERGE-SOURCE msgid "<option>--readonly</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:579 +======= #: apt-ftparchive.1.xml:580 +>>>>>>> MERGE-SOURCE msgid "" "Make the caching databases read only. Configuration Item: <literal>APT::" "FTPArchive::ReadOnlyDB</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-ftparchive.1.xml:583 +======= #: apt-ftparchive.1.xml:584 +>>>>>>> MERGE-SOURCE msgid "<option>--arch</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:584 +======= #: apt-ftparchive.1.xml:585 +>>>>>>> MERGE-SOURCE msgid "" "Accept in the <literal>packages</literal> and <literal>contents</literal> " "commands only package files matching <literal>*_arch.deb</literal> or " @@ -2515,12 +2614,20 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-ftparchive.1.xml:590 +======= #: apt-ftparchive.1.xml:591 +>>>>>>> MERGE-SOURCE msgid "<option>APT::FTPArchive::AlwaysStat</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:592 +======= #: apt-ftparchive.1.xml:593 +>>>>>>> MERGE-SOURCE msgid "" "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If " "packages are recompiled and/or republished with the same version again, this " @@ -2534,12 +2641,20 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-ftparchive.1.xml:602 +======= #: apt-ftparchive.1.xml:603 +>>>>>>> MERGE-SOURCE msgid "<option>APT::FTPArchive::LongDescription</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:604 +======= #: apt-ftparchive.1.xml:605 +>>>>>>> MERGE-SOURCE msgid "" "This configuration option defaults to \"<literal>true</literal>\" and should " "only be set to <literal>\"false\"</literal> if the Archive generated with " @@ -2549,26 +2664,42 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> +<<<<<<< TREE +#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:544 +======= #: apt-ftparchive.1.xml:617 apt.conf.5.xml:1087 apt_preferences.5.xml:544 +>>>>>>> MERGE-SOURCE #: sources.list.5.xml:198 msgid "Examples" msgstr "" #. type: Content of: <refentry><refsect1><para><programlisting> +<<<<<<< TREE +#: apt-ftparchive.1.xml:622 +======= #: apt-ftparchive.1.xml:623 +>>>>>>> MERGE-SOURCE #, no-wrap msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" msgstr "" #. type: Content of: <refentry><refsect1><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:618 +======= #: apt-ftparchive.1.xml:619 +>>>>>>> MERGE-SOURCE msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:632 +======= #: apt-ftparchive.1.xml:633 +>>>>>>> MERGE-SOURCE msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@ -6160,7 +6291,11 @@ msgid "" "APT also supports pinning by glob() expressions and regular expressions " "surrounded by /. For example, the following example assigns the priority 500 " "to all packages from experimental where the name starts with gnome (as a glob" +<<<<<<< TREE +"()-like expression or contains the word kde (as a POSIX extended regular " +======= "()-like expression) or contains the word kde (as a POSIX extended regular " +>>>>>>> MERGE-SOURCE "expression surrounded by slashes)." msgstr "" @@ -6177,7 +6312,11 @@ msgstr "" #: apt_preferences.5.xml:279 msgid "" "The rule for those expressions is that they can occur anywhere where a " +<<<<<<< TREE +"string can occur. Those, the following pin assigns the priority 990 to all " +======= "string can occur. Thus, the following pin assigns the priority 990 to all " +>>>>>>> MERGE-SOURCE "packages from a release starting with karmic." msgstr "" diff --git a/doc/po/ja.po b/doc/po/ja.po index 8a75af980..0446b0827 100644 --- a/doc/po/ja.po +++ b/doc/po/ja.po @@ -7,7 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.25.3\n" +<<<<<<< TREE +"POT-Creation-Date: 2011-06-09 08:32+0530\n" +======= "POT-Creation-Date: 2011-06-28 16:42+0200\n" +>>>>>>> MERGE-SOURCE "PO-Revision-Date: 2010-09-07 07:38+0900\n" "Last-Translator: KURASAWA Nozomu <nabetaro@caldron.jp>\n" "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n" @@ -1357,7 +1361,11 @@ msgstr "" "pkgcache</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393 +======= #: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:393 +>>>>>>> MERGE-SOURCE #: apt-sortpkgs.1.xml:61 msgid "<option>-s</option>" msgstr "<option>-s</option>" @@ -1384,12 +1392,20 @@ msgstr "" "<literal>Dir::Cache::srcpkgcache</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 +======= #: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383 +>>>>>>> MERGE-SOURCE msgid "<option>-q</option>" msgstr "<option>-q</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 +======= #: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383 +>>>>>>> MERGE-SOURCE msgid "<option>--quiet</option>" msgstr "<option>--quiet</option>" @@ -1505,7 +1521,11 @@ msgstr "" "ShowFull</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583 +======= #: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584 +>>>>>>> MERGE-SOURCE msgid "<option>-a</option>" msgstr "<option>-a</option>" @@ -1627,7 +1647,11 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><variablelist> #: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101 +<<<<<<< TREE +#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570 +======= #: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:612 apt-get.8.xml:570 +>>>>>>> MERGE-SOURCE #: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67 msgid "&apt-commonoptions;" msgstr "&apt-commonoptions;" @@ -1647,7 +1671,11 @@ msgstr "&file-sourceslist; &file-statelists;" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106 +<<<<<<< TREE +#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585 +======= #: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:628 apt-get.8.xml:585 +>>>>>>> MERGE-SOURCE #: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185 #: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704 #: sources.list.5.xml:234 @@ -1663,7 +1691,11 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111 +<<<<<<< TREE +#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591 +======= #: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:632 apt-get.8.xml:591 +>>>>>>> MERGE-SOURCE #: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76 msgid "Diagnostics" msgstr "診断メッセージ" @@ -1805,7 +1837,11 @@ msgid "Options" msgstr "オプション" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345 +======= #: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 apt-get.8.xml:345 +>>>>>>> MERGE-SOURCE msgid "<option>-d</option>" msgstr "<option>-d</option>" @@ -2075,7 +2111,11 @@ msgstr "設定箇所の内容を表示するだけです。" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> +<<<<<<< TREE +#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628 +======= #: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:629 +>>>>>>> MERGE-SOURCE #: apt-sortpkgs.1.xml:73 msgid "&apt-conf;" msgstr "&apt-conf;" @@ -3292,26 +3332,61 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:531 +#, fuzzy +#| msgid "" +#| "Values for the additional metadata fields in the Release file are taken " +#| "from the corresponding variables under <literal>APT::FTPArchive::Release</" +#| "literal>, e.g. <literal>APT::FTPArchive::Release::Origin</literal>. The " +#| "supported fields are: <literal>Origin</literal>, <literal>Label</" +#| "literal>, <literal>Suite</literal>, <literal>Version</literal>, " +#| "<literal>Codename</literal>, <literal>Date</literal>, <literal>Valid-" +#| "Until</literal>, <literal>Architectures</literal>, <literal>Components</" +#| "literal>, <literal>Description</literal>." msgid "" "Generate the given checksum. These options default to on, when turned off " "the generated index files will not have the checksum fields where possible. " "Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</" "replaceable></literal> and <literal>APT::FTPArchive::<replaceable>Index</" "replaceable>::<replaceable>Checksum</replaceable></literal> where " +<<<<<<< TREE +"<literal>Index</literal> can be <literal>Packages</literal>, " +"<literal>Sources</literal> or <literal>Release</literal> and " +"<literal>Checksum</literal> can be <literal>MD5</literal>, <literal>SHA1</" +"literal> or <literal>SHA256</literal>." +======= "<literal><replaceable>Index</replaceable></literal> can be " "<literal>Packages</literal>, <literal>Sources</literal> or <literal>Release</" "literal> and <literal><replaceable>Checksum</replaceable></literal> can be " "<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>." +>>>>>>> MERGE-SOURCE msgstr "" +<<<<<<< TREE +"Release ファイルの追加メタデータフィールドの値は、<literal>APT::FTPArchive::" +"Release</literal> 以下の相当する値 (例: <literal>APT::FTPArchive::Release::" +"Origin</literal>) をとります。サポートするフィールドは、<literal>Origin</" +"literal>, <literal>Label</literal>, <literal>Suite</literal>, " +"<literal>Version</literal>, <literal>Codename</literal>, <literal>Date</" +"literal>, <literal>Valid-Until</literal>, <literal>Architectures</literal>, " +"<literal>Components</literal>, <literal>Description</literal> です。" +======= +>>>>>>> MERGE-SOURCE #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-ftparchive.1.xml:539 +======= #: apt-ftparchive.1.xml:540 +>>>>>>> MERGE-SOURCE msgid "<option>--db</option>" msgstr "<option>--db</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:541 +======= #: apt-ftparchive.1.xml:542 +>>>>>>> MERGE-SOURCE msgid "" "Use a binary caching DB. This has no effect on the generate command. " "Configuration Item: <literal>APT::FTPArchive::DB</literal>." @@ -3321,7 +3396,11 @@ msgstr "" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:547 +======= #: apt-ftparchive.1.xml:548 +>>>>>>> MERGE-SOURCE msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quiet up to a maximum of 2. You can also use " @@ -3334,13 +3413,21 @@ msgstr "" "<literal>quiet</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-ftparchive.1.xml:553 +======= #: apt-ftparchive.1.xml:554 +>>>>>>> MERGE-SOURCE msgid "<option>--delink</option>" msgstr "<option>--delink</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:555 +======= #: apt-ftparchive.1.xml:556 +>>>>>>> MERGE-SOURCE msgid "" "Perform Delinking. If the <literal>External-Links</literal> setting is used " "then this option actually enables delinking of the files. It defaults to on " @@ -3353,13 +3440,21 @@ msgstr "" "<literal>APT::FTPArchive::DeLinkAct</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-ftparchive.1.xml:561 +======= #: apt-ftparchive.1.xml:562 +>>>>>>> MERGE-SOURCE msgid "<option>--contents</option>" msgstr "<option>--contents</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:563 +======= #: apt-ftparchive.1.xml:564 +>>>>>>> MERGE-SOURCE msgid "" "Perform contents generation. When this option is set and package indexes are " "being generated with a cache DB then the file listing will also be extracted " @@ -3374,13 +3469,21 @@ msgstr "" "<literal>APT::FTPArchive::Contents</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-ftparchive.1.xml:571 +======= #: apt-ftparchive.1.xml:572 +>>>>>>> MERGE-SOURCE msgid "<option>--source-override</option>" msgstr "<option>--source-override</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:573 +======= #: apt-ftparchive.1.xml:574 +>>>>>>> MERGE-SOURCE msgid "" "Select the source override file to use with the <literal>sources</literal> " "command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</" @@ -3390,13 +3493,21 @@ msgstr "" "選択します。設定項目 - <literal>APT::FTPArchive::SourceOverride</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-ftparchive.1.xml:577 +======= #: apt-ftparchive.1.xml:578 +>>>>>>> MERGE-SOURCE msgid "<option>--readonly</option>" msgstr "<option>--readonly</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:579 +======= #: apt-ftparchive.1.xml:580 +>>>>>>> MERGE-SOURCE msgid "" "Make the caching databases read only. Configuration Item: <literal>APT::" "FTPArchive::ReadOnlyDB</literal>." @@ -3405,13 +3516,21 @@ msgstr "" "FTPArchive::ReadOnlyDB</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-ftparchive.1.xml:583 +======= #: apt-ftparchive.1.xml:584 +>>>>>>> MERGE-SOURCE msgid "<option>--arch</option>" msgstr "<option>--arch</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:584 +======= #: apt-ftparchive.1.xml:585 +>>>>>>> MERGE-SOURCE #, fuzzy msgid "" "Accept in the <literal>packages</literal> and <literal>contents</literal> " @@ -3425,12 +3544,20 @@ msgstr "" "literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-ftparchive.1.xml:590 +======= #: apt-ftparchive.1.xml:591 +>>>>>>> MERGE-SOURCE msgid "<option>APT::FTPArchive::AlwaysStat</option>" msgstr "<option>--version</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:592 +======= #: apt-ftparchive.1.xml:593 +>>>>>>> MERGE-SOURCE msgid "" "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If " "packages are recompiled and/or republished with the same version again, this " @@ -3444,12 +3571,20 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-ftparchive.1.xml:602 +======= #: apt-ftparchive.1.xml:603 +>>>>>>> MERGE-SOURCE msgid "<option>APT::FTPArchive::LongDescription</option>" msgstr "<option>APT::FTPArchive::LongDescription</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:604 +======= #: apt-ftparchive.1.xml:605 +>>>>>>> MERGE-SOURCE #, fuzzy msgid "" "This configuration option defaults to \"<literal>true</literal>\" and should " @@ -3465,14 +3600,22 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> +<<<<<<< TREE +#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:544 +======= #: apt-ftparchive.1.xml:617 apt.conf.5.xml:1087 apt_preferences.5.xml:544 +>>>>>>> MERGE-SOURCE #: sources.list.5.xml:198 msgid "Examples" msgstr "サンプル" # type: Content of: <refentry><refsect1><para><programlisting> #. type: Content of: <refentry><refsect1><para><programlisting> +<<<<<<< TREE +#: apt-ftparchive.1.xml:622 +======= #: apt-ftparchive.1.xml:623 +>>>>>>> MERGE-SOURCE #, no-wrap msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" msgstr "" @@ -3481,7 +3624,11 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:618 +======= #: apt-ftparchive.1.xml:619 +>>>>>>> MERGE-SOURCE msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" @@ -3491,7 +3638,11 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:632 +======= #: apt-ftparchive.1.xml:633 +>>>>>>> MERGE-SOURCE msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@ -8337,7 +8488,11 @@ msgid "" "APT also supports pinning by glob() expressions and regular expressions " "surrounded by /. For example, the following example assigns the priority 500 " "to all packages from experimental where the name starts with gnome (as a glob" +<<<<<<< TREE +"()-like expression or contains the word kde (as a POSIX extended regular " +======= "()-like expression) or contains the word kde (as a POSIX extended regular " +>>>>>>> MERGE-SOURCE "expression surrounded by slashes)." msgstr "" @@ -8363,7 +8518,11 @@ msgstr "" #: apt_preferences.5.xml:279 msgid "" "The rule for those expressions is that they can occur anywhere where a " +<<<<<<< TREE +"string can occur. Those, the following pin assigns the priority 990 to all " +======= "string can occur. Thus, the following pin assigns the priority 990 to all " +>>>>>>> MERGE-SOURCE "packages from a release starting with karmic." msgstr "" diff --git a/doc/po/pl.po b/doc/po/pl.po index b74746ffc..b401a1ed1 100644 --- a/doc/po/pl.po +++ b/doc/po/pl.po @@ -10,7 +10,11 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.25.3\n" +<<<<<<< TREE +"POT-Creation-Date: 2011-06-09 08:32+0530\n" +======= "POT-Creation-Date: 2011-06-28 16:42+0200\n" +>>>>>>> MERGE-SOURCE "PO-Revision-Date: 2010-03-18 22:00+0100\n" "Last-Translator: Robert Luberda <robert@debian.org>\n" "Language-Team: <debian-l10n-polish@lists.debian.org>\n" @@ -1363,7 +1367,11 @@ msgstr "" "<literal>Dir::Cache::pkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393 +======= #: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:393 +>>>>>>> MERGE-SOURCE #: apt-sortpkgs.1.xml:61 msgid "<option>-s</option>" msgstr "<option>-s</option>" @@ -1391,12 +1399,20 @@ msgstr "" "Cache::srcpkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 +======= #: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383 +>>>>>>> MERGE-SOURCE msgid "<option>-q</option>" msgstr "<option>-q</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 +======= #: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383 +>>>>>>> MERGE-SOURCE msgid "<option>--quiet</option>" msgstr "<option>--quiet</option>" @@ -1534,7 +1550,11 @@ msgstr "" "konfiguracyjnym: <literal>APT::Cache::ShowFull</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583 +======= #: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584 +>>>>>>> MERGE-SOURCE msgid "<option>-a</option>" msgstr "<option>-a</option>" @@ -1660,7 +1680,11 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist> #: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101 +<<<<<<< TREE +#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570 +======= #: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:612 apt-get.8.xml:570 +>>>>>>> MERGE-SOURCE #: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67 msgid "&apt-commonoptions;" msgstr "&apt-commonoptions;" @@ -1678,7 +1702,11 @@ msgstr "&file-sourceslist; &file-statelists;" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106 +<<<<<<< TREE +#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585 +======= #: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:628 apt-get.8.xml:585 +>>>>>>> MERGE-SOURCE #: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185 #: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704 #: sources.list.5.xml:234 @@ -1693,7 +1721,11 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111 +<<<<<<< TREE +#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591 +======= #: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:632 apt-get.8.xml:591 +>>>>>>> MERGE-SOURCE #: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76 msgid "Diagnostics" msgstr "Diagnostyka" @@ -1842,7 +1874,11 @@ msgid "Options" msgstr "Opcje" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345 +======= #: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 apt-get.8.xml:345 +>>>>>>> MERGE-SOURCE msgid "<option>-d</option>" msgstr "<option>-d</option>" @@ -2105,7 +2141,11 @@ msgid "Just show the contents of the configuration space." msgstr "Wyświetla zawartość przestrzeni konfiguracji." #. type: Content of: <refentry><refsect1><para> +<<<<<<< TREE +#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628 +======= #: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:629 +>>>>>>> MERGE-SOURCE #: apt-sortpkgs.1.xml:73 msgid "&apt-conf;" msgstr "&apt-conf;" @@ -3106,20 +3146,35 @@ msgid "" "Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</" "replaceable></literal> and <literal>APT::FTPArchive::<replaceable>Index</" "replaceable>::<replaceable>Checksum</replaceable></literal> where " +<<<<<<< TREE +"<literal>Index</literal> can be <literal>Packages</literal>, " +"<literal>Sources</literal> or <literal>Release</literal> and " +"<literal>Checksum</literal> can be <literal>MD5</literal>, <literal>SHA1</" +"literal> or <literal>SHA256</literal>." +======= "<literal><replaceable>Index</replaceable></literal> can be " "<literal>Packages</literal>, <literal>Sources</literal> or <literal>Release</" "literal> and <literal><replaceable>Checksum</replaceable></literal> can be " "<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>." +>>>>>>> MERGE-SOURCE msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-ftparchive.1.xml:539 +======= #: apt-ftparchive.1.xml:540 +>>>>>>> MERGE-SOURCE msgid "<option>--db</option>" msgstr "<option>--db</option>" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:541 +======= #: apt-ftparchive.1.xml:542 +>>>>>>> MERGE-SOURCE #, fuzzy msgid "" "Use a binary caching DB. This has no effect on the generate command. " @@ -3130,7 +3185,11 @@ msgstr "" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:547 +======= #: apt-ftparchive.1.xml:548 +>>>>>>> MERGE-SOURCE msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quiet up to a maximum of 2. You can also use " @@ -3144,13 +3203,21 @@ msgstr "" "pliku konfiguracyjnym: <literal>quiet</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-ftparchive.1.xml:553 +======= #: apt-ftparchive.1.xml:554 +>>>>>>> MERGE-SOURCE msgid "<option>--delink</option>" msgstr "<option>--delink</option>" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:555 +======= #: apt-ftparchive.1.xml:556 +>>>>>>> MERGE-SOURCE #, fuzzy msgid "" "Perform Delinking. If the <literal>External-Links</literal> setting is used " @@ -3164,12 +3231,20 @@ msgstr "" "<literal>APT::Cache::Generate</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-ftparchive.1.xml:561 +======= #: apt-ftparchive.1.xml:562 +>>>>>>> MERGE-SOURCE msgid "<option>--contents</option>" msgstr "<option>--contents</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:563 +======= #: apt-ftparchive.1.xml:564 +>>>>>>> MERGE-SOURCE msgid "" "Perform contents generation. When this option is set and package indexes are " "being generated with a cache DB then the file listing will also be extracted " @@ -3179,13 +3254,21 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-ftparchive.1.xml:571 +======= #: apt-ftparchive.1.xml:572 +>>>>>>> MERGE-SOURCE msgid "<option>--source-override</option>" msgstr "<option>--source-override</option>" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:573 +======= #: apt-ftparchive.1.xml:574 +>>>>>>> MERGE-SOURCE #, fuzzy msgid "" "Select the source override file to use with the <literal>sources</literal> " @@ -3197,13 +3280,21 @@ msgstr "" "konfiguracyjnym: <literal>APT::Cache::Installed</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-ftparchive.1.xml:577 +======= #: apt-ftparchive.1.xml:578 +>>>>>>> MERGE-SOURCE msgid "<option>--readonly</option>" msgstr "<option>--readonly</option>" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:579 +======= #: apt-ftparchive.1.xml:580 +>>>>>>> MERGE-SOURCE #, fuzzy msgid "" "Make the caching databases read only. Configuration Item: <literal>APT::" @@ -3213,14 +3304,22 @@ msgstr "" "pliku konfiguracyjnym: <literal>APT::Cache::NamesOnly</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-ftparchive.1.xml:583 +======= #: apt-ftparchive.1.xml:584 +>>>>>>> MERGE-SOURCE #, fuzzy #| msgid "<option>-a</option>" msgid "<option>--arch</option>" msgstr "<option>-a</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:584 +======= #: apt-ftparchive.1.xml:585 +>>>>>>> MERGE-SOURCE #, fuzzy #| msgid "" #| "If the command is either <literal>install</literal> or <literal>remove</" @@ -3240,13 +3339,21 @@ msgstr "" "AutomaticRemove</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-ftparchive.1.xml:590 +======= #: apt-ftparchive.1.xml:591 +>>>>>>> MERGE-SOURCE #, fuzzy msgid "<option>APT::FTPArchive::AlwaysStat</option>" msgstr "<option>--version</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:592 +======= #: apt-ftparchive.1.xml:593 +>>>>>>> MERGE-SOURCE msgid "" "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If " "packages are recompiled and/or republished with the same version again, this " @@ -3260,13 +3367,21 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-ftparchive.1.xml:602 +======= #: apt-ftparchive.1.xml:603 +>>>>>>> MERGE-SOURCE #, fuzzy msgid "<option>APT::FTPArchive::LongDescription</option>" msgstr "<option>--version</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:604 +======= #: apt-ftparchive.1.xml:605 +>>>>>>> MERGE-SOURCE msgid "" "This configuration option defaults to \"<literal>true</literal>\" and should " "only be set to <literal>\"false\"</literal> if the Archive generated with " @@ -3276,19 +3391,31 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> +<<<<<<< TREE +#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:544 +======= #: apt-ftparchive.1.xml:617 apt.conf.5.xml:1087 apt_preferences.5.xml:544 +>>>>>>> MERGE-SOURCE #: sources.list.5.xml:198 msgid "Examples" msgstr "Przykłady" #. type: Content of: <refentry><refsect1><para><programlisting> +<<<<<<< TREE +#: apt-ftparchive.1.xml:622 +======= #: apt-ftparchive.1.xml:623 +>>>>>>> MERGE-SOURCE #, no-wrap msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" msgstr "<command>apt-ftparchive</command> packages <replaceable>katalog</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" #. type: Content of: <refentry><refsect1><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:618 +======= #: apt-ftparchive.1.xml:619 +>>>>>>> MERGE-SOURCE msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" @@ -3296,7 +3423,11 @@ msgstr "" # #. type: Content of: <refentry><refsect1><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:632 +======= #: apt-ftparchive.1.xml:633 +>>>>>>> MERGE-SOURCE msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@ -7526,7 +7657,11 @@ msgid "" "APT also supports pinning by glob() expressions and regular expressions " "surrounded by /. For example, the following example assigns the priority 500 " "to all packages from experimental where the name starts with gnome (as a glob" +<<<<<<< TREE +"()-like expression or contains the word kde (as a POSIX extended regular " +======= "()-like expression) or contains the word kde (as a POSIX extended regular " +>>>>>>> MERGE-SOURCE "expression surrounded by slashes)." msgstr "" @@ -7550,7 +7685,11 @@ msgstr "" #: apt_preferences.5.xml:279 msgid "" "The rule for those expressions is that they can occur anywhere where a " +<<<<<<< TREE +"string can occur. Those, the following pin assigns the priority 990 to all " +======= "string can occur. Thus, the following pin assigns the priority 990 to all " +>>>>>>> MERGE-SOURCE "packages from a release starting with karmic." msgstr "" diff --git a/doc/po/pt.po b/doc/po/pt.po index 6fd27a5c3..7ee9c17de 100644 --- a/doc/po/pt.po +++ b/doc/po/pt.po @@ -6,7 +6,11 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.8.0~pre1\n" +<<<<<<< TREE +"POT-Creation-Date: 2011-06-09 08:32+0530\n" +======= "POT-Creation-Date: 2011-06-28 16:42+0200\n" +>>>>>>> MERGE-SOURCE "PO-Revision-Date: 2010-08-25 23:07+0100\n" "Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n" "Language-Team: Portuguese <traduz@debianpt.org>\n" @@ -1306,7 +1310,11 @@ msgstr "" "<literal>Dir::Cache::pkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393 +======= #: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:393 +>>>>>>> MERGE-SOURCE #: apt-sortpkgs.1.xml:61 msgid "<option>-s</option>" msgstr "<option>-s</option>" @@ -1332,12 +1340,20 @@ msgstr "" "pacote. Item de Configuração: <literal>Dir::Cache::srcpkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 +======= #: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383 +>>>>>>> MERGE-SOURCE msgid "<option>-q</option>" msgstr "<option>-q</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 +======= #: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383 +>>>>>>> MERGE-SOURCE msgid "<option>--quiet</option>" msgstr "<option>--quiet</option>" @@ -1458,7 +1474,11 @@ msgstr "" "<literal>APT::Cache::ShowFull</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583 +======= #: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584 +>>>>>>> MERGE-SOURCE msgid "<option>-a</option>" msgstr "<option>-a</option>" @@ -1575,7 +1595,11 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist> #: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101 +<<<<<<< TREE +#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570 +======= #: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:612 apt-get.8.xml:570 +>>>>>>> MERGE-SOURCE #: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67 msgid "&apt-commonoptions;" msgstr "&apt-commonoptions;" @@ -1593,7 +1617,11 @@ msgstr "&file-sourceslist; &file-statelists;" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106 +<<<<<<< TREE +#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585 +======= #: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:628 apt-get.8.xml:585 +>>>>>>> MERGE-SOURCE #: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185 #: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704 #: sources.list.5.xml:234 @@ -1607,7 +1635,11 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111 +<<<<<<< TREE +#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591 +======= #: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:632 apt-get.8.xml:591 +>>>>>>> MERGE-SOURCE #: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76 msgid "Diagnostics" msgstr "Diagnóstico" @@ -1742,7 +1774,11 @@ msgid "Options" msgstr "Opções" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345 +======= #: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 apt-get.8.xml:345 +>>>>>>> MERGE-SOURCE msgid "<option>-d</option>" msgstr "<option>-d</option>" @@ -1995,7 +2031,11 @@ msgid "Just show the contents of the configuration space." msgstr "Apenas mostra o conteúdo do espaço de configuração." #. type: Content of: <refentry><refsect1><para> +<<<<<<< TREE +#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628 +======= #: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:629 +>>>>>>> MERGE-SOURCE #: apt-sortpkgs.1.xml:73 msgid "&apt-conf;" msgstr "&apt-conf;" @@ -3144,25 +3184,61 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:531 +#, fuzzy +#| msgid "" +#| "Values for the additional metadata fields in the Release file are taken " +#| "from the corresponding variables under <literal>APT::FTPArchive::Release</" +#| "literal>, e.g. <literal>APT::FTPArchive::Release::Origin</literal>. The " +#| "supported fields are: <literal>Origin</literal>, <literal>Label</" +#| "literal>, <literal>Suite</literal>, <literal>Version</literal>, " +#| "<literal>Codename</literal>, <literal>Date</literal>, <literal>Valid-" +#| "Until</literal>, <literal>Architectures</literal>, <literal>Components</" +#| "literal>, <literal>Description</literal>." msgid "" "Generate the given checksum. These options default to on, when turned off " "the generated index files will not have the checksum fields where possible. " "Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</" "replaceable></literal> and <literal>APT::FTPArchive::<replaceable>Index</" "replaceable>::<replaceable>Checksum</replaceable></literal> where " +<<<<<<< TREE +"<literal>Index</literal> can be <literal>Packages</literal>, " +"<literal>Sources</literal> or <literal>Release</literal> and " +"<literal>Checksum</literal> can be <literal>MD5</literal>, <literal>SHA1</" +"literal> or <literal>SHA256</literal>." +======= "<literal><replaceable>Index</replaceable></literal> can be " "<literal>Packages</literal>, <literal>Sources</literal> or <literal>Release</" "literal> and <literal><replaceable>Checksum</replaceable></literal> can be " "<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>." +>>>>>>> MERGE-SOURCE msgstr "" +<<<<<<< TREE +"Valores para os campos de metadados adicionais no ficheiro Release são " +"tomados a partir das variáveis correspondentes sob <literal>APT::FTPArchive::" +"Release</literal>, ex. <literal>APT::FTPArchive::Release::Origin</literal>. " +"Os campos suportados são: <literal>Origin</literal>, <literal>Label</" +"literal>, <literal>Suite</literal>, <literal>Version</literal>, " +"<literal>Codename</literal>, <literal>Date</literal>, " +"<literal>Architectures</literal>, <literal>Components</literal>, " +"<literal>Description</literal>." +======= +>>>>>>> MERGE-SOURCE #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-ftparchive.1.xml:539 +======= #: apt-ftparchive.1.xml:540 +>>>>>>> MERGE-SOURCE msgid "<option>--db</option>" msgstr "<option>--db</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:541 +======= #: apt-ftparchive.1.xml:542 +>>>>>>> MERGE-SOURCE msgid "" "Use a binary caching DB. This has no effect on the generate command. " "Configuration Item: <literal>APT::FTPArchive::DB</literal>." @@ -3171,7 +3247,11 @@ msgstr "" "generate. Item de configuração: <literal>APT::FTPArchive::DB</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:547 +======= #: apt-ftparchive.1.xml:548 +>>>>>>> MERGE-SOURCE msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quiet up to a maximum of 2. You can also use " @@ -3185,12 +3265,20 @@ msgstr "" "<literal>quiet</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-ftparchive.1.xml:553 +======= #: apt-ftparchive.1.xml:554 +>>>>>>> MERGE-SOURCE msgid "<option>--delink</option>" msgstr "<option>--delink</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:555 +======= #: apt-ftparchive.1.xml:556 +>>>>>>> MERGE-SOURCE msgid "" "Perform Delinking. If the <literal>External-Links</literal> setting is used " "then this option actually enables delinking of the files. It defaults to on " @@ -3203,12 +3291,20 @@ msgstr "" "option>. Item de Configuração: <literal>APT::FTPArchive::DeLinkAct</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-ftparchive.1.xml:561 +======= #: apt-ftparchive.1.xml:562 +>>>>>>> MERGE-SOURCE msgid "<option>--contents</option>" msgstr "<option>--contents</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:563 +======= #: apt-ftparchive.1.xml:564 +>>>>>>> MERGE-SOURCE msgid "" "Perform contents generation. When this option is set and package indexes are " "being generated with a cache DB then the file listing will also be extracted " @@ -3224,12 +3320,20 @@ msgstr "" "de Configuração: <literal>APT::FTPArchive::Contents</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-ftparchive.1.xml:571 +======= #: apt-ftparchive.1.xml:572 +>>>>>>> MERGE-SOURCE msgid "<option>--source-override</option>" msgstr "<option>--source-override</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:573 +======= #: apt-ftparchive.1.xml:574 +>>>>>>> MERGE-SOURCE msgid "" "Select the source override file to use with the <literal>sources</literal> " "command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</" @@ -3240,12 +3344,20 @@ msgstr "" "SourceOverride</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-ftparchive.1.xml:577 +======= #: apt-ftparchive.1.xml:578 +>>>>>>> MERGE-SOURCE msgid "<option>--readonly</option>" msgstr "<option>--readonly</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:579 +======= #: apt-ftparchive.1.xml:580 +>>>>>>> MERGE-SOURCE msgid "" "Make the caching databases read only. Configuration Item: <literal>APT::" "FTPArchive::ReadOnlyDB</literal>." @@ -3254,12 +3366,20 @@ msgstr "" "<literal>APT::FTPArchive::ReadOnlyDB</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-ftparchive.1.xml:583 +======= #: apt-ftparchive.1.xml:584 +>>>>>>> MERGE-SOURCE msgid "<option>--arch</option>" msgstr "<option>--arch</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:584 +======= #: apt-ftparchive.1.xml:585 +>>>>>>> MERGE-SOURCE msgid "" "Accept in the <literal>packages</literal> and <literal>contents</literal> " "commands only package files matching <literal>*_arch.deb</literal> or " @@ -3273,12 +3393,20 @@ msgstr "" "FTPArchive::Architecture</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-ftparchive.1.xml:590 +======= #: apt-ftparchive.1.xml:591 +>>>>>>> MERGE-SOURCE msgid "<option>APT::FTPArchive::AlwaysStat</option>" msgstr "<option>APT::FTPArchive::AlwaysStat</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:592 +======= #: apt-ftparchive.1.xml:593 +>>>>>>> MERGE-SOURCE msgid "" "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If " "packages are recompiled and/or republished with the same version again, this " @@ -3302,12 +3430,20 @@ msgstr "" "as verificações extras serão desnecessárias." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-ftparchive.1.xml:602 +======= #: apt-ftparchive.1.xml:603 +>>>>>>> MERGE-SOURCE msgid "<option>APT::FTPArchive::LongDescription</option>" msgstr "<option>APT::FTPArchive::LongDescription</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:604 +======= #: apt-ftparchive.1.xml:605 +>>>>>>> MERGE-SOURCE msgid "" "This configuration option defaults to \"<literal>true</literal>\" and should " "only be set to <literal>\"false\"</literal> if the Archive generated with " @@ -3322,19 +3458,31 @@ msgstr "" "<filename>Translation-en</filename> só pode ser criado no comando generate." #. type: Content of: <refentry><refsect1><title> +<<<<<<< TREE +#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:544 +======= #: apt-ftparchive.1.xml:617 apt.conf.5.xml:1087 apt_preferences.5.xml:544 +>>>>>>> MERGE-SOURCE #: sources.list.5.xml:198 msgid "Examples" msgstr "Examples" #. type: Content of: <refentry><refsect1><para><programlisting> +<<<<<<< TREE +#: apt-ftparchive.1.xml:622 +======= #: apt-ftparchive.1.xml:623 +>>>>>>> MERGE-SOURCE #, no-wrap msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" msgstr "<command>apt-ftparchive</command> pacotes <replaceable>directório</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" #. type: Content of: <refentry><refsect1><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:618 +======= #: apt-ftparchive.1.xml:619 +>>>>>>> MERGE-SOURCE msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" @@ -3343,7 +3491,11 @@ msgstr "" "pacotes binários (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:632 +======= #: apt-ftparchive.1.xml:633 +>>>>>>> MERGE-SOURCE msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@ -8285,7 +8437,11 @@ msgid "" "APT also supports pinning by glob() expressions and regular expressions " "surrounded by /. For example, the following example assigns the priority 500 " "to all packages from experimental where the name starts with gnome (as a glob" +<<<<<<< TREE +"()-like expression or contains the word kde (as a POSIX extended regular " +======= "()-like expression) or contains the word kde (as a POSIX extended regular " +>>>>>>> MERGE-SOURCE "expression surrounded by slashes)." msgstr "" @@ -8309,7 +8465,11 @@ msgstr "" #: apt_preferences.5.xml:279 msgid "" "The rule for those expressions is that they can occur anywhere where a " +<<<<<<< TREE +"string can occur. Those, the following pin assigns the priority 990 to all " +======= "string can occur. Thus, the following pin assigns the priority 990 to all " +>>>>>>> MERGE-SOURCE "packages from a release starting with karmic." msgstr "" diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po index 0f171479f..422fb43d2 100644 --- a/doc/po/pt_BR.po +++ b/doc/po/pt_BR.po @@ -9,7 +9,11 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" +<<<<<<< TREE +"POT-Creation-Date: 2011-06-09 08:32+0530\n" +======= "POT-Creation-Date: 2011-06-28 16:42+0200\n" +>>>>>>> MERGE-SOURCE "PO-Revision-Date: 2004-09-20 17:02+0000\n" "Last-Translator: André Luís Lopes <andrelop@debian.org>\n" "Language-Team: <debian-l10n-portuguese@lists.debian.org>\n" @@ -984,7 +988,11 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393 +======= #: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:393 +>>>>>>> MERGE-SOURCE #: apt-sortpkgs.1.xml:61 msgid "<option>-s</option>" msgstr "" @@ -1005,12 +1013,20 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 +======= #: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383 +>>>>>>> MERGE-SOURCE msgid "<option>-q</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 +======= #: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383 +>>>>>>> MERGE-SOURCE msgid "<option>--quiet</option>" msgstr "" @@ -1109,7 +1125,11 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583 +======= #: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584 +>>>>>>> MERGE-SOURCE msgid "<option>-a</option>" msgstr "" @@ -1205,7 +1225,11 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist> #: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101 +<<<<<<< TREE +#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570 +======= #: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:612 apt-get.8.xml:570 +>>>>>>> MERGE-SOURCE #: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67 msgid "&apt-commonoptions;" msgstr "" @@ -1223,7 +1247,11 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106 +<<<<<<< TREE +#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585 +======= #: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:628 apt-get.8.xml:585 +>>>>>>> MERGE-SOURCE #: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185 #: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704 #: sources.list.5.xml:234 @@ -1238,7 +1266,11 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111 +<<<<<<< TREE +#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591 +======= #: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:632 apt-get.8.xml:591 +>>>>>>> MERGE-SOURCE #: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76 msgid "Diagnostics" msgstr "" @@ -1343,7 +1375,11 @@ msgid "Options" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345 +======= #: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 apt-get.8.xml:345 +>>>>>>> MERGE-SOURCE msgid "<option>-d</option>" msgstr "" @@ -1548,7 +1584,11 @@ msgid "Just show the contents of the configuration space." msgstr "" #. type: Content of: <refentry><refsect1><para> +<<<<<<< TREE +#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628 +======= #: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:629 +>>>>>>> MERGE-SOURCE #: apt-sortpkgs.1.xml:73 #, fuzzy msgid "&apt-conf;" @@ -2478,26 +2518,45 @@ msgid "" "Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</" "replaceable></literal> and <literal>APT::FTPArchive::<replaceable>Index</" "replaceable>::<replaceable>Checksum</replaceable></literal> where " +<<<<<<< TREE +"<literal>Index</literal> can be <literal>Packages</literal>, " +"<literal>Sources</literal> or <literal>Release</literal> and " +"<literal>Checksum</literal> can be <literal>MD5</literal>, <literal>SHA1</" +"literal> or <literal>SHA256</literal>." +======= "<literal><replaceable>Index</replaceable></literal> can be " "<literal>Packages</literal>, <literal>Sources</literal> or <literal>Release</" "literal> and <literal><replaceable>Checksum</replaceable></literal> can be " "<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>." +>>>>>>> MERGE-SOURCE msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-ftparchive.1.xml:539 +======= #: apt-ftparchive.1.xml:540 +>>>>>>> MERGE-SOURCE msgid "<option>--db</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:541 +======= #: apt-ftparchive.1.xml:542 +>>>>>>> MERGE-SOURCE msgid "" "Use a binary caching DB. This has no effect on the generate command. " "Configuration Item: <literal>APT::FTPArchive::DB</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:547 +======= #: apt-ftparchive.1.xml:548 +>>>>>>> MERGE-SOURCE msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quiet up to a maximum of 2. You can also use " @@ -2506,12 +2565,20 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-ftparchive.1.xml:553 +======= #: apt-ftparchive.1.xml:554 +>>>>>>> MERGE-SOURCE msgid "<option>--delink</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:555 +======= #: apt-ftparchive.1.xml:556 +>>>>>>> MERGE-SOURCE msgid "" "Perform Delinking. If the <literal>External-Links</literal> setting is used " "then this option actually enables delinking of the files. It defaults to on " @@ -2520,12 +2587,20 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-ftparchive.1.xml:561 +======= #: apt-ftparchive.1.xml:562 +>>>>>>> MERGE-SOURCE msgid "<option>--contents</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:563 +======= #: apt-ftparchive.1.xml:564 +>>>>>>> MERGE-SOURCE msgid "" "Perform contents generation. When this option is set and package indexes are " "being generated with a cache DB then the file listing will also be extracted " @@ -2535,12 +2610,20 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-ftparchive.1.xml:571 +======= #: apt-ftparchive.1.xml:572 +>>>>>>> MERGE-SOURCE msgid "<option>--source-override</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:573 +======= #: apt-ftparchive.1.xml:574 +>>>>>>> MERGE-SOURCE msgid "" "Select the source override file to use with the <literal>sources</literal> " "command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</" @@ -2548,24 +2631,40 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-ftparchive.1.xml:577 +======= #: apt-ftparchive.1.xml:578 +>>>>>>> MERGE-SOURCE msgid "<option>--readonly</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:579 +======= #: apt-ftparchive.1.xml:580 +>>>>>>> MERGE-SOURCE msgid "" "Make the caching databases read only. Configuration Item: <literal>APT::" "FTPArchive::ReadOnlyDB</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-ftparchive.1.xml:583 +======= #: apt-ftparchive.1.xml:584 +>>>>>>> MERGE-SOURCE msgid "<option>--arch</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:584 +======= #: apt-ftparchive.1.xml:585 +>>>>>>> MERGE-SOURCE msgid "" "Accept in the <literal>packages</literal> and <literal>contents</literal> " "commands only package files matching <literal>*_arch.deb</literal> or " @@ -2574,12 +2673,20 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-ftparchive.1.xml:590 +======= #: apt-ftparchive.1.xml:591 +>>>>>>> MERGE-SOURCE msgid "<option>APT::FTPArchive::AlwaysStat</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:592 +======= #: apt-ftparchive.1.xml:593 +>>>>>>> MERGE-SOURCE msgid "" "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If " "packages are recompiled and/or republished with the same version again, this " @@ -2593,12 +2700,20 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +<<<<<<< TREE +#: apt-ftparchive.1.xml:602 +======= #: apt-ftparchive.1.xml:603 +>>>>>>> MERGE-SOURCE msgid "<option>APT::FTPArchive::LongDescription</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:604 +======= #: apt-ftparchive.1.xml:605 +>>>>>>> MERGE-SOURCE msgid "" "This configuration option defaults to \"<literal>true</literal>\" and should " "only be set to <literal>\"false\"</literal> if the Archive generated with " @@ -2608,27 +2723,43 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> +<<<<<<< TREE +#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:544 +======= #: apt-ftparchive.1.xml:617 apt.conf.5.xml:1087 apt_preferences.5.xml:544 +>>>>>>> MERGE-SOURCE #: sources.list.5.xml:198 #, fuzzy msgid "Examples" msgstr "Exemplos" #. type: Content of: <refentry><refsect1><para><programlisting> +<<<<<<< TREE +#: apt-ftparchive.1.xml:622 +======= #: apt-ftparchive.1.xml:623 +>>>>>>> MERGE-SOURCE #, no-wrap msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" msgstr "" #. type: Content of: <refentry><refsect1><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:618 +======= #: apt-ftparchive.1.xml:619 +>>>>>>> MERGE-SOURCE msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><para> +<<<<<<< TREE +#: apt-ftparchive.1.xml:632 +======= #: apt-ftparchive.1.xml:633 +>>>>>>> MERGE-SOURCE msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@ -6397,7 +6528,11 @@ msgid "" "APT also supports pinning by glob() expressions and regular expressions " "surrounded by /. For example, the following example assigns the priority 500 " "to all packages from experimental where the name starts with gnome (as a glob" +<<<<<<< TREE +"()-like expression or contains the word kde (as a POSIX extended regular " +======= "()-like expression) or contains the word kde (as a POSIX extended regular " +>>>>>>> MERGE-SOURCE "expression surrounded by slashes)." msgstr "" @@ -6418,7 +6553,11 @@ msgstr "" #: apt_preferences.5.xml:279 msgid "" "The rule for those expressions is that they can occur anywhere where a " +<<<<<<< TREE +"string can occur. Those, the following pin assigns the priority 990 to all " +======= "string can occur. Thus, the following pin assigns the priority 990 to all " +>>>>>>> MERGE-SOURCE "packages from a release starting with karmic." msgstr "" diff --git a/methods/debdelta.cc b/methods/debdelta.cc new file mode 100644 index 000000000..42d91a6dc --- /dev/null +++ b/methods/debdelta.cc @@ -0,0 +1,168 @@ +// Includes /*{{{*/ +#include <apt-pkg/acquire-item.h> +#include <apt-pkg/fileutl.h> +#include <apt-pkg/mmap.h> +#include <apt-pkg/error.h> +#include <apt-pkg/acquire-method.h> +#include <apt-pkg/strutl.h> +#include <apt-pkg/hashes.h> +#include <apt-pkg/init.h> + +#include <sys/stat.h> +#include <sys/uio.h> +#include <unistd.h> +#include <utime.h> +#include <stdio.h> +#include <errno.h> +#include <zlib.h> +#include <apti18n.h> + +/*}}}*/ +/** \brief DebdeltaMethod - TODO: say something about debdelta here! + * */ +class DebdeltaMethod : public pkgAcqMethod { + bool Debug; + string DebdeltaFile; + string FromFile; + string ToFile; +protected: + // the main(i.e. most important) method of the debdelta method. + virtual bool Fetch(FetchItem *Itm); +public: + DebdeltaMethod() : pkgAcqMethod("1.1", SingleInstance | SendConfig) {}; + void MakeToFile(); +}; + +bool DebdeltaMethod::Fetch(FetchItem *Itm) /*{{{*/ +{ + /// Testing only... + //FetchResult ResTest; + //ResTest.Filename = "/home/ishan/devel/apt/testrepo/binary/gcc-4.6-base_4.6.0-7_amd64.deb"; + //URIDone(ResTest); + //return true; + /// + Debug = _config->FindB("Debug::pkgAcquire::Debdelta", false); + FromFile = Itm->DestFile; + URI U(Itm->Uri); + DebdeltaFile = U.Path; + + if (flExtension(FromFile) != "deb" || !FileExists(FromFile)) + FromFile = "/"; + if (!FileExists(DebdeltaFile)) + return _error->Error("[Debdelta] Could not find a debdelta file."); + MakeToFile(); + if (FileExists(ToFile)) + return _error->Error("[Debdelta] New .deb already exists."); + + pid_t Process = ExecFork(); + if (Process == 0) + { + const char* Args[8] = {0}; + Args[0] = "/usr/bin/debpatch"; + if (!FileExists(Args[0])) + return _error->Error("[Debdelta] Could not find debpatch."); + Args[1] = "-A"; + Args[2] = DebdeltaFile.c_str(); + Args[3] = FromFile.c_str(); + Args[4] = ToFile.c_str(); + Args[5] = "1>&2"; + Args[6] = "2>/dev/null"; + if (Debug == true) + { + std::cerr << "[Debdelta] Command:" << std::endl; + std::cerr << Args[0] << " " << Args[1] << " " << Args[2] << " " << Args[3] << " " + << Args[4] << std::endl; + } + std::cerr << "[Debdelta] Patching " << ToFile << "...\r"; + execv(Args[0], (char **)Args); + } + if (ExecWait(Process, "debpatch", false)) + { + if (!FileExists(ToFile)) + return _error->Error("[Debdelta] Failed to patch %s", ToFile.c_str()); + // move the .deb to Dir::Cache::Archives + string FinalFile = _config->FindDir("Dir::Cache::Archives") + flNotDir(ToFile); + Rename(ToFile, FinalFile); + ToFile = FinalFile; + FetchResult Res; + Res.Filename = ToFile; + if (Queue != 0) + URIDone(Res); + else + std::cout << "Filename: " << Res.Filename << std::endl; + return true; + } + return false; +} + + +void DebdeltaMethod::MakeToFile() +{ + string DebdeltaName = flNotDir(DebdeltaFile); + int NewBegin = DebdeltaName.find("_", 0); + string PkgName = DebdeltaName.substr(0, NewBegin); + NewBegin = DebdeltaName.find("_", NewBegin + 1); + int NewEnd = DebdeltaName.find("_", NewBegin + 1); + string NewVersion = DebdeltaName.substr(NewBegin + 1, NewEnd - NewBegin - 1); + string Arch = DebdeltaName.substr(NewEnd + 1, DebdeltaName.find(".", NewEnd + 1) - NewEnd - 1); + ToFile = _config->FindDir("Dir::Cache::Archives") + "partial/" + + PkgName + "_" + NewVersion + "_" + Arch + ".deb"; +} + +/*}}}*/ +/** \brief Wrapper class for testing debdelta */ /*{{{*/ +class TestDebdeltaMethod : public DebdeltaMethod { +public: + /** \brief Run debdelta in debug test mode + * + * This method can be used to run the debdelta method outside + * of the "normal" acquire environment for easier testing. + * + * \param base basename of all files involved in this debdelta test + */ + bool Run(char const *DebdeltaFile, char const *FromFile) + { + if (pkgInitConfig(*_config) == false || + pkgInitSystem(*_config,_system) == false) + { + std::cerr << "[Debdelta] E: Could not initialize the system/configuration." << std::endl; + _error->DumpErrors(); + return 100; + } + _config->CndSet("Debug::pkgAcquire::Debdetla", "true"); + FetchItem *Test = new FetchItem; + Test->DestFile = FromFile; + Test->Uri = "debdelta://" + string(DebdeltaFile); + Test->FailIgnore = false; + Test->IndexFile = false; + Test->Next = 0; + + return Fetch(Test); + } +}; + +/*}}}*/ +/** \brief Starter for the debdelta method (or its test method) {{{ + * + * Used without parameters is the normal behavior for methods for + * the APT acquire system. While this works great for the acquire system + * it is very hard to test the method and therefore the method also + * accepts one parameter which will switch it directly to debug test mode: + */ +int main(int argc, char *argv[]) +{ + if (argc <= 1) + { + DebdeltaMethod Mth; + return Mth.Run(); + } + else + { + TestDebdeltaMethod Mth; + bool result = Mth.Run(argv[1], argv[2]); + _error->DumpErrors(); + return result; + } +} +/*}}}*/ + diff --git a/methods/makefile b/methods/makefile index 6ba51058e..666b543f0 100644 --- a/methods/makefile +++ b/methods/makefile @@ -72,6 +72,13 @@ LIB_MAKES = apt-pkg/makefile SOURCE = rred.cc include $(PROGRAM_H) +# The debdelta method +PROGRAM=debdelta +SLIBS = -lapt-pkg -lz $(SOCKETLIBS) $(INTLLIBS) +LIB_MAKES = apt-pkg/makefile +SOURCE = debdelta.cc +include $(PROGRAM_H) + # The rsh method PROGRAM=rsh SLIBS = -lapt-pkg $(INTLLIBS) diff --git a/po/apt-all.pot b/po/apt-all.pot index 73ed82195..92690019f 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: 2011-01-12 17:42+0100\n" +"POT-Creation-Date: 2011-06-09 08:33+0530\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" @@ -17,155 +17,158 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: cmdline/apt-cache.cc:156 +#: cmdline/apt-cache.cc:154 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "" -#: cmdline/apt-cache.cc:284 +#: cmdline/apt-cache.cc:282 msgid "Total package names: " msgstr "" -#: cmdline/apt-cache.cc:286 +#: cmdline/apt-cache.cc:284 msgid "Total package structures: " msgstr "" -#: cmdline/apt-cache.cc:326 +#: cmdline/apt-cache.cc:324 msgid " Normal packages: " msgstr "" -#: cmdline/apt-cache.cc:327 +#: cmdline/apt-cache.cc:325 msgid " Pure virtual packages: " msgstr "" -#: cmdline/apt-cache.cc:328 +#: cmdline/apt-cache.cc:326 msgid " Single virtual packages: " msgstr "" -#: cmdline/apt-cache.cc:329 +#: cmdline/apt-cache.cc:327 msgid " Mixed virtual packages: " msgstr "" -#: cmdline/apt-cache.cc:330 +#: cmdline/apt-cache.cc:328 msgid " Missing: " msgstr "" -#: cmdline/apt-cache.cc:332 +#: cmdline/apt-cache.cc:330 msgid "Total distinct versions: " msgstr "" -#: cmdline/apt-cache.cc:334 +#: cmdline/apt-cache.cc:332 msgid "Total distinct descriptions: " msgstr "" -#: cmdline/apt-cache.cc:336 +#: cmdline/apt-cache.cc:334 msgid "Total dependencies: " msgstr "" -#: cmdline/apt-cache.cc:339 +#: cmdline/apt-cache.cc:337 msgid "Total ver/file relations: " msgstr "" -#: cmdline/apt-cache.cc:341 +#: cmdline/apt-cache.cc:339 msgid "Total Desc/File relations: " msgstr "" -#: cmdline/apt-cache.cc:343 +#: cmdline/apt-cache.cc:341 msgid "Total Provides mappings: " msgstr "" -#: cmdline/apt-cache.cc:355 +#: cmdline/apt-cache.cc:353 msgid "Total globbed strings: " msgstr "" -#: cmdline/apt-cache.cc:369 +#: cmdline/apt-cache.cc:367 msgid "Total dependency version space: " msgstr "" -#: cmdline/apt-cache.cc:374 +#: cmdline/apt-cache.cc:372 msgid "Total slack space: " msgstr "" -#: cmdline/apt-cache.cc:382 +#: cmdline/apt-cache.cc:380 msgid "Total space accounted for: " msgstr "" -#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1194 +#: cmdline/apt-cache.cc:511 cmdline/apt-cache.cc:1139 #, c-format msgid "Package file %s is out of sync." msgstr "" -#: cmdline/apt-cache.cc:1273 +#: cmdline/apt-cache.cc:589 cmdline/apt-cache.cc:1374 +#: cmdline/apt-cache.cc:1376 cmdline/apt-cache.cc:1453 cmdline/apt-mark.cc:37 +#: cmdline/apt-mark.cc:84 cmdline/apt-mark.cc:160 +msgid "No packages found" +msgstr "" + +#: cmdline/apt-cache.cc:1218 msgid "You must give at least one search pattern" msgstr "" -#: cmdline/apt-cache.cc:1429 cmdline/apt-cache.cc:1431 -#: cmdline/apt-cache.cc:1508 -msgid "No packages found" +#: cmdline/apt-cache.cc:1353 +msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1503 apt-pkg/cacheset.cc:440 +#: cmdline/apt-cache.cc:1448 apt-pkg/cacheset.cc:440 #, c-format msgid "Unable to locate package %s" msgstr "" -#: cmdline/apt-cache.cc:1533 +#: cmdline/apt-cache.cc:1478 msgid "Package files:" msgstr "" -#: cmdline/apt-cache.cc:1540 cmdline/apt-cache.cc:1638 +#: cmdline/apt-cache.cc:1485 cmdline/apt-cache.cc:1576 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1554 +#: cmdline/apt-cache.cc:1499 msgid "Pinned packages:" msgstr "" -#: cmdline/apt-cache.cc:1566 cmdline/apt-cache.cc:1618 +#: cmdline/apt-cache.cc:1511 cmdline/apt-cache.cc:1556 msgid "(not found)" msgstr "" -#: cmdline/apt-cache.cc:1575 +#: cmdline/apt-cache.cc:1519 msgid " Installed: " msgstr "" -#: cmdline/apt-cache.cc:1576 +#: cmdline/apt-cache.cc:1520 msgid " Candidate: " msgstr "" -#: cmdline/apt-cache.cc:1600 cmdline/apt-cache.cc:1608 +#: cmdline/apt-cache.cc:1538 cmdline/apt-cache.cc:1546 msgid "(none)" msgstr "" -#: cmdline/apt-cache.cc:1615 +#: cmdline/apt-cache.cc:1553 msgid " Package pin: " msgstr "" #. Show the priority tables -#: cmdline/apt-cache.cc:1624 +#: cmdline/apt-cache.cc:1562 msgid " Version table:" msgstr "" -#: cmdline/apt-cache.cc:1738 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1675 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589 -#: cmdline/apt-get.cc:2793 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:3122 cmdline/apt-mark.cc:264 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "" -#: cmdline/apt-cache.cc:1745 +#: cmdline/apt-cache.cc:1682 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" +"apt-cache is a low-level tool used to query information\n" +"from APT's binary cache files\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" @@ -175,7 +178,6 @@ msgid "" " unmet - Show unmet dependencies\n" " search - Search the package list for a regex pattern\n" " show - Show a readable record for the package\n" -" showauto - Display a list of automatically installed packages\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 in the system\n" @@ -250,7 +252,7 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1171 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1149 #, c-format msgid "Unable to write to %s" msgstr "" @@ -369,97 +371,92 @@ msgstr "" msgid "Unable to get a cursor" msgstr "" -#: ftparchive/writer.cc:73 +#: ftparchive/writer.cc:78 #, c-format msgid "W: Unable to read directory %s\n" msgstr "" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:83 #, c-format msgid "W: Unable to stat %s\n" msgstr "" -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:139 msgid "E: " msgstr "" -#: ftparchive/writer.cc:136 +#: ftparchive/writer.cc:141 msgid "W: " msgstr "" -#: ftparchive/writer.cc:143 +#: ftparchive/writer.cc:148 msgid "E: Errors apply to file " msgstr "" -#: ftparchive/writer.cc:161 ftparchive/writer.cc:193 +#: ftparchive/writer.cc:166 ftparchive/writer.cc:198 #, c-format msgid "Failed to resolve %s" msgstr "" -#: ftparchive/writer.cc:174 +#: ftparchive/writer.cc:179 msgid "Tree walking failed" msgstr "" -#: ftparchive/writer.cc:201 +#: ftparchive/writer.cc:206 #, c-format msgid "Failed to open %s" msgstr "" -#: ftparchive/writer.cc:260 +#: ftparchive/writer.cc:265 #, c-format msgid " DeLink %s [%s]\n" msgstr "" -#: ftparchive/writer.cc:268 +#: ftparchive/writer.cc:273 #, c-format msgid "Failed to readlink %s" msgstr "" -#: ftparchive/writer.cc:272 +#: ftparchive/writer.cc:277 #, c-format msgid "Failed to unlink %s" msgstr "" -#: ftparchive/writer.cc:279 +#: ftparchive/writer.cc:284 #, c-format msgid "*** Failed to link %s to %s" msgstr "" -#: ftparchive/writer.cc:289 +#: ftparchive/writer.cc:294 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr "" -#: ftparchive/writer.cc:393 +#: ftparchive/writer.cc:398 msgid "Archive had no package field" msgstr "" -#: ftparchive/writer.cc:401 ftparchive/writer.cc:688 +#: ftparchive/writer.cc:406 ftparchive/writer.cc:703 #, c-format msgid " %s has no override entry\n" msgstr "" -#: ftparchive/writer.cc:464 ftparchive/writer.cc:793 +#: ftparchive/writer.cc:472 ftparchive/writer.cc:811 #, c-format msgid " %s maintainer is %s not %s\n" msgstr "" -#: ftparchive/writer.cc:698 +#: ftparchive/writer.cc:713 #, c-format msgid " %s has no source override entry\n" msgstr "" -#: ftparchive/writer.cc:702 +#: ftparchive/writer.cc:717 #, c-format msgid " %s has no binary override entry either\n" msgstr "" -#: ftparchive/contents.cc:321 -#, c-format -msgid "Internal error, could not locate member %s" -msgstr "" - -#: ftparchive/contents.cc:358 ftparchive/contents.cc:389 +#: ftparchive/contents.cc:337 ftparchive/contents.cc:368 msgid "realloc - Failed to allocate memory" msgstr "" @@ -488,63 +485,63 @@ msgstr "" msgid "Failed to read the override file %s" msgstr "" -#: ftparchive/multicompress.cc:72 +#: ftparchive/multicompress.cc:67 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "" -#: ftparchive/multicompress.cc:102 +#: ftparchive/multicompress.cc:97 #, c-format msgid "Compressed output %s needs a compression set" msgstr "" -#: ftparchive/multicompress.cc:169 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:165 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "" -#: ftparchive/multicompress.cc:195 +#: ftparchive/multicompress.cc:191 msgid "Failed to create FILE*" msgstr "" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:194 msgid "Failed to fork" msgstr "" -#: ftparchive/multicompress.cc:212 +#: ftparchive/multicompress.cc:208 msgid "Compress child" msgstr "" -#: ftparchive/multicompress.cc:235 +#: ftparchive/multicompress.cc:231 #, c-format msgid "Internal error, failed to create %s" msgstr "" -#: ftparchive/multicompress.cc:286 +#: ftparchive/multicompress.cc:282 msgid "Failed to create subprocess IPC" msgstr "" -#: ftparchive/multicompress.cc:321 +#: ftparchive/multicompress.cc:319 msgid "Failed to exec compressor " msgstr "" -#: ftparchive/multicompress.cc:360 +#: ftparchive/multicompress.cc:358 msgid "decompressor" msgstr "" -#: ftparchive/multicompress.cc:403 +#: ftparchive/multicompress.cc:401 msgid "IO to subprocess/file failed" msgstr "" -#: ftparchive/multicompress.cc:455 +#: ftparchive/multicompress.cc:453 msgid "Failed to read while computing MD5" msgstr "" -#: ftparchive/multicompress.cc:472 +#: ftparchive/multicompress.cc:470 #, c-format msgid "Problem unlinking %s" msgstr "" -#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185 +#: ftparchive/multicompress.cc:485 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "" @@ -592,94 +589,94 @@ msgstr "" msgid " or" msgstr "" -#: cmdline/apt-get.cc:392 +#: cmdline/apt-get.cc:390 msgid "The following NEW packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:420 +#: cmdline/apt-get.cc:416 msgid "The following packages will be REMOVED:" msgstr "" -#: cmdline/apt-get.cc:442 +#: cmdline/apt-get.cc:438 msgid "The following packages have been kept back:" msgstr "" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:459 msgid "The following packages will be upgraded:" msgstr "" -#: cmdline/apt-get.cc:488 +#: cmdline/apt-get.cc:480 msgid "The following packages will be DOWNGRADED:" msgstr "" -#: cmdline/apt-get.cc:508 +#: cmdline/apt-get.cc:500 msgid "The following held packages will be changed:" msgstr "" -#: cmdline/apt-get.cc:563 +#: cmdline/apt-get.cc:555 #, c-format msgid "%s (due to %s) " msgstr "" -#: cmdline/apt-get.cc:571 +#: cmdline/apt-get.cc:563 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" -#: cmdline/apt-get.cc:605 +#: cmdline/apt-get.cc:594 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "" -#: cmdline/apt-get.cc:609 +#: cmdline/apt-get.cc:598 #, c-format msgid "%lu reinstalled, " msgstr "" -#: cmdline/apt-get.cc:611 +#: cmdline/apt-get.cc:600 #, c-format msgid "%lu downgraded, " msgstr "" -#: cmdline/apt-get.cc:613 +#: cmdline/apt-get.cc:602 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "" -#: cmdline/apt-get.cc:617 +#: cmdline/apt-get.cc:606 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "" -#: cmdline/apt-get.cc:639 +#: cmdline/apt-get.cc:628 #, c-format msgid "Note, selecting '%s' for task '%s'\n" msgstr "" -#: cmdline/apt-get.cc:645 +#: cmdline/apt-get.cc:634 #, c-format msgid "Note, selecting '%s' for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:662 +#: cmdline/apt-get.cc:651 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "" -#: cmdline/apt-get.cc:673 +#: cmdline/apt-get.cc:662 msgid " [Installed]" msgstr "" -#: cmdline/apt-get.cc:682 +#: cmdline/apt-get.cc:671 msgid " [Not candidate version]" msgstr "" -#: cmdline/apt-get.cc:684 +#: cmdline/apt-get.cc:673 msgid "You should explicitly select one to install." msgstr "" -#: cmdline/apt-get.cc:687 +#: cmdline/apt-get.cc:676 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -687,177 +684,177 @@ msgid "" "is only available from another source\n" msgstr "" -#: cmdline/apt-get.cc:705 +#: cmdline/apt-get.cc:694 msgid "However the following packages replace it:" msgstr "" -#: cmdline/apt-get.cc:717 +#: cmdline/apt-get.cc:706 #, c-format msgid "Package '%s' has no installation candidate" msgstr "" -#: cmdline/apt-get.cc:728 +#: cmdline/apt-get.cc:717 #, c-format msgid "Virtual packages like '%s' can't be removed\n" msgstr "" -#: cmdline/apt-get.cc:759 +#: cmdline/apt-get.cc:748 #, c-format msgid "Note, selecting '%s' instead of '%s'\n" msgstr "" -#: cmdline/apt-get.cc:789 +#: cmdline/apt-get.cc:778 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" -#: cmdline/apt-get.cc:793 +#: cmdline/apt-get.cc:782 #, c-format msgid "Skipping %s, it is not installed and only upgrades are requested.\n" msgstr "" -#: cmdline/apt-get.cc:803 +#: cmdline/apt-get.cc:794 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" -#: cmdline/apt-get.cc:808 +#: cmdline/apt-get.cc:799 #, c-format msgid "%s is already the newest version.\n" msgstr "" -#: cmdline/apt-get.cc:827 cmdline/apt-get.cc:2027 +#: cmdline/apt-get.cc:818 cmdline/apt-get.cc:2080 cmdline/apt-mark.cc:59 #, c-format msgid "%s set to manually installed.\n" msgstr "" -#: cmdline/apt-get.cc:853 +#: cmdline/apt-get.cc:844 #, c-format msgid "Selected version '%s' (%s) for '%s'\n" msgstr "" -#: cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:849 #, c-format msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" msgstr "" -#: cmdline/apt-get.cc:898 +#: cmdline/apt-get.cc:893 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "" -#: cmdline/apt-get.cc:973 +#: cmdline/apt-get.cc:971 msgid "Correcting dependencies..." msgstr "" -#: cmdline/apt-get.cc:976 +#: cmdline/apt-get.cc:974 msgid " failed." msgstr "" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:977 msgid "Unable to correct dependencies" msgstr "" -#: cmdline/apt-get.cc:982 +#: cmdline/apt-get.cc:980 msgid "Unable to minimize the upgrade set" msgstr "" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:982 msgid " Done" msgstr "" -#: cmdline/apt-get.cc:988 +#: cmdline/apt-get.cc:986 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "" -#: cmdline/apt-get.cc:991 +#: cmdline/apt-get.cc:989 msgid "Unmet dependencies. Try using -f." msgstr "" -#: cmdline/apt-get.cc:1016 +#: cmdline/apt-get.cc:1014 msgid "WARNING: The following packages cannot be authenticated!" msgstr "" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1018 msgid "Authentication warning overridden.\n" msgstr "" -#: cmdline/apt-get.cc:1027 +#: cmdline/apt-get.cc:1025 msgid "Install these packages without verification [y/N]? " msgstr "" -#: cmdline/apt-get.cc:1029 +#: cmdline/apt-get.cc:1027 msgid "Some packages could not be authenticated" msgstr "" -#: cmdline/apt-get.cc:1038 cmdline/apt-get.cc:1199 +#: cmdline/apt-get.cc:1036 cmdline/apt-get.cc:1197 msgid "There are problems and -y was used without --force-yes" msgstr "" -#: cmdline/apt-get.cc:1079 +#: cmdline/apt-get.cc:1077 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" -#: cmdline/apt-get.cc:1088 +#: cmdline/apt-get.cc:1086 msgid "Packages need to be removed but remove is disabled." msgstr "" -#: cmdline/apt-get.cc:1099 +#: cmdline/apt-get.cc:1097 msgid "Internal error, Ordering didn't finish" msgstr "" -#: cmdline/apt-get.cc:1137 +#: cmdline/apt-get.cc:1135 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1144 +#: cmdline/apt-get.cc:1142 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1149 +#: cmdline/apt-get.cc:1147 #, c-format msgid "Need to get %sB of archives.\n" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1156 +#: cmdline/apt-get.cc:1154 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1161 +#: cmdline/apt-get.cc:1159 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "" -#: cmdline/apt-get.cc:1176 cmdline/apt-get.cc:1179 cmdline/apt-get.cc:2367 -#: cmdline/apt-get.cc:2370 +#: cmdline/apt-get.cc:1174 cmdline/apt-get.cc:1177 cmdline/apt-get.cc:2492 +#: cmdline/apt-get.cc:2495 #, c-format msgid "Couldn't determine free space in %s" msgstr "" -#: cmdline/apt-get.cc:1189 +#: cmdline/apt-get.cc:1187 #, c-format msgid "You don't have enough free space in %s." msgstr "" -#: cmdline/apt-get.cc:1205 cmdline/apt-get.cc:1225 +#: cmdline/apt-get.cc:1203 cmdline/apt-get.cc:1223 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" -#: cmdline/apt-get.cc:1207 +#: cmdline/apt-get.cc:1205 msgid "Yes, do as I say!" msgstr "" -#: cmdline/apt-get.cc:1209 +#: cmdline/apt-get.cc:1207 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -865,46 +862,46 @@ msgid "" " ?] " msgstr "" -#: cmdline/apt-get.cc:1215 cmdline/apt-get.cc:1234 +#: cmdline/apt-get.cc:1213 cmdline/apt-get.cc:1232 msgid "Abort." msgstr "" -#: cmdline/apt-get.cc:1230 +#: cmdline/apt-get.cc:1228 msgid "Do you want to continue [Y/n]? " msgstr "" -#: cmdline/apt-get.cc:1302 cmdline/apt-get.cc:2427 apt-pkg/algorithms.cc:1470 +#: cmdline/apt-get.cc:1300 cmdline/apt-get.cc:2557 apt-pkg/algorithms.cc:1410 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" -#: cmdline/apt-get.cc:1320 +#: cmdline/apt-get.cc:1318 msgid "Some files failed to download" msgstr "" -#: cmdline/apt-get.cc:1321 cmdline/apt-get.cc:2436 +#: cmdline/apt-get.cc:1319 cmdline/apt-get.cc:2569 msgid "Download complete and in download only mode" msgstr "" -#: cmdline/apt-get.cc:1327 +#: cmdline/apt-get.cc:1325 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" -#: cmdline/apt-get.cc:1331 +#: cmdline/apt-get.cc:1329 msgid "--fix-missing and media swapping is not currently supported" msgstr "" -#: cmdline/apt-get.cc:1336 +#: cmdline/apt-get.cc:1334 msgid "Unable to correct missing packages." msgstr "" -#: cmdline/apt-get.cc:1337 +#: cmdline/apt-get.cc:1335 msgid "Aborting install." msgstr "" -#: cmdline/apt-get.cc:1365 +#: cmdline/apt-get.cc:1363 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -914,35 +911,35 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1369 +#: cmdline/apt-get.cc:1367 msgid "Note: This is done automatic and on purpose by dpkg." msgstr "" -#: cmdline/apt-get.cc:1499 +#: cmdline/apt-get.cc:1497 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1531 +#: cmdline/apt-get.cc:1529 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1567 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1583 msgid "The update command takes no arguments" msgstr "" -#: cmdline/apt-get.cc:1647 +#: cmdline/apt-get.cc:1645 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1699 +#: cmdline/apt-get.cc:1740 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -958,15 +955,15 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1702 cmdline/apt-get.cc:1858 +#: cmdline/apt-get.cc:1743 cmdline/apt-get.cc:1913 msgid "The following information may help to resolve the situation:" msgstr "" -#: cmdline/apt-get.cc:1706 +#: cmdline/apt-get.cc:1747 msgid "Internal Error, AutoRemover broke stuff" msgstr "" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1754 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -975,7 +972,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1717 +#: cmdline/apt-get.cc:1758 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -983,25 +980,25 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1719 +#: cmdline/apt-get.cc:1760 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1738 +#: cmdline/apt-get.cc:1779 msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1828 +#: cmdline/apt-get.cc:1878 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "" -#: cmdline/apt-get.cc:1831 +#: cmdline/apt-get.cc:1882 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -#: cmdline/apt-get.cc:1843 +#: cmdline/apt-get.cc:1898 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,69 +1006,80 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1861 +#: cmdline/apt-get.cc:1916 msgid "Broken packages" msgstr "" -#: cmdline/apt-get.cc:1889 +#: cmdline/apt-get.cc:1942 msgid "The following extra packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:2032 msgid "Suggested packages:" msgstr "" -#: cmdline/apt-get.cc:1980 +#: cmdline/apt-get.cc:2033 msgid "Recommended packages:" msgstr "" -#: cmdline/apt-get.cc:2022 +#: cmdline/apt-get.cc:2075 #, c-format msgid "Couldn't find package %s" msgstr "" -#: cmdline/apt-get.cc:2029 +#: cmdline/apt-get.cc:2082 cmdline/apt-mark.cc:61 #, c-format msgid "%s set to automatically installed.\n" msgstr "" -#: cmdline/apt-get.cc:2050 +#: cmdline/apt-get.cc:2090 cmdline/apt-mark.cc:105 +msgid "" +"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " +"instead." +msgstr "" + +#: cmdline/apt-get.cc:2106 msgid "Calculating upgrade... " msgstr "" -#: cmdline/apt-get.cc:2053 methods/ftp.cc:707 methods/connect.cc:111 +#: cmdline/apt-get.cc:2109 methods/ftp.cc:707 methods/connect.cc:111 msgid "Failed" msgstr "" -#: cmdline/apt-get.cc:2058 +#: cmdline/apt-get.cc:2114 msgid "Done" msgstr "" -#: cmdline/apt-get.cc:2125 cmdline/apt-get.cc:2133 +#: cmdline/apt-get.cc:2181 cmdline/apt-get.cc:2189 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:2157 cmdline/apt-get.cc:2190 +#: cmdline/apt-get.cc:2213 cmdline/apt-get.cc:2246 msgid "Unable to lock the download directory" msgstr "" -#: cmdline/apt-get.cc:2233 +#: cmdline/apt-get.cc:2297 +#, c-format +msgid "Downloading %s %s" +msgstr "" + +#: cmdline/apt-get.cc:2353 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:2273 cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2394 cmdline/apt-get.cc:2690 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:2289 +#: cmdline/apt-get.cc:2411 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2416 #, c-format msgid "" "Please use:\n" @@ -1079,115 +1087,120 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:2345 +#: cmdline/apt-get.cc:2469 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:2380 +#: cmdline/apt-get.cc:2506 #, c-format msgid "You don't have enough free space in %s" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2388 +#: cmdline/apt-get.cc:2515 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2393 +#: cmdline/apt-get.cc:2520 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2399 +#: cmdline/apt-get.cc:2526 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:2432 +#: cmdline/apt-get.cc:2564 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:2462 +#: cmdline/apt-get.cc:2595 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2474 +#: cmdline/apt-get.cc:2607 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2475 +#: cmdline/apt-get.cc:2608 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2492 +#: cmdline/apt-get.cc:2625 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2512 +#: cmdline/apt-get.cc:2645 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2528 +#: cmdline/apt-get.cc:2664 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2559 +#: cmdline/apt-get.cc:2695 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2579 +#: cmdline/apt-get.cc:2715 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2630 +#: cmdline/apt-get.cc:2766 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2683 +#: cmdline/apt-get.cc:2819 #, 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:2719 +#: cmdline/apt-get.cc:2855 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2746 +#: cmdline/apt-get.cc:2882 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2762 +#: cmdline/apt-get.cc:2898 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2767 +#: cmdline/apt-get.cc:2903 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2798 +#: cmdline/apt-get.cc:2996 cmdline/apt-get.cc:3008 +#, c-format +msgid "Changelog for %s (%s)" +msgstr "" + +#: cmdline/apt-get.cc:3127 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:2839 +#: cmdline/apt-get.cc:3168 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1211,8 +1224,8 @@ msgid "" " clean - Erase downloaded archive files\n" " autoclean - Erase old downloaded archive files\n" " check - Verify that there are no broken dependencies\n" -" markauto - Mark the given packages as automatically installed\n" -" unmarkauto - Mark the given packages as manually installed\n" +" changelog - Download and display the changelog for the given package\n" +" download - Download the binary package into the current directory\n" "\n" "Options:\n" " -h This help text.\n" @@ -1233,7 +1246,7 @@ msgid "" " This APT has Super Cow Powers.\n" msgstr "" -#: cmdline/apt-get.cc:2995 +#: cmdline/apt-get.cc:3330 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1275,6 +1288,67 @@ msgid "" "in the drive '%s' and press enter\n" msgstr "" +#: cmdline/apt-mark.cc:46 +#, c-format +msgid "%s can not be marked as it is not installed.\n" +msgstr "" + +#: cmdline/apt-mark.cc:52 +#, c-format +msgid "%s was already set to manually installed.\n" +msgstr "" + +#: cmdline/apt-mark.cc:54 +#, c-format +msgid "%s was already set to automatically installed.\n" +msgstr "" + +#: cmdline/apt-mark.cc:169 +#, c-format +msgid "%s was already set on hold.\n" +msgstr "" + +#: cmdline/apt-mark.cc:171 +#, c-format +msgid "%s was already not hold.\n" +msgstr "" + +#: cmdline/apt-mark.cc:185 cmdline/apt-mark.cc:207 +#, c-format +msgid "%s set on hold.\n" +msgstr "" + +#: cmdline/apt-mark.cc:187 cmdline/apt-mark.cc:212 +#, c-format +msgid "Canceled hold on %s.\n" +msgstr "" + +#: cmdline/apt-mark.cc:220 +msgid "Executing dpkg failed. Are you root?" +msgstr "" + +#: cmdline/apt-mark.cc:268 +msgid "" +"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" +"\n" +"apt-mark is a simple command line interface for marking packages\n" +"as manual or automatical installed. It can also list marks.\n" +"\n" +"Commands:\n" +" auto - Mark the given packages as automatically installed\n" +" manual - Mark the given packages as manually installed\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -q Loggable output - no progress indicator\n" +" -qq No output except for errors\n" +" -s No-act. Just prints what would be done.\n" +" -f read/write auto/manual marking in the given file\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +"See the apt-mark(8) and apt.conf(5) manual pages for more information." +msgstr "" + #: cmdline/apt-sortpkgs.cc:86 msgid "Unknown package record!" msgstr "" @@ -1335,7 +1409,7 @@ msgstr "" msgid "Failed to exec gzip " msgstr "" -#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:208 msgid "Corrupted archive" msgstr "" @@ -1343,7 +1417,7 @@ msgstr "" msgid "Tar checksum failed, archive corrupted" msgstr "" -#: apt-inst/contrib/extracttar.cc:296 +#: apt-inst/contrib/extracttar.cc:300 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "" @@ -1404,12 +1478,12 @@ msgstr "" msgid "Duplicate conf file %s/%s" msgstr "" -#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:47 apt-inst/dirstream.cc:53 #, c-format msgid "Failed to write file %s" msgstr "" -#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 +#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "" @@ -1451,28 +1525,28 @@ msgstr "" msgid "The path is too long" msgstr "" -#: apt-inst/extract.cc:414 +#: apt-inst/extract.cc:412 #, c-format msgid "Overwrite package match with no version for %s" msgstr "" -#: apt-inst/extract.cc:431 +#: apt-inst/extract.cc:429 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:179 -#: apt-pkg/contrib/fileutl.cc:329 apt-pkg/sourcelist.cc:204 -#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:100 -#: apt-pkg/init.cc:108 apt-pkg/clean.cc:33 apt-pkg/policy.cc:307 -#: methods/mirror.cc:87 +#: apt-inst/extract.cc:462 apt-pkg/contrib/cdromutl.cc:179 +#: apt-pkg/contrib/fileutl.cc:343 apt-pkg/sourcelist.cc:204 +#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:103 +#: apt-pkg/init.cc:111 apt-pkg/clean.cc:33 apt-pkg/policy.cc:314 +#: methods/mirror.cc:91 #, c-format msgid "Unable to read %s" msgstr "" -#: apt-inst/extract.cc:491 +#: apt-inst/extract.cc:489 #, c-format msgid "Unable to stat %s" msgstr "" @@ -1496,9 +1570,9 @@ msgstr "" msgid "The info and temp directories need to be on the same filesystem" msgstr "" -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1070 -#: apt-pkg/pkgcachegen.cc:1174 apt-pkg/pkgcachegen.cc:1180 -#: apt-pkg/pkgcachegen.cc:1326 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1048 +#: apt-pkg/pkgcachegen.cc:1152 apt-pkg/pkgcachegen.cc:1158 +#: apt-pkg/pkgcachegen.cc:1304 msgid "Reading package lists" msgstr "" @@ -1571,51 +1645,57 @@ msgstr "" msgid "Error parsing MD5. Offset %lu" msgstr "" -#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43 +#: apt-inst/deb/debfile.cc:39 apt-inst/deb/debfile.cc:44 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "" -#: apt-inst/deb/debfile.cc:50 +#. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain +#: apt-inst/deb/debfile.cc:53 #, c-format msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" msgstr "" -#: apt-inst/deb/debfile.cc:110 +#: apt-inst/deb/debfile.cc:113 #, c-format msgid "Couldn't change to %s" msgstr "" -#: apt-inst/deb/debfile.cc:140 -msgid "Internal error, could not locate member" +#: apt-inst/deb/debfile.cc:154 +#, c-format +msgid "Internal error, could not locate member %s" msgstr "" -#: apt-inst/deb/debfile.cc:173 +#: apt-inst/deb/debfile.cc:189 msgid "Failed to locate a valid control file" msgstr "" -#: apt-inst/deb/debfile.cc:258 +#: apt-inst/deb/debfile.cc:274 msgid "Unparsable control file" msgstr "" -#: methods/bzip2.cc:65 +#: methods/bzip2.cc:60 methods/gzip.cc:52 +msgid "Empty files can't be valid archives" +msgstr "" + +#: methods/bzip2.cc:64 #, c-format msgid "Couldn't open pipe for %s" msgstr "" -#: methods/bzip2.cc:109 +#: methods/bzip2.cc:108 #, c-format msgid "Read error from %s process" msgstr "" -#: methods/bzip2.cc:141 methods/bzip2.cc:150 methods/copy.cc:43 -#: methods/gzip.cc:93 methods/gzip.cc:102 methods/rred.cc:486 -#: methods/rred.cc:495 +#: methods/bzip2.cc:140 methods/bzip2.cc:149 methods/copy.cc:43 +#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:524 +#: methods/rred.cc:533 msgid "Failed to stat" msgstr "" -#: methods/bzip2.cc:147 methods/copy.cc:80 methods/gzip.cc:99 -#: methods/rred.cc:492 +#: methods/bzip2.cc:146 methods/copy.cc:80 methods/gzip.cc:98 +#: methods/rred.cc:530 msgid "Failed to set modification time" msgstr "" @@ -1643,7 +1723,7 @@ msgstr "" msgid "Disk not found." msgstr "" -#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:265 msgid "File not found" msgstr "" @@ -1695,7 +1775,7 @@ msgstr "" msgid "TYPE failed, server said: %s" msgstr "" -#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226 +#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:184 methods/rsh.cc:227 msgid "Connection timeout" msgstr "" @@ -1703,11 +1783,11 @@ msgstr "" msgid "Server closed the connection" msgstr "" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:802 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:820 methods/rsh.cc:191 msgid "Read error" msgstr "" -#: methods/ftp.cc:351 methods/rsh.cc:197 +#: methods/ftp.cc:351 methods/rsh.cc:198 msgid "A response overflowed the buffer." msgstr "" @@ -1715,7 +1795,7 @@ msgstr "" msgid "Protocol corruption" msgstr "" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:844 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:862 methods/rsh.cc:233 msgid "Write error" msgstr "" @@ -1769,7 +1849,7 @@ msgstr "" msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:869 methods/http.cc:1006 methods/rsh.cc:302 +#: methods/ftp.cc:869 methods/http.cc:1023 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" @@ -1778,7 +1858,7 @@ msgstr "" msgid "Unable to fetch file, server said '%s'" msgstr "" -#: methods/ftp.cc:897 methods/rsh.cc:321 +#: methods/ftp.cc:897 methods/rsh.cc:322 msgid "Data socket timed out" msgstr "" @@ -1828,7 +1908,7 @@ msgstr "" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:149 methods/rsh.cc:424 +#: methods/connect.cc:149 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "" @@ -1919,47 +1999,47 @@ msgstr "" msgid "Unknown date format" msgstr "" -#: methods/http.cc:799 +#: methods/http.cc:800 msgid "Select failed" msgstr "" -#: methods/http.cc:804 +#: methods/http.cc:805 msgid "Connection timed out" msgstr "" -#: methods/http.cc:827 +#: methods/http.cc:828 msgid "Error writing to output file" msgstr "" -#: methods/http.cc:858 +#: methods/http.cc:859 msgid "Error writing to file" msgstr "" -#: methods/http.cc:886 +#: methods/http.cc:887 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:900 +#: methods/http.cc:901 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:902 +#: methods/http.cc:903 msgid "Error reading from server" msgstr "" -#: methods/http.cc:991 apt-pkg/contrib/mmap.cc:281 +#: methods/http.cc:1008 apt-pkg/contrib/mmap.cc:291 msgid "Failed to truncate file" msgstr "" -#: methods/http.cc:1160 +#: methods/http.cc:1183 msgid "Bad header data" msgstr "" -#: methods/http.cc:1177 methods/http.cc:1232 +#: methods/http.cc:1200 methods/http.cc:1255 msgid "Connection failed" msgstr "" -#: methods/http.cc:1324 +#: methods/http.cc:1347 msgid "Internal error" msgstr "" @@ -1972,7 +2052,7 @@ msgstr "" msgid "Couldn't duplicate file descriptor %i" msgstr "" -#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:250 +#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:258 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "" @@ -1985,21 +2065,21 @@ msgstr "" msgid "Unable to synchronize mmap" msgstr "" -#: apt-pkg/contrib/mmap.cc:300 +#: apt-pkg/contrib/mmap.cc:310 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" -#: apt-pkg/contrib/mmap.cc:399 +#: apt-pkg/contrib/mmap.cc:409 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " "reached." msgstr "" -#: apt-pkg/contrib/mmap.cc:402 +#: apt-pkg/contrib/mmap.cc:412 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2028,7 +2108,7 @@ msgstr "" msgid "%lis" msgstr "" -#: apt-pkg/contrib/strutl.cc:1119 +#: apt-pkg/contrib/strutl.cc:1138 #, c-format msgid "Selection %s not found" msgstr "" @@ -2151,106 +2231,122 @@ msgstr "" #: apt-pkg/contrib/cdromutl.cc:175 apt-pkg/contrib/cdromutl.cc:209 #: apt-pkg/acquire.cc:456 apt-pkg/acquire.cc:481 apt-pkg/clean.cc:39 -#: methods/mirror.cc:93 +#: methods/mirror.cc:97 #, c-format msgid "Unable to change to %s" msgstr "" -#: apt-pkg/contrib/cdromutl.cc:217 +#: apt-pkg/contrib/cdromutl.cc:220 msgid "Failed to stat the cdrom" msgstr "" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:168 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:159 +#: apt-pkg/contrib/fileutl.cc:173 #, c-format msgid "Could not open lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:177 +#: apt-pkg/contrib/fileutl.cc:191 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:181 +#: apt-pkg/contrib/fileutl.cc:195 #, c-format msgid "Could not get lock %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:321 +#: apt-pkg/contrib/fileutl.cc:335 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:661 +#: apt-pkg/contrib/fileutl.cc:362 +#, c-format +msgid "Ignoring '%s' in directory '%s' as it is not a regular file" +msgstr "" + +#: apt-pkg/contrib/fileutl.cc:380 +#, c-format +msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" +msgstr "" + +#: apt-pkg/contrib/fileutl.cc:389 +#, c-format +msgid "" +"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" +msgstr "" + +#: apt-pkg/contrib/fileutl.cc:679 #, c-format msgid "Waited for %s but it wasn't there" msgstr "" -#: apt-pkg/contrib/fileutl.cc:673 +#: apt-pkg/contrib/fileutl.cc:691 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:693 #, c-format msgid "Sub-process %s received signal %u." msgstr "" -#: apt-pkg/contrib/fileutl.cc:679 +#: apt-pkg/contrib/fileutl.cc:697 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "" -#: apt-pkg/contrib/fileutl.cc:681 +#: apt-pkg/contrib/fileutl.cc:699 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "" -#: apt-pkg/contrib/fileutl.cc:746 +#: apt-pkg/contrib/fileutl.cc:764 #, c-format msgid "Could not open file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:763 +#: apt-pkg/contrib/fileutl.cc:781 #, c-format msgid "Could not open file descriptor %d" msgstr "" -#: apt-pkg/contrib/fileutl.cc:823 +#: apt-pkg/contrib/fileutl.cc:841 #, c-format msgid "read, still have %lu to read but none left" msgstr "" -#: apt-pkg/contrib/fileutl.cc:856 +#: apt-pkg/contrib/fileutl.cc:874 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "" -#: apt-pkg/contrib/fileutl.cc:985 +#: apt-pkg/contrib/fileutl.cc:1010 #, c-format msgid "Problem closing the gzip file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:988 +#: apt-pkg/contrib/fileutl.cc:1013 #, c-format msgid "Problem closing the file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:993 +#: apt-pkg/contrib/fileutl.cc:1018 #, c-format msgid "Problem renaming the file %s to %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1004 +#: apt-pkg/contrib/fileutl.cc:1029 #, c-format msgid "Problem unlinking the file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1017 +#: apt-pkg/contrib/fileutl.cc:1042 msgid "Problem syncing the file" msgstr "" @@ -2275,59 +2371,59 @@ msgstr "" msgid "The package cache was built for a different architecture" msgstr "" -#: apt-pkg/pkgcache.cc:293 +#: apt-pkg/pkgcache.cc:299 msgid "Depends" msgstr "" -#: apt-pkg/pkgcache.cc:293 +#: apt-pkg/pkgcache.cc:299 msgid "PreDepends" msgstr "" -#: apt-pkg/pkgcache.cc:293 +#: apt-pkg/pkgcache.cc:299 msgid "Suggests" msgstr "" -#: apt-pkg/pkgcache.cc:294 +#: apt-pkg/pkgcache.cc:300 msgid "Recommends" msgstr "" -#: apt-pkg/pkgcache.cc:294 +#: apt-pkg/pkgcache.cc:300 msgid "Conflicts" msgstr "" -#: apt-pkg/pkgcache.cc:294 +#: apt-pkg/pkgcache.cc:300 msgid "Replaces" msgstr "" -#: apt-pkg/pkgcache.cc:295 +#: apt-pkg/pkgcache.cc:301 msgid "Obsoletes" msgstr "" -#: apt-pkg/pkgcache.cc:295 +#: apt-pkg/pkgcache.cc:301 msgid "Breaks" msgstr "" -#: apt-pkg/pkgcache.cc:295 +#: apt-pkg/pkgcache.cc:301 msgid "Enhances" msgstr "" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:312 msgid "important" msgstr "" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:312 msgid "required" msgstr "" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:312 msgid "standard" msgstr "" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:313 msgid "optional" msgstr "" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:313 msgid "extra" msgstr "" @@ -2357,11 +2453,6 @@ msgstr "" msgid "Failed to write temporary StateFile %s" msgstr "" -#: apt-pkg/depcache.cc:922 -#, c-format -msgid "Internal error, group '%s' has no installable pseudo package" -msgstr "" - #: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" @@ -2427,7 +2518,7 @@ msgstr "" msgid "Opening %s" msgstr "" -#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:438 +#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:444 #, c-format msgid "Line %u too long in source list %s." msgstr "" @@ -2442,14 +2533,14 @@ msgstr "" msgid "Type '%s' is not known on line %u in source list %s" msgstr "" -#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:616 +#: apt-pkg/packagemanager.cc:335 apt-pkg/packagemanager.cc:623 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:452 +#: apt-pkg/packagemanager.cc:456 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2457,7 +2548,7 @@ msgid "" "you really want to do it, activate the APT::Force-LoopBreak option." msgstr "" -#: apt-pkg/packagemanager.cc:495 +#: apt-pkg/packagemanager.cc:501 #, c-format msgid "" "Could not perform immediate configuration on already unpacked '%s'. Please " @@ -2469,25 +2560,25 @@ msgstr "" msgid "Index file type '%s' is not supported" msgstr "" -#: apt-pkg/algorithms.cc:292 +#: apt-pkg/algorithms.cc:247 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" -#: apt-pkg/algorithms.cc:1218 +#: apt-pkg/algorithms.cc:1158 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" -#: apt-pkg/algorithms.cc:1220 +#: apt-pkg/algorithms.cc:1160 msgid "Unable to correct problems, you have held broken packages." msgstr "" -#: apt-pkg/algorithms.cc:1496 apt-pkg/algorithms.cc:1498 +#: apt-pkg/algorithms.cc:1436 apt-pkg/algorithms.cc:1438 msgid "" -"Some index files failed to download, they have been ignored, or old ones " +"Some index files failed to download. They have been ignored, or old ones " "used instead." msgstr "" @@ -2528,17 +2619,17 @@ msgstr "" msgid "Method %s did not start correctly" msgstr "" -#: apt-pkg/acquire-worker.cc:413 +#: apt-pkg/acquire-worker.cc:423 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" -#: apt-pkg/init.cc:143 +#: apt-pkg/init.cc:146 #, c-format msgid "Packaging system '%s' is not supported" msgstr "" -#: apt-pkg/init.cc:159 +#: apt-pkg/init.cc:162 msgid "Unable to determine a suitable packaging system type" msgstr "" @@ -2563,17 +2654,17 @@ msgstr "" msgid "The list of sources could not be read." msgstr "" -#: apt-pkg/policy.cc:344 +#: apt-pkg/policy.cc:351 #, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "" -#: apt-pkg/policy.cc:366 +#: apt-pkg/policy.cc:373 #, c-format msgid "Did not understand pin type %s" msgstr "" -#: apt-pkg/policy.cc:374 +#: apt-pkg/policy.cc:381 msgid "No priority (or zero) specified for pin" msgstr "" @@ -2581,155 +2672,168 @@ msgstr "" msgid "Cache has an incompatible versioning system" msgstr "" -#: apt-pkg/pkgcachegen.cc:198 +#: apt-pkg/pkgcachegen.cc:187 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "" -#: apt-pkg/pkgcachegen.cc:215 +#: apt-pkg/pkgcachegen.cc:204 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:253 +#: apt-pkg/pkgcachegen.cc:242 #, c-format msgid "Error occurred while processing %s (NewFileDesc1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:285 +#: apt-pkg/pkgcachegen.cc:274 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "" -#: apt-pkg/pkgcachegen.cc:289 +#: apt-pkg/pkgcachegen.cc:278 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:306 apt-pkg/pkgcachegen.cc:316 -#: apt-pkg/pkgcachegen.cc:324 +#: apt-pkg/pkgcachegen.cc:295 apt-pkg/pkgcachegen.cc:305 +#: apt-pkg/pkgcachegen.cc:313 #, c-format msgid "Error occurred while processing %s (NewVersion%d)" msgstr "" -#: apt-pkg/pkgcachegen.cc:320 +#: apt-pkg/pkgcachegen.cc:309 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "" -#: apt-pkg/pkgcachegen.cc:353 +#: apt-pkg/pkgcachegen.cc:342 #, c-format msgid "Error occurred while processing %s (NewFileDesc2)" msgstr "" -#: apt-pkg/pkgcachegen.cc:360 +#: apt-pkg/pkgcachegen.cc:348 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:363 +#: apt-pkg/pkgcachegen.cc:351 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:366 +#: apt-pkg/pkgcachegen.cc:354 msgid "Wow, you exceeded the number of descriptions this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:369 +#: apt-pkg/pkgcachegen.cc:357 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:398 +#: apt-pkg/pkgcachegen.cc:386 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "" -#: apt-pkg/pkgcachegen.cc:412 +#: apt-pkg/pkgcachegen.cc:400 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "" -#: apt-pkg/pkgcachegen.cc:418 +#: apt-pkg/pkgcachegen.cc:406 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" -#: apt-pkg/pkgcachegen.cc:982 +#: apt-pkg/pkgcachegen.cc:960 #, c-format msgid "Couldn't stat source package list %s" msgstr "" -#: apt-pkg/pkgcachegen.cc:1087 +#: apt-pkg/pkgcachegen.cc:1065 msgid "Collecting File Provides" msgstr "" -#: apt-pkg/pkgcachegen.cc:1265 apt-pkg/pkgcachegen.cc:1272 +#: apt-pkg/pkgcachegen.cc:1243 apt-pkg/pkgcachegen.cc:1250 msgid "IO Error saving source cache" msgstr "" -#: apt-pkg/acquire-item.cc:136 +#: apt-pkg/acquire-item.cc:135 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "" -#: apt-pkg/acquire-item.cc:484 +#: apt-pkg/acquire-item.cc:636 msgid "MD5Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:746 apt-pkg/acquire-item.cc:1574 -#: apt-pkg/acquire-item.cc:1717 +#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1846 +#: apt-pkg/acquire-item.cc:1989 msgid "Hash Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:1244 +#: apt-pkg/acquire-item.cc:1388 +#, c-format +msgid "" +"Unable to find expected entry '%s' in Release file (Wrong sources.list entry " +"or malformed file)" +msgstr "" + +#: apt-pkg/acquire-item.cc:1403 +#, c-format +msgid "Unable to find hash sum for '%s' in Release file" +msgstr "" + +#: apt-pkg/acquire-item.cc:1439 msgid "There is no public key available for the following key IDs:\n" msgstr "" #. TRANSLATOR: The first %s is the URL of the bad Release file, the second is #. the time since then the file is invalid - formated in the same way as in #. the download progress display (e.g. 7d 3h 42min 1s) -#: apt-pkg/acquire-item.cc:1281 +#: apt-pkg/acquire-item.cc:1476 #, c-format msgid "Release file expired, ignoring %s (invalid since %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1302 +#: apt-pkg/acquire-item.cc:1497 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1328 +#: apt-pkg/acquire-item.cc:1530 #, c-format msgid "" "A error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" -#: apt-pkg/acquire-item.cc:1337 +#. Invalid signature file, reject (LP: #346386) (Closes: #627642) +#: apt-pkg/acquire-item.cc:1540 apt-pkg/acquire-item.cc:1545 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1365 +#: apt-pkg/acquire-item.cc:1637 #, 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:1424 +#: apt-pkg/acquire-item.cc:1696 #, 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." msgstr "" -#: apt-pkg/acquire-item.cc:1479 +#: apt-pkg/acquire-item.cc:1751 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:1566 +#: apt-pkg/acquire-item.cc:1838 msgid "Size mismatch" msgstr "" @@ -2738,130 +2842,129 @@ msgstr "" msgid "Unable to parse Release file %s" msgstr "" -#: apt-pkg/indexrecords.cc:60 +#: apt-pkg/indexrecords.cc:63 #, c-format msgid "No sections in Release file %s" msgstr "" -#: apt-pkg/indexrecords.cc:94 +#: apt-pkg/indexrecords.cc:97 #, c-format msgid "No Hash entry in Release file %s" msgstr "" -#: apt-pkg/indexrecords.cc:107 +#: apt-pkg/indexrecords.cc:110 #, c-format msgid "Invalid 'Valid-Until' entry in Release file %s" msgstr "" -#: apt-pkg/indexrecords.cc:122 +#: apt-pkg/indexrecords.cc:125 #, c-format msgid "Invalid 'Date' entry in Release file %s" msgstr "" -#: apt-pkg/vendorlist.cc:66 +#: apt-pkg/vendorlist.cc:71 #, c-format msgid "Vendor block %s contains no fingerprint" msgstr "" -#: apt-pkg/cdrom.cc:518 +#: apt-pkg/cdrom.cc:525 #, c-format msgid "" "Using CD-ROM mount point %s\n" "Mounting CD-ROM\n" msgstr "" -#: apt-pkg/cdrom.cc:527 apt-pkg/cdrom.cc:615 +#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:631 msgid "Identifying.. " msgstr "" -#: apt-pkg/cdrom.cc:552 +#: apt-pkg/cdrom.cc:562 #, c-format msgid "Stored label: %s\n" msgstr "" -#: apt-pkg/cdrom.cc:559 apt-pkg/cdrom.cc:827 +#: apt-pkg/cdrom.cc:571 apt-pkg/cdrom.cc:847 msgid "Unmounting CD-ROM...\n" msgstr "" -#: apt-pkg/cdrom.cc:578 +#: apt-pkg/cdrom.cc:591 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "" -#: apt-pkg/cdrom.cc:596 +#: apt-pkg/cdrom.cc:609 msgid "Unmounting CD-ROM\n" msgstr "" -#: apt-pkg/cdrom.cc:600 +#: apt-pkg/cdrom.cc:614 msgid "Waiting for disc...\n" msgstr "" -#. Mount the new CDROM -#: apt-pkg/cdrom.cc:608 +#: apt-pkg/cdrom.cc:623 msgid "Mounting CD-ROM...\n" msgstr "" -#: apt-pkg/cdrom.cc:626 +#: apt-pkg/cdrom.cc:642 msgid "Scanning disc for index files..\n" msgstr "" -#: apt-pkg/cdrom.cc:666 +#: apt-pkg/cdrom.cc:684 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " "%zu signatures\n" msgstr "" -#: apt-pkg/cdrom.cc:677 +#: apt-pkg/cdrom.cc:695 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "" -#: apt-pkg/cdrom.cc:703 +#: apt-pkg/cdrom.cc:722 #, c-format msgid "Found label '%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:732 +#: apt-pkg/cdrom.cc:751 msgid "That is not a valid name, try again.\n" msgstr "" -#: apt-pkg/cdrom.cc:748 +#: apt-pkg/cdrom.cc:768 #, c-format msgid "" "This disc is called: \n" "'%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:752 +#: apt-pkg/cdrom.cc:770 msgid "Copying package lists..." msgstr "" -#: apt-pkg/cdrom.cc:778 +#: apt-pkg/cdrom.cc:797 msgid "Writing new source list\n" msgstr "" -#: apt-pkg/cdrom.cc:787 +#: apt-pkg/cdrom.cc:805 msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:908 +#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:909 #, c-format msgid "Wrote %i records.\n" msgstr "" -#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:910 +#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:911 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "" -#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:913 +#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:914 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "" -#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:916 +#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:917 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -2933,12 +3036,12 @@ msgstr "" msgid "Installing %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:823 +#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:829 #, c-format msgid "Configuring %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:830 +#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:836 #, c-format msgid "Removing %s" msgstr "" @@ -2959,92 +3062,92 @@ msgid "Running post-installation trigger %s" msgstr "" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:646 +#: apt-pkg/deb/dpkgpm.cc:652 #, c-format msgid "Directory '%s' missing" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:661 apt-pkg/deb/dpkgpm.cc:675 +#: apt-pkg/deb/dpkgpm.cc:667 apt-pkg/deb/dpkgpm.cc:681 #, c-format msgid "Could not open file '%s'" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:816 +#: apt-pkg/deb/dpkgpm.cc:822 #, c-format msgid "Preparing %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:817 +#: apt-pkg/deb/dpkgpm.cc:823 #, c-format msgid "Unpacking %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:822 +#: apt-pkg/deb/dpkgpm.cc:828 #, c-format msgid "Preparing to configure %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:824 +#: apt-pkg/deb/dpkgpm.cc:830 #, c-format msgid "Installed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:829 +#: apt-pkg/deb/dpkgpm.cc:835 #, c-format msgid "Preparing for removal of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:831 +#: apt-pkg/deb/dpkgpm.cc:837 #, c-format msgid "Removed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:836 +#: apt-pkg/deb/dpkgpm.cc:842 #, c-format msgid "Preparing to completely remove %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:837 +#: apt-pkg/deb/dpkgpm.cc:843 #, c-format msgid "Completely removed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1043 +#: apt-pkg/deb/dpkgpm.cc:1063 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1074 +#: apt-pkg/deb/dpkgpm.cc:1094 msgid "Running dpkg" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1277 +#: apt-pkg/deb/dpkgpm.cc:1302 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1282 +#: apt-pkg/deb/dpkgpm.cc:1307 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1284 +#: apt-pkg/deb/dpkgpm.cc:1309 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1290 +#: apt-pkg/deb/dpkgpm.cc:1315 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1296 +#: apt-pkg/deb/dpkgpm.cc:1321 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1303 +#: apt-pkg/deb/dpkgpm.cc:1328 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -3075,30 +3178,37 @@ msgstr "" #. FIXME: fallback to a default mirror here instead #. and provide a config option to define that default -#: methods/mirror.cc:200 +#: methods/mirror.cc:256 #, c-format msgid "No mirror file '%s' found " msgstr "" -#: methods/mirror.cc:343 +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:263 +#, c-format +msgid "Can not read mirror file '%s'" +msgstr "" + +#: methods/mirror.cc:407 #, c-format msgid "[Mirror: %s]" msgstr "" -#: methods/rred.cc:465 +#: methods/rred.cc:503 #, c-format msgid "" "Could not patch %s with mmap and with file operation usage - the patch seems " "to be corrupt." msgstr "" -#: methods/rred.cc:470 +#: methods/rred.cc:508 #, c-format msgid "" "Could not patch %s with mmap (but no mmap specific fail) - the patch seems " "to be corrupt." msgstr "" -#: methods/rsh.cc:329 +#: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "" diff --git a/test/methods/debdelta/test-signature b/test/methods/debdelta/test-signature new file mode 100755 index 000000000..952260322 --- /dev/null +++ b/test/methods/debdelta/test-signature @@ -0,0 +1,47 @@ +#!/bin/sh +set -e + +deb=$1 + +verify_deb() { + [ "$deb" = "" ] && return + md5sum_1=$(LD_LIBRARY_PATH=../../../bin ../../../bin/apt-cache show `dpkg -I "$deb" | sed -n "s/Package: //p"` | sed -n "s/MD5sum: //p") + md5sum_2=$(md5sum "$deb" | gawk '{print $1}') + for s1 in $md5sum_1; do + for s2 in $md5sum_2; do + #echo "$s1 $s2" + if [ $s1 = $s2 ]; then + echo "[OK] $deb" + exit 0 + fi + done + done + echo "[NOT OK] $deb" + exit 1; +} + +usage() { + echo "Usage: test-signature <deb-file> <debdelta-file>" +} + +make_deb() { + if [ "$2" = "" ]; then + usage + exit 1 + fi + result_deb=$(LD_LIBRARY_PATH=../../../bin ../../../bin/methods/debdelta $1 $2 | sed -n "s/Filename: //p") + deb=$result_deb + verify_deb +} + +testmethod() { + path="/var/cache/apt/archives/" + for d in $(dir $path); do + deb=$path$d + [ -d $deb ] && continue + runtest + done +} + +#testmethod +make_deb $1 $2
\ No newline at end of file diff --git a/test/methods/debdelta/test.txt b/test/methods/debdelta/test.txt new file mode 100644 index 000000000..8b5f8f189 --- /dev/null +++ b/test/methods/debdelta/test.txt @@ -0,0 +1,3 @@ +./test-signature /home/ishan/devel/apt/testrepo/testitems/cpp-4.6_4.6.0-2_4.6.0-7_amd64.debdelta /home/ishan/devel/apt/testrepo/testitems/cpp-4.6_4.6.0-2_amd64.deb + +sudo LD_LIBRARY_PATH=.. ./debdelta /home/ishan/devel/apt/testrepo/testitems/cpp-4.6_4.6.0-2_4.6.0-7_amd64.debdelta /home/ishan/devel/apt/testrepo/testitems/cpp-4.6_4.6.0-2_amd64.deb |