From: Michael Vogt Date: Thu, 18 Nov 2010 13:13:39 +0000 (+0100) Subject: merged from apt-get-changelog X-Git-Tag: 0.9.13.exp1ubuntu1~228^2 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/d950349bcb3d5972f81b75f304878c33e9187fc8?hp=88573174ba96c9b3948ee7cba8c6073b13a27c32 merged from apt-get-changelog --- diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index 961f5c2fa..9abb7a947 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -1062,6 +1062,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) else if (TryFixByInstall == true && Start.TargetPkg()->CurrentVer == 0 && Cache[Start.TargetPkg()].Delete() == false && + (Flags[Start.TargetPkg()->ID] & ToRemove) != ToRemove && Cache.GetCandidateVer(Start.TargetPkg()).end() == false) { /* Before removing or keeping the package with the broken dependency diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc index 44f1f318a..52f54073c 100644 --- a/apt-pkg/aptconfiguration.cc +++ b/apt-pkg/aptconfiguration.cc @@ -166,17 +166,6 @@ std::vector const Configuration::getLanguages(bool const &All, string const envShort = envLong.substr(0,lenShort); bool envLongIncluded = true; - // first cornercase: LANG=C, so we use only "en" Translation - if (envLong == "C") { - codes.push_back("en"); - allCodes = codes; - allCodes.insert(allCodes.end(), builtin.begin(), builtin.end()); - if (All == true) - return allCodes; - else - return codes; - } - // to save the servers from unneeded queries, we only try also long codes // for languages it is realistic to have a long code translation file… // TODO: Improve translation acquire system to drop them dynamic @@ -217,37 +206,41 @@ std::vector const Configuration::getLanguages(bool const &All, // It is very likely we will need to environment codes later, // so let us generate them now from LC_MESSAGES and LANGUAGE std::vector environment; - // take care of LC_MESSAGES - if (envLongIncluded == false) - environment.push_back(envLong); - environment.push_back(envShort); - // take care of LANGUAGE - const char *language_env = getenv("LANGUAGE") == 0 ? "" : getenv("LANGUAGE"); - string envLang = Locale == 0 ? language_env : *(Locale+1); - if (envLang.empty() == false) { - std::vector env = VectorizeString(envLang,':'); - short addedLangs = 0; // add a maximum of 3 fallbacks from the environment - for (std::vector::const_iterator e = env.begin(); - e != env.end() && addedLangs < 3; ++e) { - if (unlikely(e->empty() == true) || *e == "en") - continue; - if (*e == envLong || *e == envShort) - continue; - if (std::find(environment.begin(), environment.end(), *e) != environment.end()) - continue; - if (e->find('_') != string::npos) { - // Drop LongCodes here - ShortCodes are also included - string const shorty = e->substr(0, e->find('_')); - char const **n = needLong; - for (; *n != NULL; ++n) - if (shorty == *n) - break; - if (*n == NULL) + if (envShort != "C") { + // take care of LC_MESSAGES + if (envLongIncluded == false) + environment.push_back(envLong); + environment.push_back(envShort); + // take care of LANGUAGE + const char *language_env = getenv("LANGUAGE") == 0 ? "" : getenv("LANGUAGE"); + string envLang = Locale == 0 ? language_env : *(Locale+1); + if (envLang.empty() == false) { + std::vector env = VectorizeString(envLang,':'); + short addedLangs = 0; // add a maximum of 3 fallbacks from the environment + for (std::vector::const_iterator e = env.begin(); + e != env.end() && addedLangs < 3; ++e) { + if (unlikely(e->empty() == true) || *e == "en") + continue; + if (*e == envLong || *e == envShort) + continue; + if (std::find(environment.begin(), environment.end(), *e) != environment.end()) continue; + if (e->find('_') != string::npos) { + // Drop LongCodes here - ShortCodes are also included + string const shorty = e->substr(0, e->find('_')); + char const **n = needLong; + for (; *n != NULL; ++n) + if (shorty == *n) + break; + if (*n == NULL) + continue; + } + ++addedLangs; + environment.push_back(*e); } - ++addedLangs; - environment.push_back(*e); } + } else { + environment.push_back("en"); } // Support settings like Acquire::Translation=none on the command line to @@ -269,6 +262,16 @@ std::vector const Configuration::getLanguages(bool const &All, return codes; } + // cornercase: LANG=C, so we use only "en" Translation + if (envShort == "C") { + allCodes = codes = environment; + allCodes.insert(allCodes.end(), builtin.begin(), builtin.end()); + if (All == true) + return allCodes; + else + return codes; + } + std::vector const lang = _config->FindVector("Acquire::Languages"); // the default setting -> "environment, en" if (lang.empty() == true) { diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index cbf1d64a9..f4ab066d7 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -910,18 +910,24 @@ unsigned long FileFd::Tell() return Res; } /*}}}*/ -// FileFd::Size - Return the size of the file /*{{{*/ +// FileFd::FileSize - Return the size of the file /*{{{*/ // --------------------------------------------------------------------- /* */ -unsigned long FileFd::Size() +unsigned long FileFd::FileSize() { struct stat Buf; - unsigned long size; - off_t orig_pos; if (fstat(iFd,&Buf) != 0) return _error->Errno("fstat","Unable to determine the file size"); - size = Buf.st_size; + return Buf.st_size; +} + /*}}}*/ +// FileFd::Size - Return the size of the content in the file /*{{{*/ +// --------------------------------------------------------------------- +/* */ +unsigned long FileFd::Size() +{ + unsigned long size = FileSize(); // only check gzsize if we are actually a gzip file, just checking for // "gz" is not sufficient as uncompressed files will be opened with @@ -931,7 +937,7 @@ unsigned long FileFd::Size() /* unfortunately zlib.h doesn't provide a gzsize(), so we have to do * this ourselves; the original (uncompressed) file size is the last 32 * bits of the file */ - orig_pos = lseek(iFd, 0, SEEK_CUR); + off_t orig_pos = lseek(iFd, 0, SEEK_CUR); if (lseek(iFd, -4, SEEK_END) < 0) return _error->Errno("lseek","Unable to seek to end of gzipped file"); if (read(iFd, &size, 4) != 4) diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h index 419506273..1380f06b4 100644 --- a/apt-pkg/contrib/fileutl.h +++ b/apt-pkg/contrib/fileutl.h @@ -63,6 +63,7 @@ class FileFd bool Truncate(unsigned long To); unsigned long Tell(); unsigned long Size(); + unsigned long FileSize(); bool Open(string FileName,OpenMode Mode,unsigned long Perms = 0666); bool OpenDescriptor(int Fd, OpenMode Mode, bool AutoClose=false); bool Close(); diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc index a89a2574f..af1209ccb 100644 --- a/apt-pkg/deb/debindexfile.cc +++ b/apt-pkg/deb/debindexfile.cc @@ -149,11 +149,20 @@ bool debSourcesIndex::Exists() const /* */ unsigned long debSourcesIndex::Size() const { + unsigned long size = 0; + + /* we need to ignore errors here; if the lists are absent, just return 0 */ + _error->PushToStack(); + FileFd f = FileFd (IndexFile("Sources"), FileFd::ReadOnlyGzip); + if (!f.Failed()) + size = f.Size(); - if (f.Failed()) - return 0; - return f.Size(); + if (_error->PendingError() == true) + size = 0; + _error->RevertToStack(); + + return size; } /*}}}*/ @@ -269,11 +278,20 @@ bool debPackagesIndex::Exists() const /* This is really only used for progress reporting. */ unsigned long debPackagesIndex::Size() const { + unsigned long size = 0; + + /* we need to ignore errors here; if the lists are absent, just return 0 */ + _error->PushToStack(); + FileFd f = FileFd (IndexFile("Packages"), FileFd::ReadOnlyGzip); + if (!f.Failed()) + size = f.Size(); - if (f.Failed()) - return 0; - return f.Size(); + if (_error->PendingError() == true) + size = 0; + _error->RevertToStack(); + + return size; } /*}}}*/ // PackagesIndex::Merge - Load the index file into a cache /*{{{*/ @@ -460,12 +478,20 @@ bool debTranslationsIndex::Exists() const /* This is really only used for progress reporting. */ unsigned long debTranslationsIndex::Size() const { + unsigned long size = 0; + + /* we need to ignore errors here; if the lists are absent, just return 0 */ + _error->PushToStack(); + FileFd f = FileFd (IndexFile(Language), FileFd::ReadOnlyGzip); + if (!f.Failed()) + size = f.Size(); - if (f.Failed()) - return 0; + if (_error->PendingError() == true) + size = 0; + _error->RevertToStack(); - return f.Size(); + return size; } /*}}}*/ // TranslationsIndex::Merge - Load the index file into a cache /*{{{*/ diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index da8b0271b..1b3bfd6ae 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -481,6 +481,7 @@ const char *debListParser::ConvertRelation(const char *I,unsigned int &Op) */ static string CompleteArch(std::string& arch) { if (arch == "armel") return "linux-arm"; + if (arch == "armhf") return "linux-arm"; if (arch == "lpia") return "linux-i386"; if (arch == "powerpcspe") return "linux-powerpc"; if (arch == "uclibc-linux-armel") return "linux-arm"; diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 0b5d6d8e6..23abc76c1 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -1444,8 +1444,11 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, VerIterator Ver(*this,*I); PkgIterator Pkg = Ver.ParentPkg(); - - + /* The List includes all packages providing this dependency, + even providers which are not installed, so skip them. */ + if (PkgState[Pkg->ID].InstallVer == 0) + continue; + if (PkgState[Pkg->ID].CandidateVer != *I && Start->Type == Dep::DpkgBreaks) MarkInstall(Pkg,true,Depth + 1, false, ForceImportantDeps); diff --git a/apt-pkg/orderlist.cc b/apt-pkg/orderlist.cc index 602b63d3b..a53854a26 100644 --- a/apt-pkg/orderlist.cc +++ b/apt-pkg/orderlist.cc @@ -967,13 +967,33 @@ bool pkgOrderList::DepRemove(DepIterator D) // start again in the or group and find something which will serve as replacement for (; F.end() == false && F != S; ++F) { - if (F.TargetPkg() == D.TargetPkg() || - IsFlag(F.TargetPkg(), InList) == false || - VisitNode(F.TargetPkg()) == false) - continue; - Flag(F.TargetPkg(), Immediate); - tryFixDeps = false; - break; + if (IsFlag(F.TargetPkg(), InList) == true && + IsFlag(F.TargetPkg(), AddPending) == false && + Cache[F.TargetPkg()].InstallVer != 0 && + VisitNode(F.TargetPkg()) == true) + { + Flag(F.TargetPkg(), Immediate); + tryFixDeps = false; + break; + } + else if (F.TargetPkg()->ProvidesList != 0) + { + pkgCache::PrvIterator Prv = F.TargetPkg().ProvidesList(); + for (; Prv.end() == false; ++Prv) + { + if (IsFlag(Prv.OwnerPkg(), InList) == true && + IsFlag(Prv.OwnerPkg(), AddPending) == false && + Cache[Prv.OwnerPkg()].InstallVer != 0 && + VisitNode(Prv.OwnerPkg()) == true) + { + Flag(Prv.OwnerPkg(), Immediate); + tryFixDeps = false; + break; + } + } + if (Prv.end() == false) + break; + } } if (tryFixDeps == false) break; diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index 324445fa7..616d400a2 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -891,18 +891,19 @@ pkgCache::DescIterator pkgCache::VerIterator::TranslatedDescription() const for (std::vector::const_iterator l = lang.begin(); l != lang.end(); l++) { - pkgCache::DescIterator DescDefault = DescriptionList(); - pkgCache::DescIterator Desc = DescDefault; - - for (; Desc.end() == false; Desc++) + pkgCache::DescIterator Desc = DescriptionList(); + for (; Desc.end() == false; ++Desc) if (*l == Desc.LanguageCode() || (*l == "en" && strcmp(Desc.LanguageCode(),"") == 0)) break; - if (Desc.end() == true) - Desc = DescDefault; + if (Desc.end() == true) + continue; return Desc; } - + for (pkgCache::DescIterator Desc = DescriptionList(); + Desc.end() == false; ++Desc) + if (strcmp(Desc.LanguageCode(), "") == 0) + return Desc; return DescriptionList(); }; diff --git a/buildlib/po4a_manpage.mak b/buildlib/po4a_manpage.mak index 11dc11d28..404bb57a5 100644 --- a/buildlib/po4a_manpage.mak +++ b/buildlib/po4a_manpage.mak @@ -11,7 +11,7 @@ # generate a list of accepted man page translations SOURCE = $(patsubst %.xml,%,$(wildcard *.$(LC).?.xml)) -INCLUDES = apt.ent +INCLUDES = apt.ent apt-verbatim.ent # Do not use XMLTO, build the manpages directly with XSLTPROC ifdef XSLTPROC @@ -25,6 +25,9 @@ $(LOCAL)-LIST := $(SOURCE) doc: $($(LOCAL)-LIST) veryclean: veryclean/$(LOCAL) +apt-verbatim.ent: ../apt-verbatim.ent + cp ../apt-verbatim.ent . + $($(LOCAL)-LIST) :: % : %.xml $(INCLUDES) echo Creating man page $@ $(XSLTPROC) -o $@ $(STYLESHEET) $< || exit 200 # why xsltproc doesn't respect the -o flag here??? @@ -34,7 +37,7 @@ $($(LOCAL)-LIST) :: % : %.xml $(INCLUDES) # Clean rule .PHONY: veryclean/$(LOCAL) veryclean/$(LOCAL): - -rm -rf $($(@F)-LIST) apt.ent apt.$(LC).8 \ + -rm -rf $($(@F)-LIST) apt.ent apt-verbatim.ent apt.$(LC).8 \ $(addsuffix .xml,$($(@F)-LIST)) \ offline.$(LC).sgml guide.$(LC).sgml diff --git a/cmdline/acqprogress.cc b/cmdline/acqprogress.cc index 32e8243bf..ba334ce05 100644 --- a/cmdline/acqprogress.cc +++ b/cmdline/acqprogress.cc @@ -11,6 +11,7 @@ #include "acqprogress.h" #include #include +#include #include #include @@ -19,6 +20,7 @@ #include #include #include +#include /*}}}*/ using namespace std; @@ -266,6 +268,16 @@ bool AcqTextStatus::Pulse(pkgAcquire *Owner) /* Prompt for a media swap */ bool AcqTextStatus::MediaChange(string Media,string Drive) { + // If we do not output on a terminal and one of the options to avoid user + // interaction is given, we assume that no user is present who could react + // on your media change request + if (isatty(STDOUT_FILENO) != 1 && Quiet >= 2 && + (_config->FindB("APT::Get::Assume-Yes",false) == true || + _config->FindB("APT::Get::Force-Yes",false) == true || + _config->FindB("APT::Get::Trivial-Only",false) == true)) + + return false; + if (Quiet <= 0) cout << '\r' << BlankLine << '\r'; ioprintf(cout,_("Media change: please insert the disc labeled\n" diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 0879cf7c6..eb3ac425b 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -2165,6 +2165,60 @@ bool DoAutoClean(CommandLine &CmdL) Cleaner.Go(_config->FindDir("Dir::Cache::archives") + "partial/",*Cache); } /*}}}*/ +// DoDownload - download a binary /*{{{*/ +// --------------------------------------------------------------------- +bool DoDownload(CommandLine &CmdL) +{ + CacheFile Cache; + if (Cache.ReadOnlyOpen() == false) + return false; + + APT::CacheSetHelper helper(c0out); + APT::VersionSet verset = APT::VersionSet::FromCommandLine(Cache, + CmdL.FileList + 1, APT::VersionSet::CANDIDATE, helper); + pkgAcquire Fetcher; + AcqTextStatus Stat(ScreenWidth, _config->FindI("quiet",0)); + Fetcher.Setup(&Stat); + + if (verset.empty() == true) + return false; + + bool result = true; + pkgRecords Recs(Cache); + pkgSourceList *SrcList = Cache.GetSourceList(); + for (APT::VersionSet::const_iterator Ver = verset.begin(); + Ver != verset.end(); + ++Ver) + { + string descr; + // get the right version + pkgCache::PkgIterator Pkg = Ver.ParentPkg(); + pkgRecords::Parser &rec=Recs.Lookup(Ver.FileList()); + pkgCache::VerFileIterator Vf = Ver.FileList(); + if (Vf.end() == true) + return _error->Error("Can not find VerFile"); + pkgCache::PkgFileIterator F = Vf.File(); + pkgIndexFile *index; + if(SrcList->FindIndex(F, index) == false) + return _error->Error("FindIndex failed"); + string uri = index->ArchiveURI(rec.FileName()); + strprintf(descr, _("Downloading %s %s"), Pkg.Name(), Ver.VerStr()); + // get the most appropriate hash + HashString hash; + if (rec.SHA256Hash() != "") + hash = HashString("sha256", rec.SHA256Hash()); + else if (rec.SHA1Hash() != "") + hash = HashString("sha1", rec.SHA1Hash()); + else if (rec.MD5Hash() != "") + hash = HashString("md5", rec.MD5Hash()); + // get the file + new pkgAcqFile(&Fetcher, uri, hash.toStr(), (*Ver)->Size, descr, Pkg.Name(), "."); + result &= (Fetcher.Run() == pkgAcquire::Continue); + } + + return result; +} + /*}}}*/ // DoCheck - Perform the check operation /*{{{*/ // --------------------------------------------------------------------- /* Opening automatically checks the system, this command is mostly used @@ -2988,6 +3042,8 @@ bool ShowHelp(CommandLine &CmdL) " 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" @@ -3086,6 +3142,7 @@ int main(int argc,const char *argv[]) /*{{{*/ {"autoclean",&DoAutoClean}, {"check",&DoCheck}, {"source",&DoSource}, + {"download",&DoDownload}, {"changelog",&DoChangelog}, {"moo",&DoMoo}, {"help",&ShowHelp}, diff --git a/debian/changelog b/debian/changelog index 06065348e..df4fc1a29 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,23 +1,70 @@ -apt (0.8.7) UNRELEASED; urgency=low +apt (0.8.9) unstable; urgency=low + + [ Christian Perrier ] + * Fix "typos" in French manpages translations. Thanks to + Cyril Brulebois for bashing me. + * Drop useless untranslatable sections from apt.8 + + [ Programs translations ] + * Slovenian update by Andrej Žnidaršič and Rosetta Slovenian team + ! German update by Holger Wansing. Closes: #603619 + + [ David Kalnischkies ] + * apt-pkg/aptconfiguration.cc: + - evaluate Acquire::Languages= before LANG= (Closes: #602573) + * apt-pkg/orderlist.cc: + - try fixing before removing even if the fix is hidden in + a provides, hidden in the #590438 testcase + * apt-pkg/algorithms.cc: + - if the package was explicitly marked as ToRemove don't + consider it as a candidate for FixByInstall + * apt-pkg/depcache.cc: + - don't install previously not installed providers in a try + to statisfy a "Breaks: provides" dependency by upgrade + * cmdline/acqprogress.cc: + - don't ask the user for media change if quiet >= 2, stdout is not + a tty and assume-yes, force-yes or trivial-only option is set to + avoid cpu eating endless loops in unattended runs like apt.cron + (Closes: #602354, LP: #665580) + + -- Michael Vogt Thu, 18 Nov 2010 09:25:04 +0100 + +apt (0.8.8) unstable; urgency=low + + [ David Kalnischkies ] + * apt-pkg/contrib/fileutl.cc: + - Add a FileFd::FileSize() method to get the size of the underlying + file and not the size of the content in the file as FileFd::Size() + does - the sizes can differ since the direct gzip integration + * methods/{gzip,bzip2}.cc: + - use FileSize() to determine if the file is invalid (Closes: #600852) + * apt-pkg/pkgcache.cc: + - fallback always to a suitable description (Closes: #601016) + + [ Michael Vogt ] + * apt-pkg/deb/dpkgpm.cc: + - ensure that history.log gets closed to avoid leaking a FD + (closes: #601649) + + -- Michael Vogt Thu, 28 Oct 2010 21:22:21 +0200 + +apt (0.8.7) unstable; urgency=low [ Manpages translations ] * Typo fixed in French (extra "Z"). Thanks to Florentin Duneau. * Another typo fixed in French ("Anfin"). Thanks to bubulle * Wrong translation for "showauto" fixed. Thanks to Raphaël Hertzog Closes: #599265 - + [ Michael Vogt ] * debian/apt.cron.daily: - - source /etc/default/locale (if available) so that the + - source /etc/default/locale (if available) so that the apt-get update cron job fetches the right translated package descriptions * fix test failure on amd64 * apt-pkg/deb/debsystem.cc: - fix issues with dir::state::status and dir::state::extended_states when alternative rootdirs are used - * apt-pkg/deb/dpkgpm.cc: - - ensure that history.log gets closed to avoid leaking a FD - (closes: #601649) [ Martin Pitt ] * apt-pkg/deb/debindexfile.cc: @@ -29,7 +76,19 @@ apt (0.8.7) UNRELEASED; urgency=low uncompressed data. This fixes cache building progress going way over 100%. - -- Christian Perrier Tue, 05 Oct 2010 05:35:58 +0200 + [ David Kalnischkies ] + * apt-pkg/deb/deblistparser.cc: + - support ArmHardFloat port in CompleteArch, thanks to Sebastian + Andrzej Siewior for the patch! + * doc/apt.ent: + - move some strings into apt-verbatim.ent to avoid showing them in + apt-doc.pot as they are untranslatable anyway (e.g. manpage references) + * doc/apt-verbatim.ent: + - change the codenames to reflect the situation after squeeze release + * doc/examples/apt-https-method-example.conf: + - apply various typo fixes by Olly Betts, thanks! (Closes: #600249) + + -- Michael Vogt Fri, 15 Oct 2010 18:16:10 +0200 apt (0.8.6) unstable; urgency=low diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml index 9a63421a8..359d210ea 100644 --- a/doc/apt-cache.8.xml +++ b/doc/apt-cache.8.xml @@ -5,6 +5,9 @@ %aptent; + +%aptverbatiment; + ]> diff --git a/doc/apt-cdrom.8.xml b/doc/apt-cdrom.8.xml index 423569fc1..53ab392ab 100644 --- a/doc/apt-cdrom.8.xml +++ b/doc/apt-cdrom.8.xml @@ -5,6 +5,9 @@ %aptent; + +%aptverbatiment; + ]> diff --git a/doc/apt-config.8.xml b/doc/apt-config.8.xml index d4d36891f..862a034a1 100644 --- a/doc/apt-config.8.xml +++ b/doc/apt-config.8.xml @@ -5,6 +5,9 @@ %aptent; + +%aptverbatiment; + ]> diff --git a/doc/apt-extracttemplates.1.xml b/doc/apt-extracttemplates.1.xml index 9f8a4056d..af4cacfce 100644 --- a/doc/apt-extracttemplates.1.xml +++ b/doc/apt-extracttemplates.1.xml @@ -5,6 +5,9 @@ %aptent; + +%aptverbatiment; + ]> diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml index 549aa6a34..852da8ad1 100644 --- a/doc/apt-ftparchive.1.xml +++ b/doc/apt-ftparchive.1.xml @@ -5,6 +5,9 @@ %aptent; + +%aptverbatiment; + ]> diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index 581b23176..7eb87b452 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -5,6 +5,9 @@ %aptent; + +%aptverbatiment; + ]> @@ -275,6 +278,12 @@ for broken dependencies. + download + download will download the given + binary package into the current directoy. + + + clean clean clears out the local repository of retrieved package files. It removes everything but the lock file from diff --git a/doc/apt-key.8.xml b/doc/apt-key.8.xml index 8f445b7f9..f1cc3ac02 100644 --- a/doc/apt-key.8.xml +++ b/doc/apt-key.8.xml @@ -5,6 +5,9 @@ %aptent; + +%aptverbatiment; + ]> diff --git a/doc/apt-mark.8.xml b/doc/apt-mark.8.xml index 8e07cd7d9..ec50d6f76 100644 --- a/doc/apt-mark.8.xml +++ b/doc/apt-mark.8.xml @@ -5,6 +5,9 @@ %aptent; + +%aptverbatiment; + ]> diff --git a/doc/apt-secure.8.xml b/doc/apt-secure.8.xml index 908fc342f..f345c3f89 100644 --- a/doc/apt-secure.8.xml +++ b/doc/apt-secure.8.xml @@ -5,6 +5,9 @@ %aptent; + +%aptverbatiment; + ]> diff --git a/doc/apt-sortpkgs.1.xml b/doc/apt-sortpkgs.1.xml index a71766984..f2bd3c3ea 100644 --- a/doc/apt-sortpkgs.1.xml +++ b/doc/apt-sortpkgs.1.xml @@ -5,6 +5,9 @@ %aptent; + +%aptverbatiment; + ]> diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent new file mode 100644 index 000000000..a194a9d0d --- /dev/null +++ b/doc/apt-verbatim.ent @@ -0,0 +1,188 @@ + + + + + +&docdir;examples/configure-index.gz"> +/etc/apt.conf"> + + + + + + apt.conf + 5 + " +> + + + apt-get + 8 + " +> + + + apt-config + 8 + " +> + + + apt-cdrom + 8 + " +> + + + apt-cache + 8 + " +> + + + apt_preferences + 5 + " +> + + + apt-key + 8 + " +> + + + apt-secure + 8 + " +> + + + apt-ftparchive + 1 + " +> + + + + sources.list + 5 + " +> + + + reportbug + 1 + " +> + + + dpkg + 1 + " +> + + + dpkg-buildpackage + 1 + " +> + + + gzip + 1 + " +> + + + dpkg-scanpackages + 1 + " +> + + + dpkg-scansources + 1 + " +> + + + dselect + 1 + " +> + + + aptitude + 8 + " +> + + + synaptic + 8 + " +> + + + debsign + 1 + " +> + + + debsig-verify + 1 + " +> + + + gpg + 1 + " +> + + + wajig + 1 + " +> + + + + apt@packages.debian.org + +"> + + + Jason + Gunthorpe + + +"> + + + Mike + O'Connor + + +"> + + + Jason Gunthorpe + 1998-2001 + +"> + +Linux +"> + + + + + diff --git a/doc/apt.8 b/doc/apt.8 index 78e4f0a70..e7ca8c44b 100644 --- a/doc/apt.8 +++ b/doc/apt.8 @@ -28,10 +28,6 @@ for the command line or for the X Window System. Some options are only implemented in .BR apt-get (8) though. -.SH OPTIONS -None. -.SH FILES -None. .SH SEE ALSO .BR apt-cache (8), .BR apt-get (8), diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index e37456d73..f00baacea 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -5,6 +5,9 @@ %aptent; + +%aptverbatiment; + ]> diff --git a/doc/apt.ent b/doc/apt.ent index 0d037c8bb..fc745989f 100644 --- a/doc/apt.ent +++ b/doc/apt.ent @@ -1,153 +1,5 @@ - - - -&docdir;examples/configure-index.gz"> -/etc/apt.conf"> - - - - - - apt.conf - 5 - " -> - - - apt-get - 8 - " -> - - - apt-config - 8 - " -> - - - apt-cdrom - 8 - " -> - - - apt-cache - 8 - " -> - - - apt_preferences - 5 - " -> - - - apt-key - 8 - " -> - - - apt-secure - 8 - " -> - - - apt-ftparchive - 1 - " -> - - - - sources.list - 5 - " -> - - - reportbug - 1 - " -> - - - dpkg - 1 - " -> - - - dpkg-buildpackage - 1 - " -> - - - gzip - 1 - " -> - - - dpkg-scanpackages - 1 - " -> - - - dpkg-scansources - 1 - " -> - - - dselect - 1 - " -> - - - aptitude - 8 - " -> - - - synaptic - 8 - " -> - - - debsign - 1 - " -> - - - debsig-verify - 1 - " -> - - - gpg - 1 - " -> - - - wajig - 1 - " -> - @@ -159,30 +11,7 @@ 1998-2001 Jason Gunthorpe 28 October 2008 Linux - -"> - - - apt@packages.debian.org - -"> - - - Jason - Gunthorpe - - -"> - - - Mike - O'Connor - - "> "> -Linux -"> - - - Jason Gunthorpe - 1998-2001 - -"> - -Linux -"> - QA Page @@ -216,7 +30,7 @@ Bugs - APT bug page. + APT bug page. If you wish to report a bug in APT, please see /usr/share/doc/debian/bug-reporting.txt or the &reportbug; command. @@ -394,7 +208,3 @@ This is done on purpose, to avoid losing content when the translation is lagging behind the original content. "> - - - - diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml index abcf56744..54c01100c 100644 --- a/doc/apt_preferences.5.xml +++ b/doc/apt_preferences.5.xml @@ -5,6 +5,9 @@ %aptent; + +%aptverbatiment; + ]> diff --git a/doc/examples/apt-https-method-example.conf b/doc/examples/apt-https-method-example.conf index cc7889044..a03766746 100644 --- a/doc/examples/apt-https-method-example.conf +++ b/doc/examples/apt-https-method-example.conf @@ -6,7 +6,7 @@ This example file starts with a common setup that voluntarily exhibits all available configurations knobs with simple comments. Extended comments on the behavior of the option is provided at the end for - better readibility. As a matter of fact, a common configuration file + better readability. As a matter of fact, a common configuration file will certainly contain far less elements and benefit of default values for many parameters. @@ -38,12 +38,12 @@ matches their respective DNS names. - We have CRL available for both dom1.tld and dom2.tld PKI, and intend to use them. - - It somtimes happens that we had other more generic https available + - It sometimes happens that we had other more generic https available repository to our list. We want the checks to be performed against a common list of anchors (like the one provided by ca-certificates package for instance) - The sample configuration below basically covers those simpe needs. + The sample configuration below basically covers those simple needs. */ @@ -168,12 +168,12 @@ Acquire::https::secure.dom2.tld::SslKey "/etc/apt/certs/my-key.pem"; When the option is set to "SSLv3" to have apt propose SSLv3 (and associated sets of ciphersuites) instead of TLSv1 (the default) when performing the exchange. This prevents the server to select - TLSv1 and use associated cipheruites. You should probably not use + TLSv1 and use associated ciphersuites. You should probably not use this option except if you know exactly what you are doing. Note that the default setting does not guarantee that the server will not select SSLv3 (for ciphersuites and SSL/TLS version as - selectio is always done by the server, in the end). It only means + selection is always done by the server, in the end). It only means that apt will not advertise TLS support. Debug::Acquire::https "true"; diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index 60c795481..8365c460f 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -7,13 +7,14 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2010-08-23 18:46-0300\n" +"POT-Creation-Date: 2010-10-14 00:03+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" +"Language: \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: ENCODING" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" #. type: TH #: apt.8:17 @@ -147,271 +148,7 @@ msgid "" msgstr "" #. type: Plain text -#: apt.ent:10 -msgid "" -" " -" &docdir;examples/configure-index.gz\"> /etc/apt.conf\"> " -msgstr "" - -#. type: Plain text -#: apt.ent:17 -#, no-wrap -msgid "" -"\n" -"\n" -" apt.conf\n" -" 5\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:23 -#, no-wrap -msgid "" -"\n" -" apt-get\n" -" 8\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:29 -#, no-wrap -msgid "" -"\n" -" apt-config\n" -" 8\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:35 -#, no-wrap -msgid "" -"\n" -" apt-cdrom\n" -" 8\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:41 -#, no-wrap -msgid "" -"\n" -" apt-cache\n" -" 8\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:47 -#, no-wrap -msgid "" -"\n" -" apt_preferences\n" -" 5\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:53 -#, no-wrap -msgid "" -"\n" -" apt-key\n" -" 8\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:59 -#, no-wrap -msgid "" -"\n" -" apt-secure\n" -" 8\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:65 -#, no-wrap -msgid "" -"\n" -" apt-ftparchive\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:72 -#, no-wrap -msgid "" -"\n" -" sources.list\n" -" 5\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:78 -#, no-wrap -msgid "" -"\n" -" reportbug\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:84 -#, no-wrap -msgid "" -"\n" -" dpkg\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:90 -#, no-wrap -msgid "" -"\n" -" dpkg-buildpackage\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:96 -#, no-wrap -msgid "" -"\n" -" gzip\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:102 -#, no-wrap -msgid "" -"\n" -" dpkg-scanpackages\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:108 -#, no-wrap -msgid "" -"\n" -" dpkg-scansources\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:114 -#, no-wrap -msgid "" -"\n" -" dselect\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:120 -#, no-wrap -msgid "" -"\n" -" aptitude\n" -" 8\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:126 -#, no-wrap -msgid "" -"\n" -" synaptic\n" -" 8\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:132 -#, no-wrap -msgid "" -"\n" -" debsign\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:138 -#, no-wrap -msgid "" -"\n" -" debsig-verify\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:144 -#, no-wrap -msgid "" -"\n" -" gpg\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:150 -#, no-wrap -msgid "" -"\n" -" wajig\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:162 +#: apt.ent:16 #, no-wrap msgid "" "\n" @@ -426,55 +163,12 @@ msgid "" "Gunthorpe\n" " 28 October 2008\n" " Linux\n" -msgstr "" - -#. type: Plain text -#: apt.ent:165 -#, no-wrap -msgid "" " \n" -"\"> \n" -msgstr "" - -#. type: Plain text -#: apt.ent:171 -#, no-wrap -msgid "" -"\n" -" apt@packages.debian.org\n" -" \n" -"\">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:179 -#, no-wrap -msgid "" -"\n" -" Jason\n" -" Gunthorpe\n" -" \n" -" \n" "\">\n" msgstr "" #. type: Plain text -#: apt.ent:187 -#, no-wrap -msgid "" -"\n" -" Mike\n" -" O'Connor\n" -" \n" -" \n" -"\">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:194 +#: apt.ent:23 #, no-wrap msgid "" "Linux\n" -"\">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:205 -#, no-wrap -msgid "" -"\n" -" Jason Gunthorpe\n" -" 1998-2001\n" -" \n" -"\">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:215 +#: apt.ent:29 #, no-wrap msgid "" "\n" "Bugs\n" -" APT bug " -"page. \n" +" APT bug page.\n" " If you wish to report a bug in APT, please see\n" " /usr/share/doc/debian/bug-reporting.txt or the\n" " &reportbug; command.\n" @@ -535,7 +207,7 @@ msgid "" msgstr "" #. type: Plain text -#: apt.ent:234 +#: apt.ent:48 #, no-wrap msgid "" "\n" @@ -549,7 +221,7 @@ msgid "" msgstr "" #. type: Plain text -#: apt.ent:244 +#: apt.ent:58 #, no-wrap msgid "" "" msgstr "" #. type: Plain text -#: apt.ent:10 -msgid "" -" &docdir;examples/configure-index.gz\"> /etc/apt.conf\"> " -msgstr "" -" &docdir;examples/configure-index.gz\"> /etc/apt.conf\"> " - -#. type: Plain text -#: apt.ent:17 -#, no-wrap -msgid "" -"\n" -"\n" -" apt.conf\n" -" 5\n" -" \"\n" -">\n" -msgstr "" -"\n" -"\n" -" apt.conf\n" -" 5\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:23 -#, no-wrap -msgid "" -"\n" -" apt-get\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-get\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:29 -#, no-wrap -msgid "" -"\n" -" apt-config\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-config\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:35 -#, no-wrap -msgid "" -"\n" -" apt-cdrom\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-cdrom\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:41 -#, no-wrap -msgid "" -"\n" -" apt-cache\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-cache\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:47 -#, no-wrap -msgid "" -"\n" -" apt_preferences\n" -" 5\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt_preferences\n" -" 5\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:53 -#, no-wrap -msgid "" -"\n" -" apt-key\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-key\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:59 -#, no-wrap -msgid "" -"\n" -" apt-secure\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-secure\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:65 -#, no-wrap -msgid "" -"\n" -" apt-ftparchive\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-ftparchive\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:72 -#, no-wrap -msgid "" -"\n" -" sources.list\n" -" 5\n" -" \"\n" -">\n" -msgstr "" -"\n" -" sources.list\n" -" 5\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:78 -#, no-wrap -msgid "" -"\n" -" reportbug\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" reportbug\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:84 -#, no-wrap -msgid "" -"\n" -" dpkg\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dpkg\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:90 -#, no-wrap -msgid "" -"\n" -" dpkg-buildpackage\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dpkg-buildpackage\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:96 -#, no-wrap -msgid "" -"\n" -" gzip\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" gzip\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:102 -#, no-wrap -msgid "" -"\n" -" dpkg-scanpackages\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dpkg-scanpackages\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:108 -#, no-wrap -msgid "" -"\n" -" dpkg-scansources\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dpkg-scansources\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:114 -#, no-wrap -msgid "" -"\n" -" dselect\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dselect\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:120 -#, no-wrap -msgid "" -"\n" -" aptitude\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" aptitude\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:126 -#, no-wrap -msgid "" -"\n" -" synaptic\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" synaptic\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:132 -#, no-wrap -msgid "" -"\n" -" debsign\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" debsign\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:138 -#, no-wrap -msgid "" -"\n" -" debsig-verify\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" debsig-verify\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:144 -#, no-wrap -msgid "" -"\n" -" gpg\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" gpg\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:150 -#, no-wrap -msgid "" -"\n" -" wajig\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" wajig\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:162 +#: apt.ent:16 #, no-wrap msgid "" "\n" @@ -556,6 +171,8 @@ msgid "" " 1998-2001 Jason Gunthorpe\n" " 28 October 2008\n" " Linux\n" +" \n" +"\">\n" msgstr "" "\n" "1998-2001 Jason Gunthorpe\n" " 28. Oktober 2008\n" " Linux\n" - -#. type: Plain text -#: apt.ent:165 -#, no-wrap -msgid "" " \n" -"\"> \n" -msgstr "" -" \n" -"\"> \n" - -#. type: Plain text -#: apt.ent:171 -#, no-wrap -msgid "" -"\n" -" apt@packages.debian.org\n" -" \n" -"\">\n" -msgstr "" -"\n" -" apt@packages.debian.org\n" -" \n" -"\">\n" - -#. type: Plain text -#: apt.ent:179 -#, no-wrap -msgid "" -"\n" -" Jason\n" -" Gunthorpe\n" -" \n" -" \n" -"\">\n" -msgstr "" -"\n" -" Jason\n" -" Gunthorpe\n" -" \n" -" \n" "\">\n" #. type: Plain text -#: apt.ent:187 -#, no-wrap -msgid "" -"\n" -" Mike\n" -" O'Connor\n" -" \n" -" \n" -"\">\n" -msgstr "" -"\n" -" Mike\n" -" O'Connor\n" -" \n" -" \n" -"\">\n" - -#. type: Plain text -#: apt.ent:194 +#: apt.ent:23 #, no-wrap msgid "" "\n" #. type: Plain text -#: apt.ent:198 apt.ent:209 -#, no-wrap -msgid "" -"Linux\n" -"\">\n" -msgstr "" -"Linux\n" -"\">\n" - -#. type: Plain text -#: apt.ent:205 -#, no-wrap -msgid "" -"\n" -" Jason Gunthorpe\n" -" 1998-2001\n" -" \n" -"\">\n" -msgstr "" -"\n" -" Jason Gunthorpe\n" -" 1998-2001\n" -" \n" -"\">\n" - -#. type: Plain text -#: apt.ent:215 +#: apt.ent:29 #, no-wrap msgid "" "\n" #. type: Plain text -#: apt.ent:226 +#: apt.ent:40 #, no-wrap msgid "" "\n" "Bugs\n" -" APT bug page. \n" +" APT bug page.\n" " If you wish to report a bug in APT, please see\n" " /usr/share/doc/debian/bug-reporting.txt or the\n" " &reportbug; command.\n" @@ -726,7 +249,7 @@ msgstr "" "\">\n" #. type: Plain text -#: apt.ent:234 +#: apt.ent:48 #, no-wrap msgid "" "\n" @@ -746,7 +269,7 @@ msgstr "" "\">\n" #. type: Plain text -#: apt.ent:244 +#: apt.ent:58 #, no-wrap msgid "" "" msgstr "" #. type: Plain text -#: apt.ent:10 -msgid "" -" &docdir;examples/configure-index.gz\"> /etc/apt.conf\"> " -msgstr "" -" &docdir;examples/configure-index.gz\"> /etc/apt.conf\"> " - -#. type: Plain text -#: apt.ent:17 -#, no-wrap -msgid "" -"\n" -"\n" -" apt.conf\n" -" 5\n" -" \"\n" -">\n" -msgstr "" -"\n" -"\n" -" apt.conf\n" -" 5\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:23 -#, no-wrap -msgid "" -"\n" -" apt-get\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-get\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:29 -#, no-wrap -msgid "" -"\n" -" apt-config\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-config\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:35 -#, no-wrap -msgid "" -"\n" -" apt-cdrom\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-cdrom\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:41 -#, no-wrap -msgid "" -"\n" -" apt-cache\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-cache\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:47 -#, no-wrap -msgid "" -"\n" -" apt_preferences\n" -" 5\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt_preferences\n" -" 5\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:53 -#, no-wrap -msgid "" -"\n" -" apt-key\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-key\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:59 -#, no-wrap -msgid "" -"\n" -" apt-secure\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-secure\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:65 -#, no-wrap -msgid "" -"\n" -" apt-ftparchive\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-ftparchive\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:72 -#, no-wrap -msgid "" -"\n" -" sources.list\n" -" 5\n" -" \"\n" -">\n" -msgstr "" -"\n" -" sources.list\n" -" 5\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:78 -#, no-wrap -msgid "" -"\n" -" reportbug\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" reportbug\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:84 -#, no-wrap -msgid "" -"\n" -" dpkg\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dpkg\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:90 -#, no-wrap -msgid "" -"\n" -" dpkg-buildpackage\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dpkg-buildpackage\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:96 -#, no-wrap -msgid "" -"\n" -" gzip\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" gzip\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:102 -#, no-wrap -msgid "" -"\n" -" dpkg-scanpackages\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dpkg-scanpackages\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:108 -#, no-wrap -msgid "" -"\n" -" dpkg-scansources\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dpkg-scansources\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:114 -#, no-wrap -msgid "" -"\n" -" dselect\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dselect\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:120 -#, no-wrap -msgid "" -"\n" -" aptitude\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" aptitude\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:126 -#, no-wrap -msgid "" -"\n" -" synaptic\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" synaptic\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:132 -#, no-wrap -msgid "" -"\n" -" debsign\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" debsign\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:138 -#, no-wrap -msgid "" -"\n" -" debsig-verify\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" debsig-verify\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:144 -#, no-wrap -msgid "" -"\n" -" gpg\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" gpg\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:150 -#, no-wrap -msgid "" -"\n" -" wajig\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" wajig\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:162 +#: apt.ent:16 #, no-wrap msgid "" "\n" @@ -588,6 +203,8 @@ msgid "" " 1998-2001 Jason Gunthorpe\n" " 28 October 2008\n" " Linux\n" +" \n" +"\">\n" msgstr "" "\n" "1998-2001 Jason Gunthorpe\n" " 28 de Octubre de 2008\n" " Linux\n" - -#. type: Plain text -#: apt.ent:165 -#, no-wrap -msgid "" " \n" -"\"> \n" -msgstr "" -" \n" -"\"> \n" - -#. type: Plain text -#: apt.ent:171 -#, no-wrap -msgid "" -"\n" -" apt@packages.debian.org\n" -" \n" -"\">\n" -msgstr "" -"\n" -" apt@packages.debian.org\n" -" \n" "\">\n" #. type: Plain text -#: apt.ent:179 -#, no-wrap -msgid "" -"\n" -" Jason\n" -" Gunthorpe\n" -" \n" -" \n" -"\">\n" -msgstr "" -"\n" -" Jason\n" -" Gunthorpe\n" -" \n" -" \n" -"\">\n" - -#. type: Plain text -#: apt.ent:187 -#, no-wrap -msgid "" -"\n" -" Mike\n" -" O'Connor\n" -" \n" -" \n" -"\">\n" -msgstr "" -"\n" -" Mike\n" -" O'Connor\n" -" \n" -" \n" -"\">\n" - -#. type: Plain text -#: apt.ent:194 +#: apt.ent:23 #, no-wrap msgid "" "\n" #. type: Plain text -#: apt.ent:198 apt.ent:209 -#, no-wrap -msgid "" -"Linux\n" -"\">\n" -msgstr "" -"Linux\n" -"\">\n" - -#. type: Plain text -#: apt.ent:205 -#, no-wrap -msgid "" -"\n" -" Jason Gunthorpe\n" -" 1998-2001\n" -" \n" -"\">\n" -msgstr "" -"\n" -" Jason Gunthorpe\n" -" 1998-2001\n" -" \n" -"\">\n" - -#. type: Plain text -#: apt.ent:215 +#: apt.ent:29 #, no-wrap msgid "" "\n" #. type: Plain text -#: apt.ent:226 +#: apt.ent:40 #, no-wrap msgid "" "\n" "Bugs\n" -" APT bug page. \n" +" APT bug page.\n" " If you wish to report a bug in APT, please see\n" " /usr/share/doc/debian/bug-reporting.txt or the\n" " &reportbug; command.\n" @@ -758,7 +281,7 @@ msgstr "" "\">\n" #. type: Plain text -#: apt.ent:234 +#: apt.ent:48 #, no-wrap msgid "" "\n" @@ -778,7 +301,7 @@ msgstr "" "\">\n" #. type: Plain text -#: apt.ent:244 +#: apt.ent:58 #, no-wrap msgid "" "" msgstr "" #. type: Plain text -#: apt.ent:10 -msgid "" -" &docdir;examples/configure-index.gz\"> /etc/apt.conf\"> " -msgstr "" -" &docdir;examples/configure-index.gz\"> /etc/apt.conf\"> " - -#. type: Plain text -#: apt.ent:17 -#, no-wrap -msgid "" -"\n" -"\n" -" apt.conf\n" -" 5\n" -" \"\n" -">\n" -msgstr "" -"\n" -"\n" -" apt.conf\n" -" 5\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:23 -#, no-wrap -msgid "" -"\n" -" apt-get\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-get\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:29 -#, no-wrap -msgid "" -"\n" -" apt-config\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-config\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:35 -#, no-wrap -msgid "" -"\n" -" apt-cdrom\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-cdrom\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:41 -#, no-wrap -msgid "" -"\n" -" apt-cache\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-cache\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:47 -#, no-wrap -msgid "" -"\n" -" apt_preferences\n" -" 5\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt_preferences\n" -" 5\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:53 -#, no-wrap -msgid "" -"\n" -" apt-key\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-key\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:59 -#, no-wrap -msgid "" -"\n" -" apt-secure\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-secure\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:65 -#, no-wrap -msgid "" -"\n" -" apt-ftparchive\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-ftparchive\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:72 -#, no-wrap -msgid "" -"\n" -" sources.list\n" -" 5\n" -" \"\n" -">\n" -msgstr "" -"\n" -" sources.list\n" -" 5\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:78 -#, no-wrap -msgid "" -"\n" -" reportbug\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" reportbug\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:84 -#, no-wrap -msgid "" -"\n" -" dpkg\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dpkg\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:90 -#, no-wrap -msgid "" -"\n" -" dpkg-buildpackage\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dpkg-buildpackage\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:96 -#, no-wrap -msgid "" -"\n" -" gzip\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" gzip\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:102 -#, no-wrap -msgid "" -"\n" -" dpkg-scanpackages\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dpkg-scanpackages\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:108 -#, no-wrap -msgid "" -"\n" -" dpkg-scansources\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dpkg-scansources\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:114 -#, no-wrap -msgid "" -"\n" -" dselect\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dselect\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:120 -#, no-wrap -msgid "" -"\n" -" aptitude\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" aptitude\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:126 -#, no-wrap -msgid "" -"\n" -" synaptic\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" synaptic\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:132 -#, no-wrap -msgid "" -"\n" -" debsign\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" debsign\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:138 -#, no-wrap -msgid "" -"\n" -" debsig-verify\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" debsig-verify\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:144 -#, no-wrap -msgid "" -"\n" -" gpg\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" gpg\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:150 -#, no-wrap -msgid "" -"\n" -" wajig\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" wajig\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:162 +#: apt.ent:16 #, no-wrap msgid "" "\n" @@ -564,6 +179,8 @@ msgid "" " 1998-2001 Jason Gunthorpe\n" " 28 October 2008\n" " Linux\n" +" \n" +"\">\n" msgstr "" "\n" "1998-2001 Jason Gunthorpe\n" " 28 Octobre 2008\n" " Linux\n" - -#. type: Plain text -#: apt.ent:165 -#, no-wrap -msgid "" " \n" -"\"> \n" -msgstr "" -" \n" -"\"> \n" - -#. type: Plain text -#: apt.ent:171 -#, no-wrap -msgid "" -"\n" -" apt@packages.debian.org\n" -" \n" -"\">\n" -msgstr "" -"\n" -" apt@packages.debian.org\n" -" \n" -"\">\n" - -#. type: Plain text -#: apt.ent:179 -#, no-wrap -msgid "" -"\n" -" Jason\n" -" Gunthorpe\n" -" \n" -" \n" -"\">\n" -msgstr "" -"\n" -" Jason\n" -" Gunthorpe\n" -" \n" -" \n" -"\">\n" - -#. type: Plain text -#: apt.ent:187 -#, no-wrap -msgid "" -"\n" -" Mike\n" -" O'Connor\n" -" \n" -" \n" -"\">\n" -msgstr "" -"\n" -" Mike\n" -" O'Connor\n" -" \n" -" \n" "\">\n" #. type: Plain text -#: apt.ent:194 +#: apt.ent:23 #, no-wrap msgid "" "\n" #. type: Plain text -#: apt.ent:198 apt.ent:209 -#, no-wrap -msgid "" -"Linux\n" -"\">\n" -msgstr "" -"Linux\n" -"\">\n" - -#. type: Plain text -#: apt.ent:205 -#, no-wrap -msgid "" -"\n" -" Jason Gunthorpe\n" -" 1998-2001\n" -" \n" -"\">\n" -msgstr "" -"\n" -" Jason Gunthorpe\n" -" 1998-2001\n" -" \n" -"\">\n" - -#. type: Plain text -#: apt.ent:215 +#: apt.ent:29 #, no-wrap msgid "" "\n" #. type: Plain text -#: apt.ent:226 +#: apt.ent:40 #, no-wrap msgid "" "\n" "Bugs\n" -" APT bug page. \n" +" APT bug page.\n" " If you wish to report a bug in APT, please see\n" " /usr/share/doc/debian/bug-reporting.txt or the\n" " &reportbug; command.\n" @@ -734,7 +257,7 @@ msgstr "" "\">\n" #. type: Plain text -#: apt.ent:234 +#: apt.ent:48 #, no-wrap msgid "" "\n" @@ -754,7 +277,7 @@ msgstr "" "\">\n" #. type: Plain text -#: apt.ent:244 +#: apt.ent:58 #, no-wrap msgid "" "" msgstr "" #. type: Plain text -#: apt.ent:10 -msgid "" -" &docdir;examples/configure-index.gz\"> /etc/apt.conf\"> " -msgstr "" - -#. type: Plain text -#: apt.ent:17 -#, no-wrap -msgid "" -"\n" -"\n" -" apt.conf\n" -" 5\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:23 -#, no-wrap -msgid "" -"\n" -" apt-get\n" -" 8\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:29 -#, no-wrap -msgid "" -"\n" -" apt-config\n" -" 8\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:35 -#, no-wrap -msgid "" -"\n" -" apt-cdrom\n" -" 8\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:41 -#, no-wrap -msgid "" -"\n" -" apt-cache\n" -" 8\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:47 -#, no-wrap -msgid "" -"\n" -" apt_preferences\n" -" 5\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:53 -#, no-wrap -msgid "" -"\n" -" apt-key\n" -" 8\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:59 -#, no-wrap -msgid "" -"\n" -" apt-secure\n" -" 8\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:65 -#, no-wrap -msgid "" -"\n" -" apt-ftparchive\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:72 -#, no-wrap -msgid "" -"\n" -" sources.list\n" -" 5\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:78 -#, no-wrap -msgid "" -"\n" -" reportbug\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:84 -#, no-wrap -msgid "" -"\n" -" dpkg\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:90 -#, no-wrap -msgid "" -"\n" -" dpkg-buildpackage\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:96 -#, no-wrap -msgid "" -"\n" -" gzip\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:102 -#, no-wrap -msgid "" -"\n" -" dpkg-scanpackages\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:108 -#, no-wrap -msgid "" -"\n" -" dpkg-scansources\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:114 -#, no-wrap -msgid "" -"\n" -" dselect\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:120 -#, no-wrap -msgid "" -"\n" -" aptitude\n" -" 8\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:126 -#, no-wrap -msgid "" -"\n" -" synaptic\n" -" 8\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:132 -#, no-wrap -msgid "" -"\n" -" debsign\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:138 -#, no-wrap -msgid "" -"\n" -" debsig-verify\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:144 -#, no-wrap -msgid "" -"\n" -" gpg\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:150 -#, no-wrap -msgid "" -"\n" -" wajig\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:162 +#: apt.ent:16 #, no-wrap msgid "" "\n" @@ -428,55 +164,12 @@ msgid "" " 1998-2001 Jason Gunthorpe\n" " 28 October 2008\n" " Linux\n" -msgstr "" - -#. type: Plain text -#: apt.ent:165 -#, no-wrap -msgid "" " \n" -"\"> \n" -msgstr "" - -#. type: Plain text -#: apt.ent:171 -#, no-wrap -msgid "" -"\n" -" apt@packages.debian.org\n" -" \n" -"\">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:179 -#, no-wrap -msgid "" -"\n" -" Jason\n" -" Gunthorpe\n" -" \n" -" \n" "\">\n" msgstr "" #. type: Plain text -#: apt.ent:187 -#, no-wrap -msgid "" -"\n" -" Mike\n" -" O'Connor\n" -" \n" -" \n" -"\">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:194 +#: apt.ent:23 #, no-wrap msgid "" "Linux\n" -"\">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:205 -#, no-wrap -msgid "" -"\n" -" Jason Gunthorpe\n" -" 1998-2001\n" -" \n" -"\">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:215 +#: apt.ent:29 #, no-wrap msgid "" "\n" "Bugs\n" -" APT bug page. \n" +" APT bug page.\n" " If you wish to report a bug in APT, please see\n" " /usr/share/doc/debian/bug-reporting.txt or the\n" " &reportbug; command.\n" @@ -536,7 +208,7 @@ msgid "" msgstr "" #. type: Plain text -#: apt.ent:234 +#: apt.ent:48 #, no-wrap msgid "" "\n" @@ -549,7 +221,7 @@ msgid "" msgstr "" #. type: Plain text -#: apt.ent:244 +#: apt.ent:58 #, no-wrap msgid "" "" msgstr "" #. type: Plain text -#: apt.ent:10 -msgid "" -" &docdir;examples/configure-index.gz\"> /etc/apt.conf\"> " -msgstr "" -" &docdir;examples/configure-index.gz\"> /etc/apt.conf\"> " - -#. type: Plain text -#: apt.ent:17 -#, no-wrap -msgid "" -"\n" -"\n" -" apt.conf\n" -" 5\n" -" \"\n" -">\n" -msgstr "" -"\n" -"\n" -" apt.conf\n" -" 5\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:23 -#, no-wrap -msgid "" -"\n" -" apt-get\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-get\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:29 -#, no-wrap -msgid "" -"\n" -" apt-config\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-config\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:35 -#, no-wrap -msgid "" -"\n" -" apt-cdrom\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-cdrom\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:41 -#, no-wrap -msgid "" -"\n" -" apt-cache\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-cache\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:47 -#, no-wrap -msgid "" -"\n" -" apt_preferences\n" -" 5\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt_preferences\n" -" 5\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:53 -#, no-wrap -msgid "" -"\n" -" apt-key\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-key\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:59 -#, no-wrap -msgid "" -"\n" -" apt-secure\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-secure\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:65 -#, no-wrap -msgid "" -"\n" -" apt-ftparchive\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-ftparchive\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:72 -#, no-wrap -msgid "" -"\n" -" sources.list\n" -" 5\n" -" \"\n" -">\n" -msgstr "" -"\n" -" sources.list\n" -" 5\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:78 -#, no-wrap -msgid "" -"\n" -" reportbug\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" reportbug\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:84 -#, no-wrap -msgid "" -"\n" -" dpkg\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dpkg\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:90 -#, no-wrap -msgid "" -"\n" -" dpkg-buildpackage\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dpkg-buildpackage\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:96 -#, no-wrap -msgid "" -"\n" -" gzip\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" gzip\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:102 -#, no-wrap -msgid "" -"\n" -" dpkg-scanpackages\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dpkg-scanpackages\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:108 -#, no-wrap -msgid "" -"\n" -" dpkg-scansources\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dpkg-scansources\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:114 -#, no-wrap -msgid "" -"\n" -" dselect\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dselect\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:120 -#, no-wrap -msgid "" -"\n" -" aptitude\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" aptitude\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:126 -#, no-wrap -msgid "" -"\n" -" synaptic\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" synaptic\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:132 -#, no-wrap -msgid "" -"\n" -" debsign\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" debsign\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:138 -#, no-wrap -msgid "" -"\n" -" debsig-verify\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" debsig-verify\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:144 -#, no-wrap -msgid "" -"\n" -" gpg\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" gpg\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:150 -#, no-wrap -msgid "" -"\n" -" wajig\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" wajig\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:162 +#: apt.ent:16 #, no-wrap msgid "" "\n" @@ -576,6 +191,8 @@ msgid "" " 1998-2001 Jason Gunthorpe\n" " 28 October 2008\n" " Linux\n" +" \n" +"\">\n" msgstr "" "\n" "1998-2001 Jason Gunthorpe\n" " 28 October 2008\n" " Linux\n" - -#. type: Plain text -#: apt.ent:165 -#, no-wrap -msgid "" -" \n" -"\"> \n" -msgstr "" " \n" -"\"> \n" - -#. type: Plain text -#: apt.ent:171 -#, no-wrap -msgid "" -"\n" -" apt@packages.debian.org\n" -" \n" -"\">\n" -msgstr "" -"\n" -" apt@packages.debian.org\n" -" \n" "\">\n" #. type: Plain text -#: apt.ent:179 -#, no-wrap -msgid "" -"\n" -" Jason\n" -" Gunthorpe\n" -" \n" -" \n" -"\">\n" -msgstr "" -"\n" -" Jason\n" -" Gunthorpe\n" -" \n" -" \n" -"\">\n" - -#. type: Plain text -#: apt.ent:187 -#, no-wrap -msgid "" -"\n" -" Mike\n" -" O'Connor\n" -" \n" -" \n" -"\">\n" -msgstr "" -"\n" -" Mike\n" -" O'Connor\n" -" \n" -" \n" -"\">\n" - -#. type: Plain text -#: apt.ent:194 +#: apt.ent:23 #, no-wrap msgid "" "\n" #. type: Plain text -#: apt.ent:198 apt.ent:209 -#, no-wrap -msgid "" -"Linux\n" -"\">\n" -msgstr "" -"Linux\n" -"\">\n" - -#. type: Plain text -#: apt.ent:205 -#, no-wrap -msgid "" -"\n" -" Jason Gunthorpe\n" -" 1998-2001\n" -" \n" -"\">\n" -msgstr "" -"\n" -" Jason Gunthorpe\n" -" 1998-2001\n" -" \n" -"\">\n" - -#. type: Plain text -#: apt.ent:215 +#: apt.ent:29 #, no-wrap msgid "" "\n" #. type: Plain text -#: apt.ent:226 +#: apt.ent:40 #, no-wrap msgid "" "\n" "Bugs\n" -" APT bug page. \n" +" APT bug page.\n" " If you wish to report a bug in APT, please see\n" " /usr/share/doc/debian/bug-reporting.txt or the\n" " &reportbug; command.\n" @@ -746,7 +269,7 @@ msgstr "" "\">\n" #. type: Plain text -#: apt.ent:234 +#: apt.ent:48 #, no-wrap msgid "" "\n" @@ -766,7 +289,7 @@ msgstr "" "\">\n" #. type: Plain text -#: apt.ent:244 +#: apt.ent:58 #, no-wrap msgid "" "" msgstr "" #. type: Plain text -#: apt.ent:10 -msgid "" -" &docdir;examples/configure-index.gz\"> /etc/apt.conf\"> " -msgstr "" -" &docdir;examples/configure-index.gz\"> /etc/apt.conf\"> " - -#. type: Plain text -#: apt.ent:17 -#, no-wrap -msgid "" -"\n" -"\n" -" apt.conf\n" -" 5\n" -" \"\n" -">\n" -msgstr "" -"\n" -"\n" -" apt.conf\n" -" 5\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:23 -#, no-wrap -msgid "" -"\n" -" apt-get\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-get\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:29 -#, no-wrap -msgid "" -"\n" -" apt-config\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-config\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:35 -#, no-wrap -msgid "" -"\n" -" apt-cdrom\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-cdrom\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:41 -#, no-wrap -msgid "" -"\n" -" apt-cache\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-cache\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:47 -#, no-wrap -msgid "" -"\n" -" apt_preferences\n" -" 5\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt_preferences\n" -" 5\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:53 -#, no-wrap -msgid "" -"\n" -" apt-key\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-key\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:59 -#, no-wrap -msgid "" -"\n" -" apt-secure\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-secure\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:65 -#, no-wrap -msgid "" -"\n" -" apt-ftparchive\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-ftparchive\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:72 -#, no-wrap -msgid "" -"\n" -" sources.list\n" -" 5\n" -" \"\n" -">\n" -msgstr "" -"\n" -" sources.list\n" -" 5\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:78 -#, no-wrap -msgid "" -"\n" -" reportbug\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" reportbug\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:84 -#, no-wrap -msgid "" -"\n" -" dpkg\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dpkg\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:90 -#, no-wrap -msgid "" -"\n" -" dpkg-buildpackage\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dpkg-buildpackage\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:96 -#, no-wrap -msgid "" -"\n" -" gzip\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" gzip\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:102 -#, no-wrap -msgid "" -"\n" -" dpkg-scanpackages\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dpkg-scanpackages\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:108 -#, no-wrap -msgid "" -"\n" -" dpkg-scansources\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dpkg-scansources\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:114 -#, no-wrap -msgid "" -"\n" -" dselect\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dselect\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:120 -#, no-wrap -msgid "" -"\n" -" aptitude\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" aptitude\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:126 -#, no-wrap -msgid "" -"\n" -" synaptic\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" synaptic\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:132 -#, no-wrap -msgid "" -"\n" -" debsign\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" debsign\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:138 -#, no-wrap -msgid "" -"\n" -" debsig-verify\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" debsig-verify\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:144 -#, no-wrap -msgid "" -"\n" -" gpg\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" gpg\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:150 -#, no-wrap -msgid "" -"\n" -" wajig\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" wajig\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:162 +#: apt.ent:16 #, no-wrap msgid "" "\n" @@ -570,6 +185,8 @@ msgid "" " 1998-2001 Jason Gunthorpe\n" " 28 October 2008\n" " Linux\n" +" \n" +"\">\n" msgstr "" "\n" "1998-2001 Jason Gunthorpe\n" " 28 października 2008\n" " Linux\n" - -#. type: Plain text -#: apt.ent:165 -#, no-wrap -msgid "" " \n" -"\"> \n" -msgstr "" -" \n" -"\"> \n" - -#. type: Plain text -#: apt.ent:171 -#, no-wrap -msgid "" -"\n" -" apt@packages.debian.org\n" -" \n" -"\">\n" -msgstr "" -"\n" -" apt@packages.debian.org\n" -" \n" "\">\n" #. type: Plain text -#: apt.ent:179 -#, no-wrap -msgid "" -"\n" -" Jason\n" -" Gunthorpe\n" -" \n" -" \n" -"\">\n" -msgstr "" -"\n" -" Jason\n" -" Gunthorpe\n" -" \n" -" \n" -"\">\n" - -#. type: Plain text -#: apt.ent:187 -#, no-wrap -msgid "" -"\n" -" Mike\n" -" O'Connor\n" -" \n" -" \n" -"\">\n" -msgstr "" -"\n" -" Mike\n" -" O'Connor\n" -" \n" -" \n" -"\">\n" - -#. type: Plain text -#: apt.ent:194 +#: apt.ent:23 #, no-wrap msgid "" "\n" #. type: Plain text -#: apt.ent:198 apt.ent:209 -#, no-wrap -msgid "" -"Linux\n" -"\">\n" -msgstr "" -"Linux\n" -"\">\n" - -#. type: Plain text -#: apt.ent:205 -#, no-wrap -msgid "" -"\n" -" Jason Gunthorpe\n" -" 1998-2001\n" -" \n" -"\">\n" -msgstr "" -"\n" -" Jason Gunthorpe\n" -" 1998-2001\n" -" \n" -"\">\n" - -#. type: Plain text -#: apt.ent:215 +#: apt.ent:29 #, no-wrap msgid "" "\n" "Bugs\n" -" APT bug page. \n" +" APT bug page.\n" " If you wish to report a bug in APT, please see\n" " /usr/share/doc/debian/bug-reporting.txt or the\n" " &reportbug; command.\n" @@ -741,7 +264,7 @@ msgstr "" "\">\n" #. type: Plain text -#: apt.ent:234 +#: apt.ent:48 #, no-wrap msgid "" "\n" @@ -761,7 +284,7 @@ msgstr "" "\">\n" #. type: Plain text -#: apt.ent:244 +#: apt.ent:58 #, no-wrap msgid "" "" msgstr "" #. type: Plain text -#: apt.ent:10 -msgid "" -" &docdir;examples/configure-index.gz\"> /etc/apt.conf\"> " -msgstr "" -" &docdir;examples/configure-index.gz\"> /etc/apt.conf\"> " - -#. type: Plain text -#: apt.ent:17 -#, no-wrap -msgid "" -"\n" -"\n" -" apt.conf\n" -" 5\n" -" \"\n" -">\n" -msgstr "" -"\n" -"\n" -" apt.conf\n" -" 5\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:23 -#, no-wrap -msgid "" -"\n" -" apt-get\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-get\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:29 -#, no-wrap -msgid "" -"\n" -" apt-config\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-config\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:35 -#, no-wrap -msgid "" -"\n" -" apt-cdrom\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-cdrom\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:41 -#, no-wrap -msgid "" -"\n" -" apt-cache\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-cache\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:47 -#, no-wrap -msgid "" -"\n" -" apt_preferences\n" -" 5\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt_preferences\n" -" 5\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:53 -#, no-wrap -msgid "" -"\n" -" apt-key\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-key\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:59 -#, no-wrap -msgid "" -"\n" -" apt-secure\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-secure\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:65 -#, no-wrap -msgid "" -"\n" -" apt-ftparchive\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" apt-ftparchive\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:72 -#, no-wrap -msgid "" -"\n" -" sources.list\n" -" 5\n" -" \"\n" -">\n" -msgstr "" -"\n" -" sources.list\n" -" 5\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:78 -#, no-wrap -msgid "" -"\n" -" reportbug\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" reportbug\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:84 -#, no-wrap -msgid "" -"\n" -" dpkg\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dpkg\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:90 -#, no-wrap -msgid "" -"\n" -" dpkg-buildpackage\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dpkg-buildpackage\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:96 -#, no-wrap -msgid "" -"\n" -" gzip\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" gzip\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:102 -#, no-wrap -msgid "" -"\n" -" dpkg-scanpackages\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dpkg-scanpackages\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:108 -#, no-wrap -msgid "" -"\n" -" dpkg-scansources\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dpkg-scansources\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:114 -#, no-wrap -msgid "" -"\n" -" dselect\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" dselect\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:120 -#, no-wrap -msgid "" -"\n" -" aptitude\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" aptitude\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:126 -#, no-wrap -msgid "" -"\n" -" synaptic\n" -" 8\n" -" \"\n" -">\n" -msgstr "" -"\n" -" synaptic\n" -" 8\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:132 -#, no-wrap -msgid "" -"\n" -" debsign\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" debsign\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:138 -#, no-wrap -msgid "" -"\n" -" debsig-verify\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" debsig-verify\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:144 -#, no-wrap -msgid "" -"\n" -" gpg\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" gpg\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:150 -#, no-wrap -msgid "" -"\n" -" wajig\n" -" 1\n" -" \"\n" -">\n" -msgstr "" -"\n" -" wajig\n" -" 1\n" -" \"\n" -">\n" - -#. type: Plain text -#: apt.ent:162 +#: apt.ent:16 #, no-wrap msgid "" "\n" @@ -558,6 +173,8 @@ msgid "" " 1998-2001 Jason Gunthorpe\n" " 28 October 2008\n" " Linux\n" +" \n" +"\">\n" msgstr "" "\n" "1998-2001 Jason Gunthorpe\n" " 28 Outubro 2008\n" " Linux\n" - -#. type: Plain text -#: apt.ent:165 -#, no-wrap -msgid "" " \n" -"\"> \n" -msgstr "" -" \n" -"\"> \n" - -#. type: Plain text -#: apt.ent:171 -#, no-wrap -msgid "" -"\n" -" apt@packages.debian.org\n" -" \n" -"\">\n" -msgstr "" -"\n" -" apt@packages.debian.org\n" -" \n" "\">\n" #. type: Plain text -#: apt.ent:179 -#, no-wrap -msgid "" -"\n" -" Jason\n" -" Gunthorpe\n" -" \n" -" \n" -"\">\n" -msgstr "" -"\n" -" Jason\n" -" Gunthorpe\n" -" \n" -" \n" -"\">\n" - -#. type: Plain text -#: apt.ent:187 -#, no-wrap -msgid "" -"\n" -" Mike\n" -" O'Connor\n" -" \n" -" \n" -"\">\n" -msgstr "" -"\n" -" Mike\n" -" O'Connor\n" -" \n" -" \n" -"\">\n" - -#. type: Plain text -#: apt.ent:194 +#: apt.ent:23 #, no-wrap msgid "" "\n" #. type: Plain text -#: apt.ent:198 apt.ent:209 -#, no-wrap -msgid "" -"Linux\n" -"\">\n" -msgstr "" -"Linux\n" -"\">\n" - -#. type: Plain text -#: apt.ent:205 -#, no-wrap -msgid "" -"\n" -" Jason Gunthorpe\n" -" 1998-2001\n" -" \n" -"\">\n" -msgstr "" -"\n" -" Jason Gunthorpe\n" -" 1998-2001\n" -" \n" -"\">\n" - -#. type: Plain text -#: apt.ent:215 +#: apt.ent:29 #, no-wrap msgid "" "\n" #. type: Plain text -#: apt.ent:226 +#: apt.ent:40 #, no-wrap msgid "" "\n" "Bugs\n" -" APT bug page. \n" +" APT bug page.\n" " If you wish to report a bug in APT, please see\n" " /usr/share/doc/debian/bug-reporting.txt or the\n" " &reportbug; command.\n" @@ -728,7 +251,7 @@ msgstr "" "\">\n" #. type: Plain text -#: apt.ent:234 +#: apt.ent:48 #, no-wrap msgid "" "\n" @@ -748,7 +271,7 @@ msgstr "" "\">\n" #. type: Plain text -#: apt.ent:244 +#: apt.ent:58 #, no-wrap msgid "" "" msgstr "" #. type: Plain text -#: apt.ent:10 -msgid "" -" &docdir;examples/configure-index.gz\"> /etc/apt.conf\"> " -msgstr "" - -#. type: Plain text -#: apt.ent:17 -#, no-wrap -msgid "" -"\n" -"\n" -" apt.conf\n" -" 5\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:23 -#, no-wrap -msgid "" -"\n" -" apt-get\n" -" 8\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:29 -#, no-wrap -msgid "" -"\n" -" apt-config\n" -" 8\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:35 -#, no-wrap -msgid "" -"\n" -" apt-cdrom\n" -" 8\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:41 -#, no-wrap -msgid "" -"\n" -" apt-cache\n" -" 8\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:47 -#, no-wrap -msgid "" -"\n" -" apt_preferences\n" -" 5\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:53 -#, no-wrap -msgid "" -"\n" -" apt-key\n" -" 8\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:59 -#, no-wrap -msgid "" -"\n" -" apt-secure\n" -" 8\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:65 -#, no-wrap -msgid "" -"\n" -" apt-ftparchive\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:72 -#, no-wrap -msgid "" -"\n" -" sources.list\n" -" 5\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:78 -#, no-wrap -msgid "" -"\n" -" reportbug\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:84 -#, no-wrap -msgid "" -"\n" -" dpkg\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:90 -#, no-wrap -msgid "" -"\n" -" dpkg-buildpackage\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:96 -#, no-wrap -msgid "" -"\n" -" gzip\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:102 -#, no-wrap -msgid "" -"\n" -" dpkg-scanpackages\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:108 -#, no-wrap -msgid "" -"\n" -" dpkg-scansources\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:114 -#, no-wrap -msgid "" -"\n" -" dselect\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:120 -#, no-wrap -msgid "" -"\n" -" aptitude\n" -" 8\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:126 -#, no-wrap -msgid "" -"\n" -" synaptic\n" -" 8\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:132 -#, no-wrap -msgid "" -"\n" -" debsign\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:138 -#, no-wrap -msgid "" -"\n" -" debsig-verify\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:144 -#, no-wrap -msgid "" -"\n" -" gpg\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:150 -#, no-wrap -msgid "" -"\n" -" wajig\n" -" 1\n" -" \"\n" -">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:162 +#: apt.ent:16 #, fuzzy, no-wrap msgid "" "\n" @@ -444,6 +180,8 @@ msgid "" " 1998-2001 Jason Gunthorpe\n" " 28 October 2008\n" " Linux\n" +" \n" +"\">\n" msgstr "" "\n" " \n" @@ -454,52 +192,7 @@ msgstr "" " \n" #. type: Plain text -#: apt.ent:165 -#, no-wrap -msgid "" -" \n" -"\"> \n" -msgstr "" - -#. type: Plain text -#: apt.ent:171 -#, no-wrap -msgid "" -"\n" -" apt@packages.debian.org\n" -" \n" -"\">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:179 -#, no-wrap -msgid "" -"\n" -" Jason\n" -" Gunthorpe\n" -" \n" -" \n" -"\">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:187 -#, no-wrap -msgid "" -"\n" -" Mike\n" -" O'Connor\n" -" \n" -" \n" -"\">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:194 +#: apt.ent:23 #, no-wrap msgid "" "Linux\n" -"\">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:205 -#, no-wrap -msgid "" -"\n" -" Jason Gunthorpe\n" -" 1998-2001\n" -" \n" -"\">\n" -msgstr "" - -#. type: Plain text -#: apt.ent:215 +#: apt.ent:29 #, no-wrap msgid "" "\n" "Bugs\n" -" APT bug page. \n" +" APT bug page.\n" " If you wish to report a bug in APT, please see\n" " /usr/share/doc/debian/bug-reporting.txt or the\n" " &reportbug; command.\n" @@ -566,7 +238,7 @@ msgstr "" " \n" #. type: Plain text -#: apt.ent:234 +#: apt.ent:48 #, fuzzy, no-wrap msgid "" "\n" @@ -584,7 +256,7 @@ msgstr "" " \n" #. type: Plain text -#: apt.ent:244 +#: apt.ent:58 #, no-wrap msgid "" "