diff options
56 files changed, 1061 insertions, 957 deletions
diff --git a/.gitignore b/.gitignore index 3e07e241b..321b15471 100644 --- a/.gitignore +++ b/.gitignore @@ -31,7 +31,12 @@ /debian/apt-transport-https/ # generated from *.in files +/cmdline/apt-key +/doc/apt-vendor.ent /doc/examples/sources.list /debian/libapt-pkg*.install /debian/libapt-inst*.install /debian/libapt-pkg-dev.install +/vendor/current +/vendor/debian/sources.list +/vendor/ubuntu/sources.list @@ -11,6 +11,7 @@ default: startup all .PHONY: headers library clean veryclean all binary program doc test update-po all headers library clean veryclean binary program doc manpages debiandoc test update-po startup dirs: + $(MAKE) -C vendor $@ $(MAKE) -C apt-pkg $@ $(MAKE) -C apt-inst $@ $(MAKE) -C apt-private $@ @@ -20,7 +21,7 @@ all headers library clean veryclean binary program doc manpages debiandoc test u $(MAKE) -C dselect $@ $(MAKE) -C doc $@ $(MAKE) -C po $@ - $(MAKE) -C test $@ + $(MAKE) -C test $@ all headers library clean veryclean binary program doc manpages debiandoc test update-po: startup dirs diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index 3a6bdfe2e..7fbe4d604 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -1545,6 +1545,9 @@ bool FileFd::Skip(unsigned long long Over) /* */ bool FileFd::Truncate(unsigned long long To) { + // truncating /dev/null is always successful - as we get an error otherwise + if (To == 0 && FileName == "/dev/null") + return true; #if defined HAVE_ZLIB || defined HAVE_BZ2 if (d != NULL && (d->gz != NULL || d->bz2 != NULL)) return FileFdError("Truncating compressed files is not implemented (%s)", FileName.c_str()); diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc index b597b6f3c..504877558 100644 --- a/apt-pkg/deb/debmetaindex.cc +++ b/apt-pkg/deb/debmetaindex.cc @@ -1,4 +1,3 @@ -// ijones, walters #include <config.h> #include <apt-pkg/debmetaindex.h> @@ -72,6 +71,22 @@ string debReleaseIndex::MetaIndexURI(const char *Type) const return Res; } +#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13) +std::string debReleaseIndex::LocalFileName() const +{ + // see if we have a InRelease file + std::string PathInRelease = MetaIndexFile("InRelease"); + if (FileExists(PathInRelease)) + return PathInRelease; + + // and if not return the normal one + if (FileExists(PathInRelease)) + return MetaIndexFile("Release"); + + return ""; +} +#endif + string debReleaseIndex::IndexURISuffix(const char *Type, string const &Section, string const &Arch) const { string Res =""; diff --git a/apt-pkg/deb/debmetaindex.h b/apt-pkg/deb/debmetaindex.h index b9ecab97c..cef8d68f7 100644 --- a/apt-pkg/deb/debmetaindex.h +++ b/apt-pkg/deb/debmetaindex.h @@ -3,6 +3,7 @@ #define PKGLIB_DEBMETAINDEX_H #include <apt-pkg/metaindex.h> +#include <apt-pkg/init.h> #include <map> #include <string> @@ -39,9 +40,15 @@ class debReleaseIndex : public metaIndex { virtual bool GetIndexes(pkgAcquire *Owner, bool const &GetAll=false) const; std::vector <struct IndexTarget *>* ComputeIndexTargets() const; std::string Info(const char *Type, std::string const &Section, std::string const &Arch="") const; + std::string MetaIndexInfo(const char *Type) const; std::string MetaIndexFile(const char *Types) const; std::string MetaIndexURI(const char *Type) const; + +#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13) + virtual std::string LocalFileName() const; +#endif + std::string IndexURI(const char *Type, std::string const &Section, std::string const &Arch="native") const; std::string IndexURISuffix(const char *Type, std::string const &Section, std::string const &Arch="native") const; std::string SourceIndexURI(const char *Type, const std::string &Section) const; diff --git a/apt-pkg/indexfile.h b/apt-pkg/indexfile.h index 1d34dc773..2d433b60a 100644 --- a/apt-pkg/indexfile.h +++ b/apt-pkg/indexfile.h @@ -78,10 +78,10 @@ class pkgIndexFile virtual bool Exists() const = 0; virtual bool HasPackages() const = 0; virtual unsigned long Size() const = 0; - virtual bool Merge(pkgCacheGenerator &/*Gen*/,OpProgress* /*Prog*/) const { return false; }; + virtual bool Merge(pkgCacheGenerator &Gen, OpProgress* Prog) const { return false; }; __deprecated virtual bool Merge(pkgCacheGenerator &Gen, OpProgress &Prog) const { return Merge(Gen, &Prog); }; - virtual bool MergeFileProvides(pkgCacheGenerator &/*Gen*/,OpProgress* /*Prog*/) const {return true;}; + virtual bool MergeFileProvides(pkgCacheGenerator &Gen,OpProgress* Prog) const {return true;}; __deprecated virtual bool MergeFileProvides(pkgCacheGenerator &Gen, OpProgress &Prog) const {return MergeFileProvides(Gen, &Prog);}; virtual pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const; diff --git a/apt-pkg/indexrecords.cc b/apt-pkg/indexrecords.cc index 8a72ca151..f8097c3c6 100644 --- a/apt-pkg/indexrecords.cc +++ b/apt-pkg/indexrecords.cc @@ -27,6 +27,11 @@ string indexRecords::GetDist() const return this->Dist; } +string indexRecords::GetSuite() const +{ + return this->Suite; +} + bool indexRecords::CheckDist(const string MaybeDist) const { return (this->Dist == MaybeDist diff --git a/apt-pkg/indexrecords.h b/apt-pkg/indexrecords.h index a98b939bc..d003ec0fa 100644 --- a/apt-pkg/indexrecords.h +++ b/apt-pkg/indexrecords.h @@ -46,6 +46,7 @@ class indexRecords virtual bool Load(std::string Filename); std::string GetDist() const; + std::string GetSuite() const; time_t GetValidUntil() const; virtual bool CheckDist(const std::string MaybeDist) const; std::string GetExpectedDist() const; diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc index 4818174ac..a2e58fae2 100644 --- a/apt-pkg/init.cc +++ b/apt-pkg/init.cc @@ -44,16 +44,8 @@ bool pkgInitConfig(Configuration &Cnf) Cnf.CndSet("APT::Install-Suggests", false); Cnf.CndSet("Dir","/"); - // State + // State Cnf.CndSet("Dir::State","var/lib/apt/"); - - /* Just in case something goes horribly wrong, we can fall back to the - old /var/state paths.. */ - struct stat St; - if (stat("/var/lib/apt/.",&St) != 0 && - stat("/var/state/apt/.",&St) == 0) - Cnf.CndSet("Dir::State","var/state/apt/"); - Cnf.CndSet("Dir::State::lists","lists/"); Cnf.CndSet("Dir::State::cdroms","cdroms.list"); Cnf.CndSet("Dir::State::mirrors","mirrors/"); diff --git a/apt-pkg/metaindex.h b/apt-pkg/metaindex.h index 5783735ff..18a90a29d 100644 --- a/apt-pkg/metaindex.h +++ b/apt-pkg/metaindex.h @@ -5,6 +5,7 @@ #include <string> #include <apt-pkg/pkgcache.h> #include <apt-pkg/indexfile.h> +#include <apt-pkg/init.h> #ifndef APT_8_CLEANER_HEADERS #include <apt-pkg/srcrecords.h> @@ -28,27 +29,36 @@ class metaIndex public: - // Various accessors virtual std::string GetURI() const {return URI;} virtual std::string GetDist() const {return Dist;} virtual const char* GetType() const {return Type;} + // interface to to query it +#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13) + // returns the path of the local file (or "" if its not available) + virtual std::string LocalFileName() const {return "";}; +#endif + // Interface for acquire - virtual std::string ArchiveURI(std::string const& /*File*/) const = 0; + virtual std::string ArchiveURI(std::string const& File) const = 0; virtual bool GetIndexes(pkgAcquire *Owner, bool const &GetAll=false) const = 0; - virtual std::vector<pkgIndexFile *> *GetIndexFiles() = 0; virtual bool IsTrusted() const = 0; - metaIndex(std::string const &URI, std::string const &Dist, char const * const Type) : - Indexes(NULL), Type(Type), URI(URI), Dist(Dist) { + metaIndex(std::string const &URI, std::string const &Dist, + char const * const Type) + : Indexes(NULL), Type(Type), URI(URI), Dist(Dist) + { + /* nothing */ } - virtual ~metaIndex() { + virtual ~metaIndex() + { if (Indexes == 0) return; - for (std::vector<pkgIndexFile *>::iterator I = (*Indexes).begin(); I != (*Indexes).end(); ++I) + for (std::vector<pkgIndexFile *>::iterator I = (*Indexes).begin(); + I != (*Indexes).end(); ++I) delete *I; delete Indexes; } diff --git a/buildlib/po4a_manpage.mak b/buildlib/po4a_manpage.mak index 1e778cf11..b3d586b2f 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 apt-verbatim.ent +INCLUDES = apt.ent apt-verbatim.ent apt-vendor.ent manpages: @@ -29,7 +29,10 @@ clean: clean/$(LOCAL) veryclean: veryclean/$(LOCAL) apt-verbatim.ent: ../apt-verbatim.ent - cp ../apt-verbatim.ent . + cp -a ../apt-verbatim.ent . + +apt-vendor.ent: ../apt-vendor.ent + cp -a ../apt-vendor.ent . manpage-style.xsl: ../manpage-style.xsl sed "/<!-- LANGUAGE -->/ i\ diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 4ed56ef0d..42e2b06ce 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -50,6 +50,8 @@ #include <apt-pkg/pkgrecords.h> #include <apt-pkg/indexfile.h> #include <apt-pkg/upgrade.h> +#include <apt-pkg/metaindex.h> +#include <apt-pkg/indexrecords.h> #include <apt-private/private-download.h> #include <apt-private/private-install.h> @@ -61,6 +63,8 @@ #include <apt-private/private-moo.h> #include <apt-private/private-utils.h> +#include <apt-pkg/debmetaindex.h> + #include <apt-private/acqprogress.h> #include <set> @@ -130,22 +134,80 @@ bool TryToInstallBuildDep(pkgCache::PkgIterator Pkg,pkgCacheFile &Cache, return true; } /*}}}*/ + + +// helper that can go wit hthe next ABI break +#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR < 13) +std::string MetaIndexFileNameOnDisk(metaIndex *metaindex) +{ + // FIXME: this cast is the horror, the horror + debReleaseIndex *r = (debReleaseIndex*)metaindex; + + // see if we have a InRelease file + std::string PathInRelease = r->MetaIndexFile("InRelease"); + if (FileExists(PathInRelease)) + return PathInRelease; + + // and if not return the normal one + if (FileExists(PathInRelease)) + return r->MetaIndexFile("Release"); + + return ""; +} +#endif + +// GetReleaseForSourceRecord - Return Suite for the given srcrecord /*{{{*/ +// --------------------------------------------------------------------- +/* */ +std::string GetReleaseForSourceRecord(pkgSourceList *SrcList, + pkgSrcRecords::Parser *Parse) +{ + // try to find release + const pkgIndexFile& CurrentIndexFile = Parse->Index(); + + for (pkgSourceList::const_iterator S = SrcList->begin(); + S != SrcList->end(); ++S) + { + vector<pkgIndexFile *> *Indexes = (*S)->GetIndexFiles(); + for (vector<pkgIndexFile *>::const_iterator IF = Indexes->begin(); + IF != Indexes->end(); ++IF) + { + if (&CurrentIndexFile == (*IF)) + { +#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR < 13) + std::string path = MetaIndexFileNameOnDisk(*S); +#else + std::string path = (*S)->LocalFileName(); +#endif + if (path != "") + { + indexRecords records; + records.Load(path); + return records.GetSuite(); + } + } + } + } + return ""; +} + /*}}}*/ // FindSrc - Find a source record /*{{{*/ // --------------------------------------------------------------------- /* */ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs, pkgSrcRecords &SrcRecs,string &Src, - pkgDepCache &Cache) + CacheFile &CacheFile) { string VerTag; - string DefRel = _config->Find("APT::Default-Release"); + string RelTag = _config->Find("APT::Default-Release"); string TmpSrc = Name; + pkgDepCache *Cache = CacheFile.GetDepCache(); // extract the version/release from the pkgname const size_t found = TmpSrc.find_last_of("/="); if (found != string::npos) { if (TmpSrc[found] == '/') - DefRel = TmpSrc.substr(found+1); + RelTag = TmpSrc.substr(found+1); else VerTag = TmpSrc.substr(found+1); TmpSrc = TmpSrc.substr(0,found); @@ -155,10 +217,10 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs, install a version and determine the source package name, then look in the archive for a source package of the same name. */ bool MatchSrcOnly = _config->FindB("APT::Get::Only-Source"); - const pkgCache::PkgIterator Pkg = Cache.FindPkg(TmpSrc); + const pkgCache::PkgIterator Pkg = Cache->FindPkg(TmpSrc); if (MatchSrcOnly == false && Pkg.end() == false) { - if(VerTag.empty() == false || DefRel.empty() == false) + if(VerTag.empty() == false || RelTag.empty() == false) { bool fuzzy = false; // we have a default release, try to locate the pkg. we do it like @@ -180,7 +242,7 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs, } // We match against a concrete version (or a part of this version) if (VerTag.empty() == false && - (fuzzy == true || Cache.VS().CmpVersion(VerTag, Ver.VerStr()) != 0) && // exact match + (fuzzy == true || Cache->VS().CmpVersion(VerTag, Ver.VerStr()) != 0) && // exact match (fuzzy == false || strncmp(VerTag.c_str(), Ver.VerStr(), VerTag.size()) != 0)) // fuzzy match continue; @@ -198,8 +260,8 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs, // or we match against a release if(VerTag.empty() == false || - (VF.File().Archive() != 0 && VF.File().Archive() == DefRel) || - (VF.File().Codename() != 0 && VF.File().Codename() == DefRel)) + (VF.File().Archive() != 0 && VF.File().Archive() == RelTag) || + (VF.File().Codename() != 0 && VF.File().Codename() == RelTag)) { pkgRecords::Parser &Parse = Recs.Lookup(VF); Src = Parse.SourcePkg(); @@ -217,22 +279,14 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs, if (Src.empty() == false) break; } - if (Src.empty() == true) - { - // Sources files have no codename information - if (VerTag.empty() == true && DefRel.empty() == false) - { - _error->Error(_("Ignore unavailable target release '%s' of package '%s'"), DefRel.c_str(), TmpSrc.c_str()); - return 0; - } - } } if (Src.empty() == true) { // if we don't have found a fitting package yet so we will // choose a good candidate and proceed with that. // Maybe we will find a source later on with the right VerTag - pkgCache::VerIterator Ver = Cache.GetCandidateVer(Pkg); + // or RelTag + pkgCache::VerIterator Ver = Cache->GetCandidateVer(Pkg); if (Ver.end() == false) { pkgRecords::Parser &Parse = Recs.Lookup(Ver.FileList()); @@ -244,7 +298,9 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs, } if (Src.empty() == true) + { Src = TmpSrc; + } else { /* if we have a source pkg name, make sure to only search @@ -262,6 +318,7 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs, pkgSrcRecords::Parser *Last = 0; unsigned long Offset = 0; string Version; + pkgSourceList *SrcList = CacheFile.GetSourceList(); /* Iterate over all of the hits, which includes the resulting binary packages in the search */ @@ -273,25 +330,40 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs, { const string Ver = Parse->Version(); + // See if we need to look for a specific release tag + if (RelTag != "") + { + const string Rel = GetReleaseForSourceRecord(SrcList, Parse); + + if (Rel == RelTag) + { + ioprintf(c1out, "Selectied version '%s' (%s) for %s\n", + Ver.c_str(), RelTag.c_str(), Src.c_str()); + Last = Parse; + Offset = Parse->Offset(); + break; + } + } + // Ignore all versions which doesn't fit if (VerTag.empty() == false && - Cache.VS().CmpVersion(VerTag, Ver) != 0) // exact match + Cache->VS().CmpVersion(VerTag, Ver) != 0) // exact match continue; // Newer version or an exact match? Save the hit - if (Last == 0 || Cache.VS().CmpVersion(Version,Ver) < 0) { + if (Last == 0 || Cache->VS().CmpVersion(Version,Ver) < 0) { Last = Parse; Offset = Parse->Offset(); Version = Ver; } - // was the version check above an exact match? If so, we don't need to look further - if (VerTag.empty() == false && VerTag.size() == Ver.size()) + // was the version check above an exact match? + // If so, we don't need to look further + if (VerTag.empty() == false && (VerTag == Ver)) break; } if (Last != 0 || VerTag.empty() == true) break; - //if (VerTag.empty() == false && Last == 0) _error->Error(_("Ignore unavailable version '%s' of package '%s'"), VerTag.c_str(), TmpSrc.c_str()); return 0; } @@ -628,7 +700,7 @@ bool DoSource(CommandLine &CmdL) for (const char **I = CmdL.FileList + 1; *I != 0; I++, J++) { string Src; - pkgSrcRecords::Parser *Last = FindSrc(*I,Recs,SrcRecs,Src,*Cache); + pkgSrcRecords::Parser *Last = FindSrc(*I,Recs,SrcRecs,Src,Cache); if (Last == 0) { delete[] Dsc; @@ -925,7 +997,7 @@ bool DoBuildDep(CommandLine &CmdL) for (const char **I = CmdL.FileList + 1; *I != 0; I++, J++) { string Src; - pkgSrcRecords::Parser *Last = FindSrc(*I,Recs,SrcRecs,Src,*Cache); + pkgSrcRecords::Parser *Last = FindSrc(*I,Recs,SrcRecs,Src,Cache); if (Last == 0) return _error->Error(_("Unable to find a source package for %s"),Src.c_str()); diff --git a/cmdline/apt-key b/cmdline/apt-key.in index b9cfe1e34..779872b4c 100755..100644 --- a/cmdline/apt-key +++ b/cmdline/apt-key.in @@ -25,14 +25,13 @@ GPG_CMD="$GPG_CMD --no-auto-check-trustdb --trust-model always" GPG="$GPG_CMD" -# ubuntu keyrings -MASTER_KEYRING=/usr/share/keyrings/ubuntu-master-keyring.gpg +MASTER_KEYRING='&keyring-master-filename;' eval $(apt-config shell MASTER_KEYRING APT::Key::MasterKeyring) -ARCHIVE_KEYRING=/usr/share/keyrings/ubuntu-archive-keyring.gpg +ARCHIVE_KEYRING='&keyring-filename;' eval $(apt-config shell ARCHIVE_KEYRING APT::Key::ArchiveKeyring) -REMOVED_KEYS=/usr/share/keyrings/ubuntu-archive-removed-keys.gpg +REMOVED_KEYS='&keyring-removed-filename;' eval $(apt-config shell REMOVED_KEYS APT::Key::RemovedKeys) -ARCHIVE_KEYRING_URI=http://archive.ubuntu.com/ubuntu/project/ubuntu-archive-keyring.gpg +ARCHIVE_KEYRING_URI='&keyring-uri;' eval $(apt-config shell ARCHIVE_KEYRING_URI APT::Key::ArchiveKeyringURI) TMP_KEYRING=/var/lib/apt/keyrings/maybe-import-keyring.gpg @@ -143,7 +142,7 @@ net_update() { update() { if [ ! -f $ARCHIVE_KEYRING ]; then echo >&2 "ERROR: Can't find the archive-keyring" - echo >&2 "Is the ubuntu-keyring package installed?" + echo >&2 "Is the &keyring-package; package installed?" exit 1 fi requires_root diff --git a/cmdline/makefile b/cmdline/makefile index e77ad5669..06f170b6a 100644 --- a/cmdline/makefile +++ b/cmdline/makefile @@ -41,6 +41,14 @@ SOURCE = apt-cdrom.cc include $(PROGRAM_H) # The apt-key program +apt-key: apt-key.in + sed -e "s#&keyring-filename;#$(shell ../vendor/getinfo keyring-filename)#" \ + -e "s#&keyring-removed-filename;#$(shell ../vendor/getinfo keyring-removed-filename)#" \ + -e "s#&keyring-master-filename;#$(shell ../vendor/getinfo keyring-master-filename)#" \ + -e "s#&keyring-uri;#$(shell ../vendor/getinfo keyring-uri)#" \ + -e "s#&keyring-package;#$(shell ../vendor/getinfo keyring-package)#" $< > $@ + chmod 755 $@ + SOURCE=apt-key TO=$(BIN) TARGET=program diff --git a/debian/control b/debian/control index 9b5e4ced2..fc8f75c3b 100644 --- a/debian/control +++ b/debian/control @@ -18,7 +18,7 @@ XS-Testsuite: autopkgtest Package: apt Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ubuntu-keyring, gnupg +Depends: ${shlibs:Depends}, ${misc:Depends}, ${apt:keyring}, gnupg Replaces: manpages-pl (<< 20060617-3~), manpages-it (<< 2.80-4~) Breaks: manpages-pl (<< 20060617-3~), manpages-it (<< 2.80-4~) Conflicts: python-apt (<< 0.7.93.2~) diff --git a/debian/preinst b/debian/preinst deleted file mode 100755 index 985ad9b84..000000000 --- a/debian/preinst +++ /dev/null @@ -1,32 +0,0 @@ -#! /bin/sh - -set -e - -# dpkg does this for us while we are upgrading.. -#if [ "$1" = "upgrade" -a -L /var/state/apt -a -e /var/lib/apt -a ! -L /var/state/apt ] && dpkg --compare-versions "$2" ">=" "0.4.10"; then -# rm /var/state/apt -#fi - -if [ "$1" = "upgrade" -o "$1" = "install" -a "$2" != "" ]; then - if [ ! -e /var/lib/apt -a -e /var/state/apt ]; then - # upgrading from /var/state/apt using apt. - # it's probably running now so we want to ensure /var/state/apt - # is still valid afterwards. and since we're upgrading - - if [ -x /usr/bin/perl -a -d /var/state/apt -a ! -L /var/state/apt ] && - perl -e 'exit 1 if ((stat("/var/lib"))[0] != (stat("/var/state/apt"))[0])' - then - # same fs, we can mv it - mv /var/state/apt /var/lib/apt - ln -s ../lib/apt /var/state/apt - # note that this symlink (/var/state/apt) will be removed when - # dpkg finishes unpacking the apt we're about to install; this is okay - else - # scary, let's just symlink it and hope - ln -s /var/state/apt /var/lib/apt - fi - fi - touch /var/lib/apt/lists/partial/.delete-me-later || true -fi - -#DEBHELPER# diff --git a/debian/rules b/debian/rules index 043f5647b..4fe81246b 100755 --- a/debian/rules +++ b/debian/rules @@ -221,7 +221,7 @@ apt: build-binary build-manpages debian/apt.install dh_fixperms -p$@ dh_installdeb -p$@ dh_shlibdeps -p$@ - dh_gencontrol -p$@ + dh_gencontrol -p$@ -- -Vapt:keyring="$(shell ./vendor/getinfo keyring-package)" dh_md5sums -p$@ dh_builddeb -p$@ diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml index 0955c1c9e..a53a64446 100644 --- a/doc/apt-cache.8.xml +++ b/doc/apt-cache.8.xml @@ -8,6 +8,8 @@ <!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent"> %aptverbatiment; +<!ENTITY % aptvendor SYSTEM "apt-vendor.ent"> +%aptvendor; ]> <refentry> diff --git a/doc/apt-cdrom.8.xml b/doc/apt-cdrom.8.xml index b076a98a3..2fcd8e494 100644 --- a/doc/apt-cdrom.8.xml +++ b/doc/apt-cdrom.8.xml @@ -8,6 +8,8 @@ <!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent"> %aptverbatiment; +<!ENTITY % aptvendor SYSTEM "apt-vendor.ent"> +%aptvendor; ]> <refentry> diff --git a/doc/apt-config.8.xml b/doc/apt-config.8.xml index 39205e737..b84d25f7a 100644 --- a/doc/apt-config.8.xml +++ b/doc/apt-config.8.xml @@ -8,6 +8,8 @@ <!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent"> %aptverbatiment; +<!ENTITY % aptvendor SYSTEM "apt-vendor.ent"> +%aptvendor; ]> <refentry> diff --git a/doc/apt-extracttemplates.1.xml b/doc/apt-extracttemplates.1.xml index 4374c5ec3..d27e05075 100644 --- a/doc/apt-extracttemplates.1.xml +++ b/doc/apt-extracttemplates.1.xml @@ -8,6 +8,8 @@ <!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent"> %aptverbatiment; +<!ENTITY % aptvendor SYSTEM "apt-vendor.ent"> +%aptvendor; ]> <refentry> diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml index 91fdfe1e0..6482b4632 100644 --- a/doc/apt-ftparchive.1.xml +++ b/doc/apt-ftparchive.1.xml @@ -8,6 +8,8 @@ <!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent"> %aptverbatiment; +<!ENTITY % aptvendor SYSTEM "apt-vendor.ent"> +%aptvendor; ]> <refentry> diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index 4c050ec03..90f2b40f7 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -8,6 +8,8 @@ <!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent"> %aptverbatiment; +<!ENTITY % aptvendor SYSTEM "apt-vendor.ent"> +%aptvendor; ]> <refentry> diff --git a/doc/apt-key.8.xml b/doc/apt-key.8.xml index 9d51f4f7b..5dbbaaf26 100644 --- a/doc/apt-key.8.xml +++ b/doc/apt-key.8.xml @@ -8,6 +8,8 @@ <!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent"> %aptverbatiment; +<!ENTITY % aptvendor SYSTEM "apt-vendor.ent"> +%aptvendor; ]> <refentry> @@ -130,7 +132,7 @@ Update the local keyring with the archive keyring and remove from the local keyring the archive keys which are no longer valid. The archive keyring is shipped in the <literal>archive-keyring</literal> package of your - distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in Ubuntu. + distribution, e.g. the &keyring-package; package in &keyring-distro;. </para> @@ -180,12 +182,12 @@ <listitem><para>Local trust database of archive keys.</para></listitem> </varlistentry> - <varlistentry><term><filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename></term> - <listitem><para>Keyring of Ubuntu archive trusted keys.</para></listitem> + <varlistentry><term>&keyring-filename;</term> + <listitem><para>Keyring of &keyring-distro; archive trusted keys.</para></listitem> </varlistentry> - <varlistentry><term><filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename></term> - <listitem><para>Keyring of Ubuntu archive removed trusted keys.</para></listitem> + <varlistentry><term>&keyring-removed-filename;</term> + <listitem><para>Keyring of &keyring-distro; archive removed trusted keys.</para></listitem> </varlistentry> </variablelist> diff --git a/doc/apt-mark.8.xml b/doc/apt-mark.8.xml index 3503ece8f..d00e5b9e2 100644 --- a/doc/apt-mark.8.xml +++ b/doc/apt-mark.8.xml @@ -8,6 +8,8 @@ <!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent"> %aptverbatiment; +<!ENTITY % aptvendor SYSTEM "apt-vendor.ent"> +%aptvendor; ]> <refentry> diff --git a/doc/apt-secure.8.xml b/doc/apt-secure.8.xml index 8cdfe3ab6..981351615 100644 --- a/doc/apt-secure.8.xml +++ b/doc/apt-secure.8.xml @@ -8,6 +8,8 @@ <!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent"> %aptverbatiment; +<!ENTITY % aptvendor SYSTEM "apt-vendor.ent"> +%aptvendor; ]> <refentry> @@ -103,10 +105,10 @@ the maintainer signature is stripped off, and checksums of the package are computed and put in the Packages file. The checksums of all of the Packages files are then computed and put into the Release file. The - Release file is then signed by the archive key for this Debian release, + Release file is then signed by the archive key for this &keyring-distro; release, and distributed alongside the packages and the Packages files on - Debian mirrors. The keys are in the Debian archive keyring available in - the <package>debian-archive-keyring</package> package. + &keyring-distro; mirrors. The keys are in the &keyring-distro; archive keyring + available in the &keyring-package; package. </para> <para> diff --git a/doc/apt-sortpkgs.1.xml b/doc/apt-sortpkgs.1.xml index 482035b37..9bb03d624 100644 --- a/doc/apt-sortpkgs.1.xml +++ b/doc/apt-sortpkgs.1.xml @@ -8,6 +8,8 @@ <!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent"> %aptverbatiment; +<!ENTITY % aptvendor SYSTEM "apt-vendor.ent"> +%aptvendor; ]> <refentry> diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent index 0d0d95c7a..30b0c7fe0 100644 --- a/doc/apt-verbatim.ent +++ b/doc/apt-verbatim.ent @@ -221,11 +221,11 @@ <!-- this will be updated by 'prepare-release' --> <!ENTITY apt-product-version "0.9.7.6ubuntu2"> -<!-- Codenames for debian releases --> +<!-- (Code)names for various things used all over the place --> <!ENTITY oldstable-codename "squeeze"> <!ENTITY stable-codename "wheezy"> <!ENTITY testing-codename "jessie"> -<!ENTITY stable-version "7.0"> +<!ENTITY stable-version "7"> <!ENTITY ubuntu-codename "precise"> <!-- good and bad just refers to matching and not matching a pattern… diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index 428c0d2db..bfc43ba29 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -8,6 +8,8 @@ <!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent"> %aptverbatiment; +<!ENTITY % aptvendor SYSTEM "apt-vendor.ent"> +%aptvendor; ]> <refentry> diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml index f56958fcc..d8c3efab7 100644 --- a/doc/apt_preferences.5.xml +++ b/doc/apt_preferences.5.xml @@ -8,6 +8,8 @@ <!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent"> %aptverbatiment; +<!ENTITY % aptvendor SYSTEM "apt-vendor.ent"> +%aptvendor; ]> <refentry> diff --git a/doc/en/makefile b/doc/en/makefile index a4fb232d4..247ce38b5 100644 --- a/doc/en/makefile +++ b/doc/en/makefile @@ -9,12 +9,15 @@ include ../../buildlib/defaults.mak ifdef XSLTPROC # generate a list of accepted man page translations SOURCE = $(patsubst ../%.xml,%,$(wildcard ../*.?.xml)) -INCLUDES = ../apt.ent ../apt-verbatim.ent +INCLUDES = ../apt.ent ../apt-verbatim.ent apt-vendor.ent STYLESHEET=../manpage-style.xsl LOCAL := manpage-$(firstword $(SOURCE)) $(LOCAL)-LIST := $(SOURCE) +apt-vendor.ent: ../../vendor/current/apt-vendor.ent + ln -sf $(shell readlink -f $^) $@ + # Install generation hooks manpages: $($(LOCAL)-LIST) apt.8 @@ -30,7 +33,7 @@ apt.8: ../apt.8 veryclean: clean/$(LOCAL) clean: clean/$(LOCAL) clean/$(LOCAL): - -rm -rf $($(@F)-LIST) apt.8 + -rm -rf $($(@F)-LIST) apt.8 apt-vendor.ent endif # Chain to the manpage rule diff --git a/doc/makefile b/doc/makefile index 266caa990..49f3e1b56 100644 --- a/doc/makefile +++ b/doc/makefile @@ -12,8 +12,11 @@ include $(DEBIANDOC_H) doc: manpages debiandoc -examples/sources.list: examples/sources.list.in apt-verbatim.ent - sed -e 's#&ubuntu-codename;#$(shell grep --max-count=1 '^<!ENTITY ubuntu-codename "' apt-verbatim.ent | cut -d'"' -f 2)#g' examples/sources.list.in > examples/sources.list +examples/sources.list: ../vendor/current/sources.list + ln -sf $(shell readlink -f $^) $@ + +apt-vendor.ent: ../vendor/current/apt-vendor.ent + ln -sf $(shell readlink -f $^) $@ # Examples SOURCE = examples/apt.conf examples/sources.list examples/configure-index examples/apt-https-method-example.conf @@ -23,9 +26,9 @@ include $(COPY_H) .PHONY: clean clean/subdirs veryclean veryclean/subdirs manpages/subdirs debiandoc/subdirs all binary doc stats -clean: clean/subdirs -veryclean: veryclean/subdirs -manpages: manpages/subdirs +clean: clean/subdirs clean/examples +veryclean: veryclean/subdirs clean/examples +manpages: manpages/subdirs apt-vendor.ent debiandoc: debiandoc/subdirs DOCUMENTATIONPO = $(patsubst %.po,%,$(notdir $(wildcard po/*.po))) @@ -41,6 +44,10 @@ debiandoc/subdirs manpages/subdirs clean/subdirs veryclean/subdirs: $(MAKE) -C $$dir $(patsubst %/subdirs,%,$@); \ done +clean/examples: + rm -f examples/sources.list + rm -f apt-vendor.ent + stats: for i in po/*.po; do echo -n "$$i: "; msgfmt --output-file=/dev/null --statistics $$i; done diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index 85368895d..43e14b779 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: apt-doc 0.9.9ubuntu1\n" +"Project-Id-Version: apt-doc 0.9.8.1\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-07-02 17:09+0300\n" +"POT-Creation-Date: 2013-06-13 13:46+0300\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" @@ -1110,7 +1110,7 @@ msgid "Files" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131 apt-secure.8.xml:191 apt-cdrom.8.xml:152 apt-config.8.xml:109 apt.conf.5.xml:1173 apt_preferences.5.xml:705 sources.list.5.xml:252 apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63 apt-ftparchive.1.xml:607 +#: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131 apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109 apt.conf.5.xml:1173 apt_preferences.5.xml:705 sources.list.5.xml:252 apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63 apt-ftparchive.1.xml:607 msgid "See Also" msgstr "" @@ -1123,7 +1123,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:534 apt-cache.8.xml:355 apt-mark.8.xml:135 apt-cdrom.8.xml:157 apt-config.8.xml:114 apt-extracttemplates.1.xml:74 apt-sortpkgs.1.xml:67 apt-ftparchive.1.xml:611 +#: apt-get.8.xml:534 apt-cache.8.xml:355 apt-mark.8.xml:135 apt-cdrom.8.xml:149 apt-config.8.xml:114 apt-extracttemplates.1.xml:74 apt-sortpkgs.1.xml:67 apt-ftparchive.1.xml:611 msgid "Diagnostics" msgstr "" @@ -1620,8 +1620,8 @@ msgid "" "Update the local keyring with the archive keyring and remove from the local " "keyring the archive keys which are no longer valid. The archive keyring is " "shipped in the <literal>archive-keyring</literal> package of your " -"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in " -"Ubuntu." +"distribution, e.g. the &keyring-package; package in " +"&keyring-distro;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> @@ -1670,22 +1670,22 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:183 -msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>" +msgid "&keyring-filename;" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:184 -msgid "Keyring of Ubuntu archive trusted keys." +msgid "Keyring of &keyring-distro; archive trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:187 -msgid "<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>" +msgid "&keyring-removed-filename;" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:188 -msgid "Keyring of Ubuntu archive removed trusted keys." +msgid "Keyring of &keyring-distro; archive removed trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><para> @@ -1862,10 +1862,10 @@ msgid "" "maintainer signature is stripped off, and checksums of the package are " "computed and put in the Packages file. The checksums of all of the Packages " "files are then computed and put into the Release file. The Release file is " -"then signed by the archive key for this Debian release, and distributed " -"alongside the packages and the Packages files on Debian mirrors. The keys " -"are in the Debian archive keyring available in the " -"<package>debian-archive-keyring</package> package." +"then signed by the archive key for this &keyring-distro; release, and distributed " +"alongside the packages and the Packages files on &keyring-distro; mirrors. The keys " +"are in the &keyring-distro; archive keyring available in the " +"&keyring-package; package." msgstr "" #. type: Content of: <refentry><refsect1><para> @@ -2060,21 +2060,13 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cdrom.8.xml:85 msgid "" -"Do not try to auto-detect the CD-ROM path. Usually combined with the " -"<option>--cdrom</option> option. Configuration Item: " -"<literal>Acquire::cdrom::AutoDetect</literal>." -msgstr "" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:93 -msgid "" "Mount point; specify the location to mount the CD-ROM. This mount point must " "be listed in <filename>/etc/fstab</filename> and properly configured. " "Configuration Item: <literal>Acquire::cdrom::mount</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:102 +#: apt-cdrom.8.xml:94 msgid "" "Rename a disc; change the label of a disc or override the disc's given " "label. This option will cause <command>apt-cdrom</command> to prompt for a " @@ -2082,7 +2074,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:111 +#: apt-cdrom.8.xml:103 msgid "" "No mounting; prevent <command>apt-cdrom</command> from mounting and " "unmounting the mount point. Configuration Item: " @@ -2090,7 +2082,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:119 +#: apt-cdrom.8.xml:111 msgid "" "Fast Copy; Assume the package files are valid and do not check every " "package. This option should be used only if <command>apt-cdrom</command> has " @@ -2099,7 +2091,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:129 +#: apt-cdrom.8.xml:121 msgid "" "Thorough Package Scan; This option may be needed with some old Debian " "1.1/1.2 discs that have Package files in strange places. It takes much " @@ -2107,7 +2099,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:140 +#: apt-cdrom.8.xml:132 msgid "" "No Changes; Do not change the &sources-list; file and do not write index " "files. Everything is still checked however. Configuration Item: " @@ -2115,12 +2107,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-cdrom.8.xml:153 +#: apt-cdrom.8.xml:145 msgid "&apt-conf;, &apt-get;, &sources-list;" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-cdrom.8.xml:158 +#: apt-cdrom.8.xml:150 msgid "" "<command>apt-cdrom</command> returns zero on normal operation, decimal 100 " "on error." diff --git a/doc/po/de.po b/doc/po/de.po index 48804dd4c..808fcd126 100644 --- a/doc/po/de.po +++ b/doc/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 0.9.7\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-07-02 17:09+0300\n" +"POT-Creation-Date: 2013-06-13 13:46+0300\n" "PO-Revision-Date: 2012-06-25 22:49+0100\n" "Last-Translator: Chris Leick <c.leick@vollbio.de>\n" "Language-Team: German <debian-l10n-german@lists.debian.org>\n" @@ -763,9 +763,9 @@ msgid "" "installation or upgrading. Each package is a package name, not a fully " "qualified filename (for instance, in a Debian system, <package>apt-utils</" "package> would be the argument provided, not <filename>apt-utils_&apt-" -"product-version;_amd64.deb</filename>). All packages required by the package" -"(s) specified for installation will also be retrieved and installed. The " -"<filename>/etc/apt/sources.list</filename> file is used to locate the " +"product-version;_amd64.deb</filename>). All packages required by the " +"package(s) specified for installation will also be retrieved and installed. " +"The <filename>/etc/apt/sources.list</filename> file is used to locate the " "desired packages. If a hyphen is appended to the package name (with no " "intervening space), the identified package will be removed if it is " "installed. Similarly a plus sign can be used to designate a package to " @@ -1549,7 +1549,7 @@ msgstr "Dateien" #. type: Content of: <refentry><refsect1><title> #: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131 -#: apt-secure.8.xml:191 apt-cdrom.8.xml:152 apt-config.8.xml:109 +#: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109 #: apt.conf.5.xml:1173 apt_preferences.5.xml:705 sources.list.5.xml:252 #: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63 #: apt-ftparchive.1.xml:607 @@ -1569,7 +1569,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-get.8.xml:534 apt-cache.8.xml:355 apt-mark.8.xml:135 -#: apt-cdrom.8.xml:157 apt-config.8.xml:114 apt-extracttemplates.1.xml:74 +#: apt-cdrom.8.xml:149 apt-config.8.xml:114 apt-extracttemplates.1.xml:74 #: apt-sortpkgs.1.xml:67 apt-ftparchive.1.xml:611 msgid "Diagnostics" msgstr "Diagnose" @@ -2261,25 +2261,18 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:130 -#, fuzzy -#| msgid "" -#| "Update the local keyring with the archive keyring and remove from the " -#| "local keyring the archive keys which are no longer valid. The archive " -#| "keyring is shipped in the <literal>archive-keyring</literal> package of " -#| "your distribution, e.g. the <literal>debian-archive-keyring</literal> " -#| "package in Debian." msgid "" "Update the local keyring with the archive keyring and remove from the local " "keyring the archive keys which are no longer valid. The archive keyring is " "shipped in the <literal>archive-keyring</literal> package of your " -"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in " -"Ubuntu." +"distribution, e.g. the &keyring-package; package in " +"&keyring-distro;." msgstr "" "aktualisiert den lokalen Schlüsselbund mit dem Archivschlüsselbund und " "entfernt die Archivschlüssel, die nicht länger gültig sind, aus dem lokalen " "Schlüsselbund. Der Archivschlüsselbund wird im Paket <literal>archive-" "keyring</literal> Ihrer Distribution mitgeliefert, z.B. dem Paket " -"<literal>debian-archive-keyring</literal> in Debian." +"&keyring-package; in &keyring-distro;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:144 @@ -2342,35 +2335,26 @@ msgstr "lokale Datenbank vertrauenswürdiger Archivschlüssel" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:183 -#, fuzzy -#| msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" -msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>" -msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" +msgid "&keyring-filename;" +msgstr "&keyring-filename;" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:184 -#, fuzzy -#| msgid "Keyring of Debian archive trusted keys." -msgid "Keyring of Ubuntu archive trusted keys." -msgstr "Schlüsselbund vertrauenswürdiger Schlüssel des Debian-Archivs" +msgid "Keyring of &keyring-distro; archive trusted keys." +msgstr "Schlüsselbund vertrauenswürdiger Schlüssel des &keyring-distro;-Archivs" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:187 -#, fuzzy -#| msgid "" -#| "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" msgid "" -"<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>" +"&keyring-removed-filename;" msgstr "" -"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" +"&keyring-removed-filename;" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:188 -#, fuzzy -#| msgid "Keyring of Debian archive removed trusted keys." -msgid "Keyring of Ubuntu archive removed trusted keys." +msgid "Keyring of &keyring-distro; archive removed trusted keys." msgstr "" -"Schlüsselbund entfernter vertrauenswürdiger Schlüssel des Debian-Archivs" +"Schlüsselbund entfernter vertrauenswürdiger Schlüssel des &keyring-distro;-Archivs" #. type: Content of: <refentry><refsect1><para> #: apt-key.8.xml:197 @@ -2616,19 +2600,19 @@ msgid "" "maintainer signature is stripped off, and checksums of the package are " "computed and put in the Packages file. The checksums of all of the Packages " "files are then computed and put into the Release file. The Release file is " -"then signed by the archive key for this Debian release, and distributed " -"alongside the packages and the Packages files on Debian mirrors. The keys " -"are in the Debian archive keyring available in the <package>debian-archive-" -"keyring</package> package." +"then signed by the archive key for this &keyring-distro; release, and distributed " +"alongside the packages and the Packages files on &keyring-distro; mirrors. The keys " +"are in the &keyring-distro; archive keyring available in the &keyring-package; " +"package." msgstr "" "Sobald das hochgeladene Paket überprüft und dem Archiv hinzugefügt wurde, " "wird die Betreuersignatur entfernt, Prüfsummen des Pakets werden berechnet " "und in die Datei Packages abgelegt. Die Prüfsummen aller Paketdateien werden " "berechnet und in der Release-Datei abgelegt. Dann wird die Release-Datei " -"durch den Archivschlüssel für diese Debian-Veröffentlichung signiert und " -"zusammen mit den Paketen und Packages-Dateien auf Debian-Spiegel verteilt. " -"Die Schlüssel sind im Debian-Archivschlüsselbund im Paket <package>debian-" -"archive-keyring</package> verfügbar." +"durch den Archivschlüssel für diese &keyring-distro;-Veröffentlichung signiert und " +"zusammen mit den Paketen und Packages-Dateien auf &keyring-distro;-Spiegel verteilt. " +"Die Schlüssel sind im &keyring-distro;-Archivschlüsselbund im Paket &keyring-package; " +"verfügbar." #. type: Content of: <refentry><refsect1><para> #: apt-secure.8.xml:113 @@ -2895,23 +2879,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cdrom.8.xml:85 -#, fuzzy -#| msgid "" -#| "Mount point; specify the location to mount the CD-ROM. This mount point " -#| "must be listed in <filename>/etc/fstab</filename> and properly " -#| "configured. Configuration Item: <literal>Acquire::cdrom::mount</literal>." -msgid "" -"Do not try to auto-detect the CD-ROM path. Usually combined with the " -"<option>--cdrom</option> option. Configuration Item: <literal>Acquire::" -"cdrom::AutoDetect</literal>." -msgstr "" -"Einhängepunkt; gibt den Ort an, an dem die CD-ROM eingehängt wird. Dieser " -"Einhängepunkt muss in <filename>/etc/fstab</filename> eingetragen und " -"angemessen konfiguriert sein. Konfigurationselement: <literal>Acquire::" -"cdrom::mount</literal>." - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:93 msgid "" "Mount point; specify the location to mount the CD-ROM. This mount point must " "be listed in <filename>/etc/fstab</filename> and properly configured. " @@ -2923,7 +2890,7 @@ msgstr "" "cdrom::mount</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:102 +#: apt-cdrom.8.xml:94 msgid "" "Rename a disc; change the label of a disc or override the disc's given " "label. This option will cause <command>apt-cdrom</command> to prompt for a " @@ -2935,7 +2902,7 @@ msgstr "" "Konfigurationselement: <literal>APT::CDROM::Rename</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:111 +#: apt-cdrom.8.xml:103 msgid "" "No mounting; prevent <command>apt-cdrom</command> from mounting and " "unmounting the mount point. Configuration Item: <literal>APT::CDROM::" @@ -2946,7 +2913,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:119 +#: apt-cdrom.8.xml:111 msgid "" "Fast Copy; Assume the package files are valid and do not check every " "package. This option should be used only if <command>apt-cdrom</command> has " @@ -2959,7 +2926,7 @@ msgstr "" "festgestellt hat. Konfigurationselement: <literal>APT::CDROM::Fast</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:129 +#: apt-cdrom.8.xml:121 msgid "" "Thorough Package Scan; This option may be needed with some old Debian " "1.1/1.2 discs that have Package files in strange places. It takes much " @@ -2970,7 +2937,7 @@ msgstr "" "Dies verlängert das Durchsuchen des Mediums deutlich, nimmt aber alle auf." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:140 +#: apt-cdrom.8.xml:132 msgid "" "No Changes; Do not change the &sources-list; file and do not write index " "files. Everything is still checked however. Configuration Item: " @@ -2981,12 +2948,12 @@ msgstr "" "Konfigurationselement: <literal>APT::CDROM::NoAct</literal>." #. type: Content of: <refentry><refsect1><para> -#: apt-cdrom.8.xml:153 +#: apt-cdrom.8.xml:145 msgid "&apt-conf;, &apt-get;, &sources-list;" msgstr "&apt-conf;, &apt-get;, &sources-list;" #. type: Content of: <refentry><refsect1><para> -#: apt-cdrom.8.xml:158 +#: apt-cdrom.8.xml:150 msgid "" "<command>apt-cdrom</command> returns zero on normal operation, decimal 100 " "on error." @@ -3820,12 +3787,12 @@ msgid "" "be used." msgstr "" "<literal>http::Proxy</literal> ist der zu benutzende Standard-HTTP-Proxy. Er " -"wird standardmäßig in der Form <literal>http://[[Anwender][:Passwort]@]" -"Rechner[:Port]/</literal> angegeben. Durch Rechner-Proxies kann außerdem in " -"der Form <literal>http::Proxy::<host></literal> mit dem speziellen " -"Schlüsselwort <literal>DIRECT</literal> angegeben werden, dass keine Proxies " -"benutzt werden. Falls keine der obigen Einstellungen angegeben wurde, wird " -"die Umgebungsvariable <envar>http_proxy</envar> benutzt." +"wird standardmäßig in der Form <literal>http://[[Anwender][:" +"Passwort]@]Rechner[:Port]/</literal> angegeben. Durch Rechner-Proxies kann " +"außerdem in der Form <literal>http::Proxy::<host></literal> mit dem " +"speziellen Schlüsselwort <literal>DIRECT</literal> angegeben werden, dass " +"keine Proxies benutzt werden. Falls keine der obigen Einstellungen angegeben " +"wurde, wird die Umgebungsvariable <envar>http_proxy</envar> benutzt." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:366 @@ -5064,15 +5031,15 @@ msgstr "" "auslösen. Sie werden nach zwei eingerückten Leerzeichen unter dem " "Originaleintrag angezeigt. Jede Zeile hat das Format <literal>MarkKeep</" "literal>, <literal>MarkDelete</literal> oder <literal>MarkInstall</literal> " -"gefolgt von <literal>Paketname <a.b.c -> d.e.f | x.y.z> (Abschnitt)" -"</literal> wobei <literal>a.b.c</literal> die aktuelle Version des Paketes " -"ist, <literal>d.e.f</literal> die Version ist, die zur Installation " -"vorgesehen ist und <literal>x.y.z</literal> eine neuere Version ist, die " -"aber nicht zur Installation vorgesehen ist (aufgrund einer niedrigen Pinning-" -"Bewertung). Die letzten beiden können weggelassen werden, wenn es keine gibt " -"oder wenn sie die gleiche Version haben, wie die, die installiert ist. " -"<literal>section</literal> ist der Name des Abschnitts, in dem das Paket " -"erscheint." +"gefolgt von <literal>Paketname <a.b.c -> d.e.f | x.y.z> " +"(Abschnitt)</literal> wobei <literal>a.b.c</literal> die aktuelle Version " +"des Paketes ist, <literal>d.e.f</literal> die Version ist, die zur " +"Installation vorgesehen ist und <literal>x.y.z</literal> eine neuere Version " +"ist, die aber nicht zur Installation vorgesehen ist (aufgrund einer " +"niedrigen Pinning-Bewertung). Die letzten beiden können weggelassen werden, " +"wenn es keine gibt oder wenn sie die gleiche Version haben, wie die, die " +"installiert ist. <literal>section</literal> ist der Name des Abschnitts, in " +"dem das Paket erscheint." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:1061 @@ -6317,9 +6284,9 @@ msgid "" "id=\"0\"/>" msgstr "" "Mit einer geeigneten &sources-list;-Datei und der obigen Einstellungsdatei " -"wird jeder der folgenden Befehle APT veranlassen, ein Upgrade auf die neuste" -"(n) <literal>stable</literal>-Version(en) durchzuführen. <placeholder type=" -"\"programlisting\" id=\"0\"/>" +"wird jeder der folgenden Befehle APT veranlassen, ein Upgrade auf die " +"neuste(n) <literal>stable</literal>-Version(en) durchzuführen. <placeholder " +"type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> #: apt_preferences.5.xml:584 @@ -6400,9 +6367,9 @@ msgid "" "id=\"0\"/>" msgstr "" "Mit einer geeigneten &sources-list;-Datei und der obigen Einstellungsdatei " -"wird jeder der folgenden Befehle APT veranlassen, ein Upgrade auf die neuste" -"(n) <literal>testing</literal>-Version(en) durchzuführen. <placeholder type=" -"\"programlisting\" id=\"0\"/>" +"wird jeder der folgenden Befehle APT veranlassen, ein Upgrade auf die " +"neuste(n) <literal>testing</literal>-Version(en) durchzuführen. <placeholder " +"type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> #: apt_preferences.5.xml:633 @@ -6505,8 +6472,8 @@ msgid "" "<placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" "Mit einer geeigneten &sources-list;-Datei und der obigen Einstellungsdatei " -"wird jeder der folgenden Befehle APT veranlassen, ein Upgrade auf die letzte" -"(n) Version(en) im Release mit Codenamen <literal>&testing-codename;</" +"wird jeder der folgenden Befehle APT veranlassen, ein Upgrade auf die " +"letzte(n) Version(en) im Release mit Codenamen <literal>&testing-codename;</" "literal> durchzuführen. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> @@ -6674,13 +6641,13 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:92 msgid "" -"<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)" -"</literal> which expands to the Debian architecture (such as <literal>amd64</" -"literal> or <literal>armel</literal>) used on the system. This permits " -"architecture-independent <filename>sources.list</filename> files to be used. " -"In general this is only of interest when specifying an exact path, " -"<literal>APT</literal> will automatically generate a URI with the current " -"architecture otherwise." +"<literal>distribution</literal> may also contain a variable, <literal>" +"$(ARCH)</literal> which expands to the Debian architecture (such as " +"<literal>amd64</literal> or <literal>armel</literal>) used on the system. " +"This permits architecture-independent <filename>sources.list</filename> " +"files to be used. In general this is only of interest when specifying an " +"exact path, <literal>APT</literal> will automatically generate a URI with " +"the current architecture otherwise." msgstr "" "<literal>distribution</literal> könnte außerdem eine Variable, <literal>" "$(ARCH)</literal>, enthalten, die zur Debian-Architektur (wie " @@ -8199,9 +8166,9 @@ msgstr "BESCHREIBUNG" #: apt.8:31 msgid "" "APT is a management system for software packages. For normal day to day " -"package management there are several frontends available, such as B<aptitude>" -"(8) for the command line or B<synaptic>(8) for the X Window System. Some " -"options are only implemented in B<apt-get>(8) though." +"package management there are several frontends available, such as " +"B<aptitude>(8) for the command line or B<synaptic>(8) for the X Window " +"System. Some options are only implemented in B<apt-get>(8) though." msgstr "" "APT ist ein Verwaltungssystem für Softwarepakete. Für normale alltägliche " "Paketverwaltung sind mehrere Oberflächen, wie B<aptitude>(8) für die " @@ -8786,9 +8753,9 @@ msgstr "" "Bevor sie beginnen, <prgn>dselect</prgn> zu benutzen, ist es notwendig, die " "Verfügbarkeitsliste zu aktualisieren, indem sie aus dem Menü [E]rneuern " "auswählen. Dies ist eine Obermenge von <tt>apt-get update</tt>, das " -"<prgn>dselect</prgn> heruntergeladene Informationen zur Verfügung stellt. [E]" -"rneuern muss auch dann durchgeführt werden, wenn vorher <tt>apt-get update</" -"tt> ausgeführt wurde." +"<prgn>dselect</prgn> heruntergeladene Informationen zur Verfügung stellt. " +"[E]rneuern muss auch dann durchgeführt werden, wenn vorher <tt>apt-get " +"update</tt> ausgeführt wurde." #. type: <p></p> #: guide.sgml:253 diff --git a/doc/po/es.po b/doc/po/es.po index b4f90bbe6..6b2e77914 100644 --- a/doc/po/es.po +++ b/doc/po/es.po @@ -38,7 +38,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.7.1\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-07-02 17:09+0300\n" +"POT-Creation-Date: 2013-06-13 13:46+0300\n" "PO-Revision-Date: 2012-07-14 12:21+0200\n" "Last-Translator: Omar Campagne <ocampagne@gmail.com>\n" "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n" @@ -848,9 +848,9 @@ msgid "" "installation or upgrading. Each package is a package name, not a fully " "qualified filename (for instance, in a Debian system, <package>apt-utils</" "package> would be the argument provided, not <filename>apt-utils_&apt-" -"product-version;_amd64.deb</filename>). All packages required by the package" -"(s) specified for installation will also be retrieved and installed. The " -"<filename>/etc/apt/sources.list</filename> file is used to locate the " +"product-version;_amd64.deb</filename>). All packages required by the " +"package(s) specified for installation will also be retrieved and installed. " +"The <filename>/etc/apt/sources.list</filename> file is used to locate the " "desired packages. If a hyphen is appended to the package name (with no " "intervening space), the identified package will be removed if it is " "installed. Similarly a plus sign can be used to designate a package to " @@ -1625,7 +1625,7 @@ msgstr "Ficheros" #. type: Content of: <refentry><refsect1><title> #: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131 -#: apt-secure.8.xml:191 apt-cdrom.8.xml:152 apt-config.8.xml:109 +#: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109 #: apt.conf.5.xml:1173 apt_preferences.5.xml:705 sources.list.5.xml:252 #: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63 #: apt-ftparchive.1.xml:607 @@ -1645,7 +1645,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-get.8.xml:534 apt-cache.8.xml:355 apt-mark.8.xml:135 -#: apt-cdrom.8.xml:157 apt-config.8.xml:114 apt-extracttemplates.1.xml:74 +#: apt-cdrom.8.xml:149 apt-config.8.xml:114 apt-extracttemplates.1.xml:74 #: apt-sortpkgs.1.xml:67 apt-ftparchive.1.xml:611 msgid "Diagnostics" msgstr "Diagnósticos" @@ -2330,25 +2330,18 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:130 -#, fuzzy -#| msgid "" -#| "Update the local keyring with the archive keyring and remove from the " -#| "local keyring the archive keys which are no longer valid. The archive " -#| "keyring is shipped in the <literal>archive-keyring</literal> package of " -#| "your distribution, e.g. the <literal>debian-archive-keyring</literal> " -#| "package in Debian." msgid "" "Update the local keyring with the archive keyring and remove from the local " "keyring the archive keys which are no longer valid. The archive keyring is " "shipped in the <literal>archive-keyring</literal> package of your " -"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in " -"Ubuntu." +"distribution, e.g. the &keyring-package; package in " +"&keyring-distro;." msgstr "" "Actualiza el registro de claves local con el registro de claves del archivo " "y elimina del registro local las claves de archivo que ya no son válidas. El " "registro de claves del archivo se encuentra en el paquete <literal>archive-" -"keyring</literal> de su distribución; esto es, el paquete <literal>debian-" -"archive-keyring</literal> en Debian." +"keyring</literal> de su distribución; esto es, el paquete &keyring-package; " +"en &keyring-distro;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:144 @@ -2411,34 +2404,25 @@ msgstr "Base de datos local de las claves de confianza de archivos Debian" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:183 -#, fuzzy -#| msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" -msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>" -msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" +msgid "&keyring-filename;" +msgstr "&keyring-filename;" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:184 -#, fuzzy -#| msgid "Keyring of Debian archive trusted keys." -msgid "Keyring of Ubuntu archive trusted keys." -msgstr "Registro de las claves de confianza del archivo de Debian." +msgid "Keyring of &keyring-distro; archive trusted keys." +msgstr "Registro de las claves de confianza del archivo de &keyring-distro;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:187 -#, fuzzy -#| msgid "" -#| "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" msgid "" -"<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>" +"&keyring-removed-filename;" msgstr "" -"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" +"&keyring-removed-filename;" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:188 -#, fuzzy -#| msgid "Keyring of Debian archive removed trusted keys." -msgid "Keyring of Ubuntu archive removed trusted keys." -msgstr "Registro de las claves de confianza eliminadas del archivo de Debian." +msgid "Keyring of &keyring-distro; archive removed trusted keys." +msgstr "Registro de las claves de confianza eliminadas del archivo de &keyring-distro;." #. type: Content of: <refentry><refsect1><para> #: apt-key.8.xml:197 @@ -2680,20 +2664,20 @@ msgid "" "maintainer signature is stripped off, and checksums of the package are " "computed and put in the Packages file. The checksums of all of the Packages " "files are then computed and put into the Release file. The Release file is " -"then signed by the archive key for this Debian release, and distributed " -"alongside the packages and the Packages files on Debian mirrors. The keys " -"are in the Debian archive keyring available in the <package>debian-archive-" -"keyring</package> package." +"then signed by the archive key for this &keyring-distro; release, and distributed " +"alongside the packages and the Packages files on &keyring-distro; mirrors. The keys " +"are in the &keyring-distro; archive keyring available in the &keyring-package; " +"package." msgstr "" "Una vez que el paquete enviado se ha verificado e incluido en el archivo, se " "elimina la firma del mantenedor, y se realizan las sumas de control del " "paquete, que se incluyen en el fichero «Packages». A continuación, se " "realiza una suma de control de todos los ficheros «Package», y se incluyen " "en el fichero «Release». Acto seguido, el fichero «Release» se firma con la " -"clave del archivo de esta distribución de Debian, y se distribuye junto con " -"los paquetes y los ficheros «Packages» de las réplicas de Debian. Las claves " -"están disponibles en el registro de claves del archivo Debian en el paquete " -"<package>debian-archive-keyring</package> package." +"clave del archivo de esta distribución de &keyring-distro;, y se distribuye junto con " +"los paquetes y los ficheros «Packages» de las réplicas de &keyring-distro;. Las claves " +"están disponibles en el registro de claves del archivo &keyring-distro; en el paquete " +"&keyring-package; package." #. type: Content of: <refentry><refsect1><para> #: apt-secure.8.xml:113 @@ -2959,23 +2943,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cdrom.8.xml:85 -#, fuzzy -#| msgid "" -#| "Mount point; specify the location to mount the CD-ROM. This mount point " -#| "must be listed in <filename>/etc/fstab</filename> and properly " -#| "configured. Configuration Item: <literal>Acquire::cdrom::mount</literal>." -msgid "" -"Do not try to auto-detect the CD-ROM path. Usually combined with the " -"<option>--cdrom</option> option. Configuration Item: <literal>Acquire::" -"cdrom::AutoDetect</literal>." -msgstr "" -"Punto de montaje. Define el lugar donde se debe montar el disco óptico. El " -"punto de montaje debe aparecer en <filename>/etc/fstab</filename> y estar " -"correctamente configurado. Opción de configuración: <literal>Acquire::cdrom::" -"mount</literal>." - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:93 msgid "" "Mount point; specify the location to mount the CD-ROM. This mount point must " "be listed in <filename>/etc/fstab</filename> and properly configured. " @@ -2987,7 +2954,7 @@ msgstr "" "mount</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:102 +#: apt-cdrom.8.xml:94 msgid "" "Rename a disc; change the label of a disc or override the disc's given " "label. This option will cause <command>apt-cdrom</command> to prompt for a " @@ -2999,7 +2966,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:111 +#: apt-cdrom.8.xml:103 msgid "" "No mounting; prevent <command>apt-cdrom</command> from mounting and " "unmounting the mount point. Configuration Item: <literal>APT::CDROM::" @@ -3009,7 +2976,7 @@ msgstr "" "de montaje. Opción de configuración: <literal>APT::CDROM::NoMount</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:119 +#: apt-cdrom.8.xml:111 msgid "" "Fast Copy; Assume the package files are valid and do not check every " "package. This option should be used only if <command>apt-cdrom</command> has " @@ -3022,7 +2989,7 @@ msgstr "" "de configuración: <literal>APT::CDROM::Fast</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:129 +#: apt-cdrom.8.xml:121 msgid "" "Thorough Package Scan; This option may be needed with some old Debian " "1.1/1.2 discs that have Package files in strange places. It takes much " @@ -3034,7 +3001,7 @@ msgstr "" "pero encontrará todo el contenido." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:140 +#: apt-cdrom.8.xml:132 msgid "" "No Changes; Do not change the &sources-list; file and do not write index " "files. Everything is still checked however. Configuration Item: " @@ -3045,12 +3012,12 @@ msgstr "" "CDROM::NoAct</literal>." #. type: Content of: <refentry><refsect1><para> -#: apt-cdrom.8.xml:153 +#: apt-cdrom.8.xml:145 msgid "&apt-conf;, &apt-get;, &sources-list;" msgstr "&apt-conf;, &apt-get;, &sources-list;" #. type: Content of: <refentry><refsect1><para> -#: apt-cdrom.8.xml:158 +#: apt-cdrom.8.xml:150 msgid "" "<command>apt-cdrom</command> returns zero on normal operation, decimal 100 " "on error." @@ -6697,18 +6664,18 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:92 msgid "" -"<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)" -"</literal> which expands to the Debian architecture (such as <literal>amd64</" -"literal> or <literal>armel</literal>) used on the system. This permits " -"architecture-independent <filename>sources.list</filename> files to be used. " -"In general this is only of interest when specifying an exact path, " -"<literal>APT</literal> will automatically generate a URI with the current " -"architecture otherwise." -msgstr "" -"<literal>distribución</literal> puede contener una variable, <literal>$(ARCH)" -"</literal>, que se expandirá a la arquitectura de Debian usada en el sistema " -"(por ejemplo, <literal>amd64</literal> o <literal>armel</literal>). Esto " -"permite que los ficheros <filename>sources.list</filename> sean " +"<literal>distribution</literal> may also contain a variable, <literal>" +"$(ARCH)</literal> which expands to the Debian architecture (such as " +"<literal>amd64</literal> or <literal>armel</literal>) used on the system. " +"This permits architecture-independent <filename>sources.list</filename> " +"files to be used. In general this is only of interest when specifying an " +"exact path, <literal>APT</literal> will automatically generate a URI with " +"the current architecture otherwise." +msgstr "" +"<literal>distribución</literal> puede contener una variable, <literal>" +"$(ARCH)</literal>, que se expandirá a la arquitectura de Debian usada en el " +"sistema (por ejemplo, <literal>amd64</literal> o <literal>armel</literal>). " +"Esto permite que los ficheros <filename>sources.list</filename> sean " "independientes de la arquitectura. En general, esta característica sólo es " "de interés si se especifica una ruta completa, de lo contrario <literal>APT</" "literal> generará automáticamente una URI con la arquitectura actual del " @@ -8212,9 +8179,9 @@ msgstr "DESCRIPCIÓN" #: apt.8:31 msgid "" "APT is a management system for software packages. For normal day to day " -"package management there are several frontends available, such as B<aptitude>" -"(8) for the command line or B<synaptic>(8) for the X Window System. Some " -"options are only implemented in B<apt-get>(8) though." +"package management there are several frontends available, such as " +"B<aptitude>(8) for the command line or B<synaptic>(8) for the X Window " +"System. Some options are only implemented in B<apt-get>(8) though." msgstr "" "APT es un sistema de gestión de paquetes de software. Dispone de varias " "interfaces para la gestión de paquetes normal del día a día, tales como " @@ -8784,9 +8751,9 @@ msgid "" "<prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get update</" "tt> has been run before." msgstr "" -"Es necesario actualizar la lista disponible mediante el elemento de menú [A]" -"ctualizar antes de iniciar <prgn>dselect</prgn>. Éste es un superconjunto de " -"<tt>apt-get update</tt> que permite a <prgn>dselect</prgn> disponer de la " +"Es necesario actualizar la lista disponible mediante el elemento de menú " +"[A]ctualizar antes de iniciar <prgn>dselect</prgn>. Éste es un superconjunto " +"de <tt>apt-get update</tt> que permite a <prgn>dselect</prgn> disponer de la " "información obtenida. Debe ejecutar [A]ctualizar aunque haya ejecutado " "<tt>apt-get update</tt> con anterioridad." diff --git a/doc/po/fr.po b/doc/po/fr.po index 286a20db7..3849630b5 100644 --- a/doc/po/fr.po +++ b/doc/po/fr.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-07-02 17:09+0300\n" +"POT-Creation-Date: 2013-06-13 13:46+0300\n" "PO-Revision-Date: 2013-04-09 07:56+0200\n" "Last-Translator: Christian Perrier <bubulle@debian.org>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" @@ -760,9 +760,9 @@ msgid "" "installation or upgrading. Each package is a package name, not a fully " "qualified filename (for instance, in a Debian system, <package>apt-utils</" "package> would be the argument provided, not <filename>apt-utils_&apt-" -"product-version;_amd64.deb</filename>). All packages required by the package" -"(s) specified for installation will also be retrieved and installed. The " -"<filename>/etc/apt/sources.list</filename> file is used to locate the " +"product-version;_amd64.deb</filename>). All packages required by the " +"package(s) specified for installation will also be retrieved and installed. " +"The <filename>/etc/apt/sources.list</filename> file is used to locate the " "desired packages. If a hyphen is appended to the package name (with no " "intervening space), the identified package will be removed if it is " "installed. Similarly a plus sign can be used to designate a package to " @@ -824,10 +824,10 @@ msgstr "" "déjà installés sans mettre à jour les autres paquets du système. À la " "différence de la commande « upgrade » qui installera la dernière version " "disponible de tous les paquets installés au moment de son exécution, " -"« install » n'installera la nouvelle version que pour le(s) paquet(s) indiqué" -"(s). Il suffit de fournir le nom du(des) paquet(s) à mettre à jour et si une " -"nouvelle version est disponible, cette version (et ses dépendances, comme " -"décrit plus haut) sera récupérée et installée." +"« install » n'installera la nouvelle version que pour le(s) paquet(s) " +"indiqué(s). Il suffit de fournir le nom du(des) paquet(s) à mettre à jour et " +"si une nouvelle version est disponible, cette version (et ses dépendances, " +"comme décrit plus haut) sera récupérée et installée." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:137 @@ -1544,7 +1544,7 @@ msgstr "Fichiers" #. type: Content of: <refentry><refsect1><title> #: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131 -#: apt-secure.8.xml:191 apt-cdrom.8.xml:152 apt-config.8.xml:109 +#: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109 #: apt.conf.5.xml:1173 apt_preferences.5.xml:705 sources.list.5.xml:252 #: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63 #: apt-ftparchive.1.xml:607 @@ -1564,7 +1564,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-get.8.xml:534 apt-cache.8.xml:355 apt-mark.8.xml:135 -#: apt-cdrom.8.xml:157 apt-config.8.xml:114 apt-extracttemplates.1.xml:74 +#: apt-cdrom.8.xml:149 apt-config.8.xml:114 apt-extracttemplates.1.xml:74 #: apt-sortpkgs.1.xml:67 apt-ftparchive.1.xml:611 msgid "Diagnostics" msgstr "Diagnostics" @@ -2257,25 +2257,18 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:130 -#, fuzzy -#| msgid "" -#| "Update the local keyring with the archive keyring and remove from the " -#| "local keyring the archive keys which are no longer valid. The archive " -#| "keyring is shipped in the <literal>archive-keyring</literal> package of " -#| "your distribution, e.g. the <literal>debian-archive-keyring</literal> " -#| "package in Debian." msgid "" "Update the local keyring with the archive keyring and remove from the local " "keyring the archive keys which are no longer valid. The archive keyring is " "shipped in the <literal>archive-keyring</literal> package of your " -"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in " -"Ubuntu." +"distribution, e.g. the &keyring-package; package in " +"&keyring-distro;." msgstr "" "Mettre à jour le trousseau de clés local avec le trousseau de clés de " "l'archive et y supprimer les clés qui ne sont plus valables. Le trousseau de " "clés de l'archive est fourni dans le paquet <literal>archive-keyring</" -"literal> de la distribution, par exemple le paquet <literal>debian-archive-" -"keyring</literal> dans Debian." +"literal> de la distribution, par exemple le paquet &keyring-package; " +"dans &keyring-distro;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:144 @@ -2338,34 +2331,25 @@ msgstr "Base de données locale de fiabilité des clés de l'archive." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:183 -#, fuzzy -#| msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" -msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>" -msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" +msgid "&keyring-filename;" +msgstr "&keyring-filename;" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:184 -#, fuzzy -#| msgid "Keyring of Debian archive trusted keys." -msgid "Keyring of Ubuntu archive trusted keys." -msgstr "Trousseau des clés fiables de l'archive Debian." +msgid "Keyring of &keyring-distro; archive trusted keys." +msgstr "Trousseau des clés fiables de l'archive &keyring-distro;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:187 -#, fuzzy -#| msgid "" -#| "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" msgid "" -"<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>" +"&keyring-removed-filename;" msgstr "" -"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" +"&keyring-removed-filename;" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:188 -#, fuzzy -#| msgid "Keyring of Debian archive removed trusted keys." -msgid "Keyring of Ubuntu archive removed trusted keys." -msgstr "Trousseau des clés fiables supprimées de l'archive Debian." +msgid "Keyring of &keyring-distro; archive removed trusted keys." +msgstr "Trousseau des clés fiables supprimées de l'archive &keyring-distro;." #. type: Content of: <refentry><refsect1><para> #: apt-key.8.xml:197 @@ -2603,15 +2587,16 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt-secure.8.xml:102 +#, fuzzy msgid "" "Once the uploaded package is verified and included in the archive, the " "maintainer signature is stripped off, and checksums of the package are " "computed and put in the Packages file. The checksums of all of the Packages " "files are then computed and put into the Release file. The Release file is " -"then signed by the archive key for this Debian release, and distributed " -"alongside the packages and the Packages files on Debian mirrors. The keys " -"are in the Debian archive keyring available in the <package>debian-archive-" -"keyring</package> package." +"then signed by the archive key for this &keyring-distro; release, and distributed " +"alongside the packages and the Packages files on &keyring-distro; mirrors. The keys " +"are in the &keyring-distro; archive keyring available in the &keyring-package; " +"package." msgstr "" "Une fois que le paquet envoyé a été vérifié et inclus dans l'archive, la " "signature du responsable est enlevée, une somme de contrôle du paquet est " @@ -2619,8 +2604,7 @@ msgstr "" "paquets est ensuite calculée et mise dans le fichier Release. Ce fichier est " "signé par la clé de l'archive pour la version courante de la distribution et " "distribuée en même temps que les paquets et les fichiers Packages sur les " -"miroirs. Les clés sont fournies par le paquet <package>debian-archive-" -"keyring</package>." +"miroirs. Les clés sont fournies par le paquet &keyring-package;." #. type: Content of: <refentry><refsect1><para> #: apt-secure.8.xml:113 @@ -2883,23 +2867,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cdrom.8.xml:85 -#, fuzzy -#| msgid "" -#| "Mount point; specify the location to mount the CD-ROM. This mount point " -#| "must be listed in <filename>/etc/fstab</filename> and properly " -#| "configured. Configuration Item: <literal>Acquire::cdrom::mount</literal>." -msgid "" -"Do not try to auto-detect the CD-ROM path. Usually combined with the " -"<option>--cdrom</option> option. Configuration Item: <literal>Acquire::" -"cdrom::AutoDetect</literal>." -msgstr "" -"Point de montage ; spécifie l'emplacement de montage du CD. Ce point de " -"montage doit être spécifié dans <filename>/etc/fstab</filename> et " -"correctement configuré. Élément de configuration : <literal>Acquire::cdrom::" -"mount</literal>." - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:93 msgid "" "Mount point; specify the location to mount the CD-ROM. This mount point must " "be listed in <filename>/etc/fstab</filename> and properly configured. " @@ -2911,7 +2878,7 @@ msgstr "" "mount</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:102 +#: apt-cdrom.8.xml:94 msgid "" "Rename a disc; change the label of a disc or override the disc's given " "label. This option will cause <command>apt-cdrom</command> to prompt for a " @@ -2923,7 +2890,7 @@ msgstr "" "<literal>APT::CDROM::Rename</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:111 +#: apt-cdrom.8.xml:103 msgid "" "No mounting; prevent <command>apt-cdrom</command> from mounting and " "unmounting the mount point. Configuration Item: <literal>APT::CDROM::" @@ -2934,7 +2901,7 @@ msgstr "" "NoMount</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:119 +#: apt-cdrom.8.xml:111 msgid "" "Fast Copy; Assume the package files are valid and do not check every " "package. This option should be used only if <command>apt-cdrom</command> has " @@ -2948,7 +2915,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:129 +#: apt-cdrom.8.xml:121 msgid "" "Thorough Package Scan; This option may be needed with some old Debian " "1.1/1.2 discs that have Package files in strange places. It takes much " @@ -2960,7 +2927,7 @@ msgstr "" "le CD mais tous les paquets seront repérés." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:140 +#: apt-cdrom.8.xml:132 msgid "" "No Changes; Do not change the &sources-list; file and do not write index " "files. Everything is still checked however. Configuration Item: " @@ -2971,12 +2938,12 @@ msgstr "" "<literal>APT::CDROM::NoAct</literal>." #. type: Content of: <refentry><refsect1><para> -#: apt-cdrom.8.xml:153 +#: apt-cdrom.8.xml:145 msgid "&apt-conf;, &apt-get;, &sources-list;" msgstr "&apt-conf;, &apt-get;, &sources-list;." #. type: Content of: <refentry><refsect1><para> -#: apt-cdrom.8.xml:158 +#: apt-cdrom.8.xml:150 msgid "" "<command>apt-cdrom</command> returns zero on normal operation, decimal 100 " "on error." @@ -6645,13 +6612,13 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:92 msgid "" -"<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)" -"</literal> which expands to the Debian architecture (such as <literal>amd64</" -"literal> or <literal>armel</literal>) used on the system. This permits " -"architecture-independent <filename>sources.list</filename> files to be used. " -"In general this is only of interest when specifying an exact path, " -"<literal>APT</literal> will automatically generate a URI with the current " -"architecture otherwise." +"<literal>distribution</literal> may also contain a variable, <literal>" +"$(ARCH)</literal> which expands to the Debian architecture (such as " +"<literal>amd64</literal> or <literal>armel</literal>) used on the system. " +"This permits architecture-independent <filename>sources.list</filename> " +"files to be used. In general this is only of interest when specifying an " +"exact path, <literal>APT</literal> will automatically generate a URI with " +"the current architecture otherwise." msgstr "" "<literal>distribution</literal> peut aussi contenir une variable <literal>" "$(ARCH)</literal>, qui sera remplacée par l'architecture Debian (comme " @@ -8155,9 +8122,9 @@ msgstr "DESCRIPTION" #: apt.8:31 msgid "" "APT is a management system for software packages. For normal day to day " -"package management there are several frontends available, such as B<aptitude>" -"(8) for the command line or B<synaptic>(8) for the X Window System. Some " -"options are only implemented in B<apt-get>(8) though." +"package management there are several frontends available, such as " +"B<aptitude>(8) for the command line or B<synaptic>(8) for the X Window " +"System. Some options are only implemented in B<apt-get>(8) though." msgstr "" "APT est un système de gestion de paquets logiciels. Pour la gestion au " "quotidien des paquets, il existe plusieurs frontaux comme B<aptitude>(9) en " @@ -8771,11 +8738,11 @@ msgid "" "[R]emove commands have no meaning, the [I]nstall command performs both of " "them together." msgstr "" -"Une fois cela effectué, vous pouvez poursuivre et utiliser l'option « [S]" -"électionner » pour choisir les paquets à installer puis « [I]nstaller » pour " -"les installer. Lorsque la méthode APT est utilisée, les options « [C]" -"onfigurer » et « [R]etirer » ne sont pas utilisées, car « [I]nstaller » fait " -"l'ensemble des opérations." +"Une fois cela effectué, vous pouvez poursuivre et utiliser l'option " +"« [S]électionner » pour choisir les paquets à installer puis « [I]nstaller » " +"pour les installer. Lorsque la méthode APT est utilisée, les options " +"« [C]onfigurer » et « [R]etirer » ne sont pas utilisées, car « [I]nstaller » " +"fait l'ensemble des opérations." #. type: <p></p> #: guide.sgml:258 diff --git a/doc/po/it.po b/doc/po/it.po index 2d432c6cc..9f614a468 100644 --- a/doc/po/it.po +++ b/doc/po/it.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-07-02 17:09+0300\n" +"POT-Creation-Date: 2013-06-13 13:46+0300\n" "PO-Revision-Date: 2012-12-23 18:04+0200\n" "Last-Translator: Beatrice Torracca <beatricet@libero.it>\n" "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n" @@ -812,9 +812,9 @@ msgid "" "installation or upgrading. Each package is a package name, not a fully " "qualified filename (for instance, in a Debian system, <package>apt-utils</" "package> would be the argument provided, not <filename>apt-utils_&apt-" -"product-version;_amd64.deb</filename>). All packages required by the package" -"(s) specified for installation will also be retrieved and installed. The " -"<filename>/etc/apt/sources.list</filename> file is used to locate the " +"product-version;_amd64.deb</filename>). All packages required by the " +"package(s) specified for installation will also be retrieved and installed. " +"The <filename>/etc/apt/sources.list</filename> file is used to locate the " "desired packages. If a hyphen is appended to the package name (with no " "intervening space), the identified package will be removed if it is " "installed. Similarly a plus sign can be used to designate a package to " @@ -1588,7 +1588,7 @@ msgstr "File" #. type: Content of: <refentry><refsect1><title> #: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131 -#: apt-secure.8.xml:191 apt-cdrom.8.xml:152 apt-config.8.xml:109 +#: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109 #: apt.conf.5.xml:1173 apt_preferences.5.xml:705 sources.list.5.xml:252 #: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63 #: apt-ftparchive.1.xml:607 @@ -1608,7 +1608,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-get.8.xml:534 apt-cache.8.xml:355 apt-mark.8.xml:135 -#: apt-cdrom.8.xml:157 apt-config.8.xml:114 apt-extracttemplates.1.xml:74 +#: apt-cdrom.8.xml:149 apt-config.8.xml:114 apt-extracttemplates.1.xml:74 #: apt-sortpkgs.1.xml:67 apt-ftparchive.1.xml:611 msgid "Diagnostics" msgstr "Diagnostica" @@ -2296,25 +2296,18 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:130 -#, fuzzy -#| msgid "" -#| "Update the local keyring with the archive keyring and remove from the " -#| "local keyring the archive keys which are no longer valid. The archive " -#| "keyring is shipped in the <literal>archive-keyring</literal> package of " -#| "your distribution, e.g. the <literal>debian-archive-keyring</literal> " -#| "package in Debian." msgid "" "Update the local keyring with the archive keyring and remove from the local " "keyring the archive keys which are no longer valid. The archive keyring is " "shipped in the <literal>archive-keyring</literal> package of your " -"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in " -"Ubuntu." +"distribution, e.g. the &keyring-package; package in " +"&keyring-distro;." msgstr "" "Aggiorna il portachiavi locale con il portachiavi dell'archivio e rimuove " "dal portachiavi locale le chiavi di archivio che non sono più valide. Il " "portachiavi degli archivi è fornito nel pacchetto <literal>archive-keyring</" "literal> delle diverse distribuzioni, ad esempio il pacchetto " -"<literal>debian-archive-keyring</literal> in Debian." +"&keyring-package; in &keyring-distro;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:144 @@ -2377,34 +2370,25 @@ msgstr "Database locale di fiducia delle chiavi archiviate." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:183 -#, fuzzy -#| msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" -msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>" -msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" +msgid "&keyring-filename;" +msgstr "&keyring-filename;" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:184 -#, fuzzy -#| msgid "Keyring of Debian archive trusted keys." -msgid "Keyring of Ubuntu archive trusted keys." -msgstr "Portachiavi delle chiavi fidate degli archivi Debian." +msgid "Keyring of &keyring-distro; archive trusted keys." +msgstr "Portachiavi delle chiavi fidate degli archivi &keyring-distro;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:187 -#, fuzzy -#| msgid "" -#| "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" msgid "" -"<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>" +"&keyring-removed-filename;" msgstr "" -"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" +"&keyring-removed-filename;" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:188 -#, fuzzy -#| msgid "Keyring of Debian archive removed trusted keys." -msgid "Keyring of Ubuntu archive removed trusted keys." -msgstr "Portachiavi delle chiavi fidate rimosse degli archivi Debian." +msgid "Keyring of &keyring-distro; archive removed trusted keys." +msgstr "Portachiavi delle chiavi fidate rimosse degli archivi &keyring-distro;." #. type: Content of: <refentry><refsect1><para> #: apt-key.8.xml:197 @@ -2649,19 +2633,19 @@ msgid "" "maintainer signature is stripped off, and checksums of the package are " "computed and put in the Packages file. The checksums of all of the Packages " "files are then computed and put into the Release file. The Release file is " -"then signed by the archive key for this Debian release, and distributed " -"alongside the packages and the Packages files on Debian mirrors. The keys " -"are in the Debian archive keyring available in the <package>debian-archive-" -"keyring</package> package." +"then signed by the archive key for this &keyring-distro; release, and distributed " +"alongside the packages and the Packages files on &keyring-distro; mirrors. The keys " +"are in the &keyring-distro; archive keyring available in the &keyring-package; " +"package." msgstr "" "Una volta che il pacchetto caricato è verificato e incluso nell'archivio, la " "firma del manutentore viene rimossa e i codici di controllo del pacchetto " "vengono calcolati e messi nel file Packages. Vengono quindi calcolati i " "codici di controllo di tutti i file Packages e vengono messi nel file " "Release. Il file Release viene poi firmato con la chiave dell'archivio per " -"questo rilascio di Debian e viene distribuito insieme ai pacchetti e ai file " -"Packages nei mirror Debian. Le chiavi sono nel portachiavi degli archivi " -"Debian, disponibile nel pacchetto <package>debian-archive-keyring</package>." +"questo rilascio di &keyring-distro; e viene distribuito insieme ai pacchetti e ai file " +"Packages nei mirror &keyring-distro;. Le chiavi sono nel portachiavi degli archivi " +"&keyring-distro;, disponibile nel pacchetto &keyring-package;." #. type: Content of: <refentry><refsect1><para> #: apt-secure.8.xml:113 @@ -2926,23 +2910,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cdrom.8.xml:85 -#, fuzzy -#| msgid "" -#| "Mount point; specify the location to mount the CD-ROM. This mount point " -#| "must be listed in <filename>/etc/fstab</filename> and properly " -#| "configured. Configuration Item: <literal>Acquire::cdrom::mount</literal>." -msgid "" -"Do not try to auto-detect the CD-ROM path. Usually combined with the " -"<option>--cdrom</option> option. Configuration Item: <literal>Acquire::" -"cdrom::AutoDetect</literal>." -msgstr "" -"Punto di mount; specifica la posizione in cui montare il CD-ROM. Questo " -"punto di mount deve essere elencato nel file <filename>/etc/fstab</filename> " -"e configurato correttamente. Voce di configurazione: <literal>Acquire::" -"cdrom::mount</literal>." - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:93 msgid "" "Mount point; specify the location to mount the CD-ROM. This mount point must " "be listed in <filename>/etc/fstab</filename> and properly configured. " @@ -2954,7 +2921,7 @@ msgstr "" "cdrom::mount</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:102 +#: apt-cdrom.8.xml:94 msgid "" "Rename a disc; change the label of a disc or override the disc's given " "label. This option will cause <command>apt-cdrom</command> to prompt for a " @@ -2966,7 +2933,7 @@ msgstr "" "Rename</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:111 +#: apt-cdrom.8.xml:103 msgid "" "No mounting; prevent <command>apt-cdrom</command> from mounting and " "unmounting the mount point. Configuration Item: <literal>APT::CDROM::" @@ -2977,7 +2944,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:119 +#: apt-cdrom.8.xml:111 msgid "" "Fast Copy; Assume the package files are valid and do not check every " "package. This option should be used only if <command>apt-cdrom</command> has " @@ -2990,7 +2957,7 @@ msgstr "" "errore. Voce di configurazione: <literal>APT::CDROM::Fast</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:129 +#: apt-cdrom.8.xml:121 msgid "" "Thorough Package Scan; This option may be needed with some old Debian " "1.1/1.2 discs that have Package files in strange places. It takes much " @@ -3002,7 +2969,7 @@ msgstr "" "più tempo, ma troverà tutti i file." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:140 +#: apt-cdrom.8.xml:132 msgid "" "No Changes; Do not change the &sources-list; file and do not write index " "files. Everything is still checked however. Configuration Item: " @@ -3013,12 +2980,12 @@ msgstr "" "<literal>APT::CDROM::NoAct</literal>." #. type: Content of: <refentry><refsect1><para> -#: apt-cdrom.8.xml:153 +#: apt-cdrom.8.xml:145 msgid "&apt-conf;, &apt-get;, &sources-list;" msgstr "&apt-conf;, &apt-get;, &sources-list;" #. type: Content of: <refentry><refsect1><para> -#: apt-cdrom.8.xml:158 +#: apt-cdrom.8.xml:150 msgid "" "<command>apt-cdrom</command> returns zero on normal operation, decimal 100 " "on error." @@ -6680,13 +6647,13 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:92 msgid "" -"<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)" -"</literal> which expands to the Debian architecture (such as <literal>amd64</" -"literal> or <literal>armel</literal>) used on the system. This permits " -"architecture-independent <filename>sources.list</filename> files to be used. " -"In general this is only of interest when specifying an exact path, " -"<literal>APT</literal> will automatically generate a URI with the current " -"architecture otherwise." +"<literal>distribution</literal> may also contain a variable, <literal>" +"$(ARCH)</literal> which expands to the Debian architecture (such as " +"<literal>amd64</literal> or <literal>armel</literal>) used on the system. " +"This permits architecture-independent <filename>sources.list</filename> " +"files to be used. In general this is only of interest when specifying an " +"exact path, <literal>APT</literal> will automatically generate a URI with " +"the current architecture otherwise." msgstr "" "<literal>distribuzione</literal> può anche contenere una variabile <literal>" "$(ARCH)</literal> che viene espansa nell'architettura Debian (come " @@ -8181,9 +8148,9 @@ msgstr "DESCRIZIONE" #: apt.8:31 msgid "" "APT is a management system for software packages. For normal day to day " -"package management there are several frontends available, such as B<aptitude>" -"(8) for the command line or B<synaptic>(8) for the X Window System. Some " -"options are only implemented in B<apt-get>(8) though." +"package management there are several frontends available, such as " +"B<aptitude>(8) for the command line or B<synaptic>(8) for the X Window " +"System. Some options are only implemented in B<apt-get>(8) though." msgstr "" "APT è un sistema di gestione per i pacchetti software. Per la normale " "gestione quotidiana dei pacchetti sono disponibili diverse interfacce, quali " @@ -8237,8 +8204,8 @@ msgid "" "B<reportbug>(1) command." msgstr "" "Vedere E<lt>http://bugs.debian.org/aptE<gt>. Per segnalare un bug in B<apt>, " -"vedere I</usr/share/doc/debian/bug-reporting.txt> o il comando B<reportbug>" -"(1)." +"vedere I</usr/share/doc/debian/bug-reporting.txt> o il comando " +"B<reportbug>(1)." #. type: SH #: apt.8:51 diff --git a/doc/po/ja.po b/doc/po/ja.po index 659f8c77b..7370e21d8 100644 --- a/doc/po/ja.po +++ b/doc/po/ja.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.25.3\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-07-02 17:09+0300\n" +"POT-Creation-Date: 2013-06-13 13:46+0300\n" "PO-Revision-Date: 2012-08-08 07:58+0900\n" "Last-Translator: KURASAWA Nozomu <nabetaro@debian.or.jp>\n" "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n" @@ -800,9 +800,9 @@ msgid "" "installation or upgrading. Each package is a package name, not a fully " "qualified filename (for instance, in a Debian system, <package>apt-utils</" "package> would be the argument provided, not <filename>apt-utils_&apt-" -"product-version;_amd64.deb</filename>). All packages required by the package" -"(s) specified for installation will also be retrieved and installed. The " -"<filename>/etc/apt/sources.list</filename> file is used to locate the " +"product-version;_amd64.deb</filename>). All packages required by the " +"package(s) specified for installation will also be retrieved and installed. " +"The <filename>/etc/apt/sources.list</filename> file is used to locate the " "desired packages. If a hyphen is appended to the package name (with no " "intervening space), the identified package will be removed if it is " "installed. Similarly a plus sign can be used to designate a package to " @@ -1536,7 +1536,7 @@ msgstr "ファイル" #. type: Content of: <refentry><refsect1><title> #: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131 -#: apt-secure.8.xml:191 apt-cdrom.8.xml:152 apt-config.8.xml:109 +#: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109 #: apt.conf.5.xml:1173 apt_preferences.5.xml:705 sources.list.5.xml:252 #: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63 #: apt-ftparchive.1.xml:607 @@ -1556,7 +1556,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-get.8.xml:534 apt-cache.8.xml:355 apt-mark.8.xml:135 -#: apt-cdrom.8.xml:157 apt-config.8.xml:114 apt-extracttemplates.1.xml:74 +#: apt-cdrom.8.xml:149 apt-config.8.xml:114 apt-extracttemplates.1.xml:74 #: apt-sortpkgs.1.xml:67 apt-ftparchive.1.xml:611 msgid "Diagnostics" msgstr "診断メッセージ" @@ -2215,24 +2215,17 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:130 -#, fuzzy -#| msgid "" -#| "Update the local keyring with the archive keyring and remove from the " -#| "local keyring the archive keys which are no longer valid. The archive " -#| "keyring is shipped in the <literal>archive-keyring</literal> package of " -#| "your distribution, e.g. the <literal>debian-archive-keyring</literal> " -#| "package in Debian." msgid "" "Update the local keyring with the archive keyring and remove from the local " "keyring the archive keys which are no longer valid. The archive keyring is " "shipped in the <literal>archive-keyring</literal> package of your " -"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in " -"Ubuntu." +"distribution, e.g. the &keyring-package; package in " +"&keyring-distro;." msgstr "" "ローカルキーリングをアーカイブキーリングで更新し、もう有効でなくなったアーカ" "イブキーをローカルキーリングから削除します。アーカイブキーリングは、使用中の" "ディストリビューションにある <literal>archive-keyring</literal> パッケージ " -"(例: Debian では <literal>debian-archive-keyring</literal> パッケージ) で提供" +"(例: &keyring-distro; では &keyring-package; パッケージ) で提供" "されています。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> @@ -2294,34 +2287,25 @@ msgstr "アーカイブキーのローカル信頼データベースです。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:183 -#, fuzzy -#| msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" -msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>" -msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" +msgid "&keyring-filename;" +msgstr "&keyring-filename;" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:184 -#, fuzzy -#| msgid "Keyring of Debian archive trusted keys." -msgid "Keyring of Ubuntu archive trusted keys." -msgstr "Debian アーカイブ信頼キーのキーリングです。" +msgid "Keyring of &keyring-distro; archive trusted keys." +msgstr "&keyring-distro; アーカイブ信頼キーのキーリングです。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:187 -#, fuzzy -#| msgid "" -#| "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" msgid "" -"<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>" +"&keyring-removed-filename;" msgstr "" -"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" +"&keyring-removed-filename;" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:188 -#, fuzzy -#| msgid "Keyring of Debian archive removed trusted keys." -msgid "Keyring of Ubuntu archive removed trusted keys." -msgstr "削除された Debian アーカイブ信頼キーのキーリングです。" +msgid "Keyring of &keyring-distro; archive removed trusted keys." +msgstr "削除された &keyring-distro; アーカイブ信頼キーのキーリングです。" #. type: Content of: <refentry><refsect1><para> #: apt-key.8.xml:197 @@ -2557,18 +2541,18 @@ msgid "" "maintainer signature is stripped off, and checksums of the package are " "computed and put in the Packages file. The checksums of all of the Packages " "files are then computed and put into the Release file. The Release file is " -"then signed by the archive key for this Debian release, and distributed " -"alongside the packages and the Packages files on Debian mirrors. The keys " -"are in the Debian archive keyring available in the <package>debian-archive-" -"keyring</package> package." +"then signed by the archive key for this &keyring-distro; release, and distributed " +"alongside the packages and the Packages files on &keyring-distro; mirrors. The keys " +"are in the &keyring-distro; archive keyring available in the &keyring-package; " +"package." msgstr "" "アップロードされたパッケージが検証されてアーカイブに格納されると、メンテナの" "署名を取り外し、パッケージのチェックサムを計算して、Packages ファイルに格納し" "ます。その後、全パッケージファイルのチェックサムを計算して、Release ファイル" -"に格納します。Release ファイルは、その Debian リリースのアーカイブキーで署名" -"され、Debian ミラーサイトでパッケージや Packages ファイルとともに配布されま" -"す。このキーは、<package>debian-archive-keyring</package> パッケージに収録さ" -"れている、Debian アーカイブキーリングに含まれます。" +"に格納します。Release ファイルは、その &keyring-distro; リリースのアーカイブキーで署名" +"され、&keyring-distro; ミラーサイトでパッケージや Packages ファイルとともに配布されま" +"す。このキーは、&keyring-package; パッケージに収録さ" +"れている、&keyring-distro; アーカイブキーリングに含まれます。" #. type: Content of: <refentry><refsect1><para> #: apt-secure.8.xml:113 @@ -2826,22 +2810,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cdrom.8.xml:85 -#, fuzzy -#| msgid "" -#| "Mount point; specify the location to mount the CD-ROM. This mount point " -#| "must be listed in <filename>/etc/fstab</filename> and properly " -#| "configured. Configuration Item: <literal>Acquire::cdrom::mount</literal>." -msgid "" -"Do not try to auto-detect the CD-ROM path. Usually combined with the " -"<option>--cdrom</option> option. Configuration Item: <literal>Acquire::" -"cdrom::AutoDetect</literal>." -msgstr "" -"マウントポイント - CD-ROM をマウントする場所を指定します。このマウントポイン" -"トは、<filename>/etc/fstab</filename> に正しく設定されている必要があります。" -"設定項目: <literal>Acquire::cdrom::mount</literal>" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:93 msgid "" "Mount point; specify the location to mount the CD-ROM. This mount point must " "be listed in <filename>/etc/fstab</filename> and properly configured. " @@ -2852,7 +2820,7 @@ msgstr "" "設定項目: <literal>Acquire::cdrom::mount</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:102 +#: apt-cdrom.8.xml:94 msgid "" "Rename a disc; change the label of a disc or override the disc's given " "label. This option will cause <command>apt-cdrom</command> to prompt for a " @@ -2863,7 +2831,7 @@ msgstr "" "を入力するよう促します。設定項目: <literal>APT::CDROM::Rename</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:111 +#: apt-cdrom.8.xml:103 msgid "" "No mounting; prevent <command>apt-cdrom</command> from mounting and " "unmounting the mount point. Configuration Item: <literal>APT::CDROM::" @@ -2874,7 +2842,7 @@ msgstr "" "literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:119 +#: apt-cdrom.8.xml:111 msgid "" "Fast Copy; Assume the package files are valid and do not check every " "package. This option should be used only if <command>apt-cdrom</command> has " @@ -2887,7 +2855,7 @@ msgstr "" "<literal>APT::CDROM::Fast</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:129 +#: apt-cdrom.8.xml:121 msgid "" "Thorough Package Scan; This option may be needed with some old Debian " "1.1/1.2 discs that have Package files in strange places. It takes much " @@ -2899,7 +2867,7 @@ msgstr "" "できます。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:140 +#: apt-cdrom.8.xml:132 msgid "" "No Changes; Do not change the &sources-list; file and do not write index " "files. Everything is still checked however. Configuration Item: " @@ -2910,12 +2878,12 @@ msgstr "" "CDROM::NoAct</literal>" #. type: Content of: <refentry><refsect1><para> -#: apt-cdrom.8.xml:153 +#: apt-cdrom.8.xml:145 msgid "&apt-conf;, &apt-get;, &sources-list;" msgstr "&apt-conf;, &apt-get;, &sources-list;" #. type: Content of: <refentry><refsect1><para> -#: apt-cdrom.8.xml:158 +#: apt-cdrom.8.xml:150 msgid "" "<command>apt-cdrom</command> returns zero on normal operation, decimal 100 " "on error." @@ -3855,10 +3823,10 @@ msgstr "" "るには、設定ファイルに <literal>ftp::ProxyLogin</literal> スクリプトを設定す" "る必要があります。このエントリには、接続する際にプロキシサーバに送信するコマ" "ンドを設定します。どのようにするのかは &configureindex; の例を参照してくださ" -"い。URI を構成するコンポーネントに対応する置換変数は、<literal>$(PROXY_USER)" -"</literal>, <literal>$(PROXY_PASS)</literal>, <literal>$(SITE_USER)</" -"literal>, <literal>$(SITE_PASS)</literal>, <literal>$(SITE)</literal>, " -"<literal>$(SITE_PORT)</literal> です。" +"い。URI を構成するコンポーネントに対応する置換変数は、<literal>" +"$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, <literal>" +"$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, <literal>$(SITE)</" +"literal>, <literal>$(SITE_PORT)</literal> です。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:451 @@ -6392,13 +6360,13 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:92 msgid "" -"<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)" -"</literal> which expands to the Debian architecture (such as <literal>amd64</" -"literal> or <literal>armel</literal>) used on the system. This permits " -"architecture-independent <filename>sources.list</filename> files to be used. " -"In general this is only of interest when specifying an exact path, " -"<literal>APT</literal> will automatically generate a URI with the current " -"architecture otherwise." +"<literal>distribution</literal> may also contain a variable, <literal>" +"$(ARCH)</literal> which expands to the Debian architecture (such as " +"<literal>amd64</literal> or <literal>armel</literal>) used on the system. " +"This permits architecture-independent <filename>sources.list</filename> " +"files to be used. In general this is only of interest when specifying an " +"exact path, <literal>APT</literal> will automatically generate a URI with " +"the current architecture otherwise." msgstr "" "<literal>distribution</literal> は、<literal>$(ARCH)</literal> 変数を含む場合" "があります。<literal>$(ARCH)</literal> 変数は、システムで使用している Debian " @@ -7848,14 +7816,14 @@ msgstr "説明" #: apt.8:31 msgid "" "APT is a management system for software packages. For normal day to day " -"package management there are several frontends available, such as B<aptitude>" -"(8) for the command line or B<synaptic>(8) for the X Window System. Some " -"options are only implemented in B<apt-get>(8) though." +"package management there are several frontends available, such as " +"B<aptitude>(8) for the command line or B<synaptic>(8) for the X Window " +"System. Some options are only implemented in B<apt-get>(8) though." msgstr "" "APT はソフトウェアパッケージの管理システムです。日々のパッケージ管理のため" -"に、コマンドライン用の B<aptitude>(8) や、X Window System 用の B<synaptic>" -"(8) といった、いくつかのフロントエンドが用意されています。いくつかのオプショ" -"ンは B<apt-get>(8) にしか実装されていません。" +"に、コマンドライン用の B<aptitude>(8) や、X Window System 用の " +"B<synaptic>(8) といった、いくつかのフロントエンドが用意されています。いくつか" +"のオプションは B<apt-get>(8) にしか実装されていません。" #. type: SH #: apt.8:31 diff --git a/doc/po/pl.po b/doc/po/pl.po index b89d992a0..81edfb704 100644 --- a/doc/po/pl.po +++ b/doc/po/pl.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.7.3\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-07-02 17:09+0300\n" +"POT-Creation-Date: 2013-06-13 13:46+0300\n" "PO-Revision-Date: 2012-07-28 21:59+0200\n" "Last-Translator: Robert Luberda <robert@debian.org>\n" "Language-Team: Polish <manpages-pl-list@lists.sourceforge.net>\n" @@ -811,9 +811,9 @@ msgid "" "installation or upgrading. Each package is a package name, not a fully " "qualified filename (for instance, in a Debian system, <package>apt-utils</" "package> would be the argument provided, not <filename>apt-utils_&apt-" -"product-version;_amd64.deb</filename>). All packages required by the package" -"(s) specified for installation will also be retrieved and installed. The " -"<filename>/etc/apt/sources.list</filename> file is used to locate the " +"product-version;_amd64.deb</filename>). All packages required by the " +"package(s) specified for installation will also be retrieved and installed. " +"The <filename>/etc/apt/sources.list</filename> file is used to locate the " "desired packages. If a hyphen is appended to the package name (with no " "intervening space), the identified package will be removed if it is " "installed. Similarly a plus sign can be used to designate a package to " @@ -1619,7 +1619,7 @@ msgstr "Pliki" #. type: Content of: <refentry><refsect1><title> #: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131 -#: apt-secure.8.xml:191 apt-cdrom.8.xml:152 apt-config.8.xml:109 +#: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109 #: apt.conf.5.xml:1173 apt_preferences.5.xml:705 sources.list.5.xml:252 #: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63 #: apt-ftparchive.1.xml:607 @@ -1640,7 +1640,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-get.8.xml:534 apt-cache.8.xml:355 apt-mark.8.xml:135 -#: apt-cdrom.8.xml:157 apt-config.8.xml:114 apt-extracttemplates.1.xml:74 +#: apt-cdrom.8.xml:149 apt-config.8.xml:114 apt-extracttemplates.1.xml:74 #: apt-sortpkgs.1.xml:67 apt-ftparchive.1.xml:611 msgid "Diagnostics" msgstr "Diagnostyka" @@ -2362,25 +2362,18 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:130 -#, fuzzy -#| msgid "" -#| "Update the local keyring with the archive keyring and remove from the " -#| "local keyring the archive keys which are no longer valid. The archive " -#| "keyring is shipped in the <literal>archive-keyring</literal> package of " -#| "your distribution, e.g. the <literal>debian-archive-keyring</literal> " -#| "package in Debian." msgid "" "Update the local keyring with the archive keyring and remove from the local " "keyring the archive keys which are no longer valid. The archive keyring is " "shipped in the <literal>archive-keyring</literal> package of your " -"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in " -"Ubuntu." +"distribution, e.g. the &keyring-package; package in " +"&keyring-distro;." msgstr "" "Aktualizuje lokalną składnicę kluczy używając składnicy kluczy archiwum i " "usuwa z lokalnej składnicy niepoprawne klucze archiwum. Składnica kluczy " "archiwum jest dostarczana przez pakiet <literal>archive-keyring</literal> " -"Twojej dystrybucji, np. pakiet <literal>debian-archive-keyring</literal> w " -"systemach Debiana." +"Twojej dystrybucji, np. pakiet &keyring-package; w " +"systemach &keyring-distro;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:144 @@ -2443,34 +2436,25 @@ msgstr "Lokalna składnica zaufanych kluczy archiwum." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:183 -#, fuzzy -#| msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" -msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>" -msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" +msgid "&keyring-filename;" +msgstr "&keyring-filename;" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:184 -#, fuzzy -#| msgid "Keyring of Debian archive trusted keys." -msgid "Keyring of Ubuntu archive trusted keys." -msgstr "Składnica zaufanych kluczy archiwum Debiana." +msgid "Keyring of &keyring-distro; archive trusted keys." +msgstr "Składnica zaufanych kluczy archiwum &keyring-distro;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:187 -#, fuzzy -#| msgid "" -#| "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" msgid "" -"<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>" +"&keyring-removed-filename;" msgstr "" -"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" +"&keyring-removed-filename;" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:188 -#, fuzzy -#| msgid "Keyring of Debian archive removed trusted keys." -msgid "Keyring of Ubuntu archive removed trusted keys." -msgstr "Składnica usuniętych zaufanych kluczy archiwum Debiana." +msgid "Keyring of &keyring-distro; archive removed trusted keys." +msgstr "Składnica usuniętych zaufanych kluczy archiwum &keyring-distro;." #. type: Content of: <refentry><refsect1><para> #: apt-key.8.xml:197 @@ -2712,20 +2696,19 @@ msgid "" "maintainer signature is stripped off, and checksums of the package are " "computed and put in the Packages file. The checksums of all of the Packages " "files are then computed and put into the Release file. The Release file is " -"then signed by the archive key for this Debian release, and distributed " -"alongside the packages and the Packages files on Debian mirrors. The keys " -"are in the Debian archive keyring available in the <package>debian-archive-" -"keyring</package> package." +"then signed by the archive key for this &keyring-distro; release, and distributed " +"alongside the packages and the Packages files on &keyring-distro; mirrors. The keys " +"are in the &keyring-distro; archive keyring available in the &keyring-package; " +"package." msgstr "" "Po tym jak dostarczony przez opiekuna pakiet zostanie zweryfikowany i " "dołączony do archiwum, sygnatura opiekuna jest usuwana, a sumy kontrolne " "pakietu są wyliczane i umieszczane w pliku Packages. Sumy kontrolne " "wszystkich plików Packages są następnie wyliczane i umieszczane w pliku " "Release. Plik Release jest następnie podpisywany przy użyciu klucza archiwum " -"tego wydania dystrybucji Debiana i dystrybuowany wraz z pakietami i plikami " -"Packages przez serwery lustrzane Debiana. Klucze archiwum znajdują się w " -"składnicy kluczy Debiana dostępnej w pakiecie <package>debian-archive-" -"keyring</package>." +"tego wydania dystrybucji &keyring-distro; i dystrybuowany wraz z pakietami i plikami " +"Packages przez serwery lustrzane &keyring-distro;. Klucze archiwum znajdują się w " +"składnicy kluczy &keyring-distro; dostępnej w pakiecie &keyring-package;." #. type: Content of: <refentry><refsect1><para> #: apt-secure.8.xml:113 @@ -2994,24 +2977,6 @@ msgstr "" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cdrom.8.xml:85 -#, fuzzy -#| msgid "" -#| "Mount point; specify the location to mount the CD-ROM. This mount point " -#| "must be listed in <filename>/etc/fstab</filename> and properly " -#| "configured. Configuration Item: <literal>Acquire::cdrom::mount</literal>." -msgid "" -"Do not try to auto-detect the CD-ROM path. Usually combined with the " -"<option>--cdrom</option> option. Configuration Item: <literal>Acquire::" -"cdrom::AutoDetect</literal>." -msgstr "" -"Punkt montowania. Podaje lokalizację katalogu, w którym będzie zamontowany " -"CD-ROM. Musi istnieć odpowiednia konfiguracja dla tego punktu montowania w " -"pliku <filename>/etc/fstab</filename>. Pozycja w pliku konfiguracyjnym: " -"<literal>Acquire::cdrom::mount</literal>." - -# -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:93 msgid "" "Mount point; specify the location to mount the CD-ROM. This mount point must " "be listed in <filename>/etc/fstab</filename> and properly configured. " @@ -3024,7 +2989,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:102 +#: apt-cdrom.8.xml:94 msgid "" "Rename a disc; change the label of a disc or override the disc's given " "label. This option will cause <command>apt-cdrom</command> to prompt for a " @@ -3037,7 +3002,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:111 +#: apt-cdrom.8.xml:103 msgid "" "No mounting; prevent <command>apt-cdrom</command> from mounting and " "unmounting the mount point. Configuration Item: <literal>APT::CDROM::" @@ -3049,7 +3014,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:119 +#: apt-cdrom.8.xml:111 msgid "" "Fast Copy; Assume the package files are valid and do not check every " "package. This option should be used only if <command>apt-cdrom</command> has " @@ -3064,7 +3029,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:129 +#: apt-cdrom.8.xml:121 msgid "" "Thorough Package Scan; This option may be needed with some old Debian " "1.1/1.2 discs that have Package files in strange places. It takes much " @@ -3077,7 +3042,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:140 +#: apt-cdrom.8.xml:132 msgid "" "No Changes; Do not change the &sources-list; file and do not write index " "files. Everything is still checked however. Configuration Item: " @@ -3089,13 +3054,13 @@ msgstr "" # #. type: Content of: <refentry><refsect1><para> -#: apt-cdrom.8.xml:153 +#: apt-cdrom.8.xml:145 msgid "&apt-conf;, &apt-get;, &sources-list;" msgstr "&apt-conf;, &apt-get;, &sources-list;" # #. type: Content of: <refentry><refsect1><para> -#: apt-cdrom.8.xml:158 +#: apt-cdrom.8.xml:150 msgid "" "<command>apt-cdrom</command> returns zero on normal operation, decimal 100 " "on error." @@ -6117,13 +6082,13 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:92 msgid "" -"<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)" -"</literal> which expands to the Debian architecture (such as <literal>amd64</" -"literal> or <literal>armel</literal>) used on the system. This permits " -"architecture-independent <filename>sources.list</filename> files to be used. " -"In general this is only of interest when specifying an exact path, " -"<literal>APT</literal> will automatically generate a URI with the current " -"architecture otherwise." +"<literal>distribution</literal> may also contain a variable, <literal>" +"$(ARCH)</literal> which expands to the Debian architecture (such as " +"<literal>amd64</literal> or <literal>armel</literal>) used on the system. " +"This permits architecture-independent <filename>sources.list</filename> " +"files to be used. In general this is only of interest when specifying an " +"exact path, <literal>APT</literal> will automatically generate a URI with " +"the current architecture otherwise." msgstr "" "<literal>Dystrybucja</literal> może zawierać także zmienną <literal>$(ARCH)</" "literal>, która zostanie rozwinięta do architektury Debiana (takiej jak " @@ -7432,9 +7397,9 @@ msgstr "OPIS" #: apt.8:31 msgid "" "APT is a management system for software packages. For normal day to day " -"package management there are several frontends available, such as B<aptitude>" -"(8) for the command line or B<synaptic>(8) for the X Window System. Some " -"options are only implemented in B<apt-get>(8) though." +"package management there are several frontends available, such as " +"B<aptitude>(8) for the command line or B<synaptic>(8) for the X Window " +"System. Some options are only implemented in B<apt-get>(8) though." msgstr "" "APT jest systemem zarządzania pakietami oprogramowania. Jest kilka nakładek " "przydatnych do codziennego zarządzania pakietami, takich jak B<aptitude>(8), " @@ -7720,8 +7685,8 @@ msgstr "" "Pierwszą rzeczą <footnote><p> Aby używać serwera proxy, należy najpierw " "ustawić zmienną środowiskową http_proxy, proszę przeczytać sources.list(5)</" "p></footnote>, którą należy zrobić przed użyciem <prgn>apt-get</prgn> jest " -"pobranie listy pakietów (ze <em>źródeł</em> wymienionych w pliku sources.list" -"(5)), tak żeby APT wiedział, jakie pakiety są dostępne. Robi się to za " +"pobranie listy pakietów (ze <em>źródeł</em> wymienionych w pliku sources." +"list(5)), tak żeby APT wiedział, jakie pakiety są dostępne. Robi się to za " "pomocą polecenia <tt>apt-get update</tt>. Na przykład:" #. type: <example></example> diff --git a/doc/po/pt.po b/doc/po/pt.po index 9342b2fda..b06026154 100644 --- a/doc/po/pt.po +++ b/doc/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.9.7.1\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-07-02 17:09+0300\n" +"POT-Creation-Date: 2013-06-13 13:46+0300\n" "PO-Revision-Date: 2012-09-03 01:53+0100\n" "Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n" "Language-Team: Portuguese <l10n@debianpt.org>\n" @@ -809,9 +809,9 @@ msgid "" "installation or upgrading. Each package is a package name, not a fully " "qualified filename (for instance, in a Debian system, <package>apt-utils</" "package> would be the argument provided, not <filename>apt-utils_&apt-" -"product-version;_amd64.deb</filename>). All packages required by the package" -"(s) specified for installation will also be retrieved and installed. The " -"<filename>/etc/apt/sources.list</filename> file is used to locate the " +"product-version;_amd64.deb</filename>). All packages required by the " +"package(s) specified for installation will also be retrieved and installed. " +"The <filename>/etc/apt/sources.list</filename> file is used to locate the " "desired packages. If a hyphen is appended to the package name (with no " "intervening space), the identified package will be removed if it is " "installed. Similarly a plus sign can be used to designate a package to " @@ -1572,7 +1572,7 @@ msgstr "Ficheiros" #. type: Content of: <refentry><refsect1><title> #: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131 -#: apt-secure.8.xml:191 apt-cdrom.8.xml:152 apt-config.8.xml:109 +#: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109 #: apt.conf.5.xml:1173 apt_preferences.5.xml:705 sources.list.5.xml:252 #: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63 #: apt-ftparchive.1.xml:607 @@ -1592,7 +1592,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-get.8.xml:534 apt-cache.8.xml:355 apt-mark.8.xml:135 -#: apt-cdrom.8.xml:157 apt-config.8.xml:114 apt-extracttemplates.1.xml:74 +#: apt-cdrom.8.xml:149 apt-config.8.xml:114 apt-extracttemplates.1.xml:74 #: apt-sortpkgs.1.xml:67 apt-ftparchive.1.xml:611 msgid "Diagnostics" msgstr "Diagnóstico" @@ -2276,24 +2276,17 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:130 -#, fuzzy -#| msgid "" -#| "Update the local keyring with the archive keyring and remove from the " -#| "local keyring the archive keys which are no longer valid. The archive " -#| "keyring is shipped in the <literal>archive-keyring</literal> package of " -#| "your distribution, e.g. the <literal>debian-archive-keyring</literal> " -#| "package in Debian." msgid "" "Update the local keyring with the archive keyring and remove from the local " "keyring the archive keys which are no longer valid. The archive keyring is " "shipped in the <literal>archive-keyring</literal> package of your " -"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in " -"Ubuntu." +"distribution, e.g. the &keyring-package; package in " +"&keyring-distro;." msgstr "" "Actualiza o chaveiro local com o chaveiro do arquivo e remove do chaveiro " "local as chaves de arquivo que já não são válidas. O chaveiro do arquivo é " "submetido no pacote <literal>archive-keyring</literal> da sua distribuição, " -"por exemplo o pacote <literal>debian-archive-keyring</literal> em Debian." +"por exemplo o pacote &keyring-package; em &keyring-distro;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:144 @@ -2356,34 +2349,25 @@ msgstr "Base de dados local de confiança de chaves de arquivos." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:183 -#, fuzzy -#| msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" -msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>" -msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" +msgid "&keyring-filename;" +msgstr "&keyring-filename;" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:184 -#, fuzzy -#| msgid "Keyring of Debian archive trusted keys." -msgid "Keyring of Ubuntu archive trusted keys." -msgstr "Chaveiro das chaves de confiança dos arquivos Debian." +msgid "Keyring of &keyring-distro; archive trusted keys." +msgstr "Chaveiro das chaves de confiança dos arquivos &keyring-distro;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:187 -#, fuzzy -#| msgid "" -#| "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" msgid "" -"<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>" +"&keyring-removed-filename;" msgstr "" -"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" +"&keyring-removed-filename;" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:188 -#, fuzzy -#| msgid "Keyring of Debian archive removed trusted keys." -msgid "Keyring of Ubuntu archive removed trusted keys." -msgstr "Chaveiro das chaves de confiança removidas dos arquivos Debian." +msgid "Keyring of &keyring-distro; archive removed trusted keys." +msgstr "Chaveiro das chaves de confiança removidas dos arquivos &keyring-distro;." #. type: Content of: <refentry><refsect1><para> #: apt-key.8.xml:197 @@ -2625,20 +2609,19 @@ msgid "" "maintainer signature is stripped off, and checksums of the package are " "computed and put in the Packages file. The checksums of all of the Packages " "files are then computed and put into the Release file. The Release file is " -"then signed by the archive key for this Debian release, and distributed " -"alongside the packages and the Packages files on Debian mirrors. The keys " -"are in the Debian archive keyring available in the <package>debian-archive-" -"keyring</package> package." +"then signed by the archive key for this &keyring-distro; release, and distributed " +"alongside the packages and the Packages files on &keyring-distro; mirrors. The keys " +"are in the &keyring-distro; archive keyring available in the &keyring-package; " +"package." msgstr "" "Assim que o pacote submetido é verificado e incluído no arquivo, a " "assinatura do responsável é despojada, são computados sumários de " "verificação do pacote e colocado no ficheiro Packages. Os sumários de " "verificação de todos os ficheiros Packages são então computados e colocados " "no ficheiro Release. O ficheiro Release é então assinado pela chave de " -"arquivo para este lançamento de Debian, e distribuído juntamente com os " -"pacotes e os ficheiros Packages em mirrors de Debian. As chaves estão no " -"chaveiro do arquivo Debian no pacote <package>debian-archive-keyring</" -"package>." +"arquivo para este lançamento de &keyring-distro;, e distribuído juntamente com os " +"pacotes e os ficheiros Packages em mirrors de &keyring-distro;. As chaves estão no " +"chaveiro do arquivo &keyring-distro; no pacote &keyring-package;." #. type: Content of: <refentry><refsect1><para> #: apt-secure.8.xml:113 @@ -2903,23 +2886,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cdrom.8.xml:85 -#, fuzzy -#| msgid "" -#| "Mount point; specify the location to mount the CD-ROM. This mount point " -#| "must be listed in <filename>/etc/fstab</filename> and properly " -#| "configured. Configuration Item: <literal>Acquire::cdrom::mount</literal>." -msgid "" -"Do not try to auto-detect the CD-ROM path. Usually combined with the " -"<option>--cdrom</option> option. Configuration Item: <literal>Acquire::" -"cdrom::AutoDetect</literal>." -msgstr "" -"Ponto de Montagem; especifica a localização para montar o cdrom. Este ponto " -"de montagem deve estar listado em <filename>/etc/fstab</filename> e " -"configurado apropriadamente. Item de configuração: <literal>Acquire::cdrom::" -"mount</literal>." - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:93 msgid "" "Mount point; specify the location to mount the CD-ROM. This mount point must " "be listed in <filename>/etc/fstab</filename> and properly configured. " @@ -2931,7 +2897,7 @@ msgstr "" "mount</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:102 +#: apt-cdrom.8.xml:94 msgid "" "Rename a disc; change the label of a disc or override the disc's given " "label. This option will cause <command>apt-cdrom</command> to prompt for a " @@ -2943,7 +2909,7 @@ msgstr "" "CDROM::Rename</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:111 +#: apt-cdrom.8.xml:103 msgid "" "No mounting; prevent <command>apt-cdrom</command> from mounting and " "unmounting the mount point. Configuration Item: <literal>APT::CDROM::" @@ -2954,7 +2920,7 @@ msgstr "" "NoMount</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:119 +#: apt-cdrom.8.xml:111 msgid "" "Fast Copy; Assume the package files are valid and do not check every " "package. This option should be used only if <command>apt-cdrom</command> has " @@ -2967,7 +2933,7 @@ msgstr "" "configuração: <literal>APT::CDROM::Fast</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:129 +#: apt-cdrom.8.xml:121 msgid "" "Thorough Package Scan; This option may be needed with some old Debian " "1.1/1.2 discs that have Package files in strange places. It takes much " @@ -2978,7 +2944,7 @@ msgstr "" "estranhos. Demora muito mais tempo a sondar o CD mas irá apanhá-los a todos." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:140 +#: apt-cdrom.8.xml:132 msgid "" "No Changes; Do not change the &sources-list; file and do not write index " "files. Everything is still checked however. Configuration Item: " @@ -2989,12 +2955,12 @@ msgstr "" "configuração: <literal>APT::CDROM::NoAct</literal>." #. type: Content of: <refentry><refsect1><para> -#: apt-cdrom.8.xml:153 +#: apt-cdrom.8.xml:145 msgid "&apt-conf;, &apt-get;, &sources-list;" msgstr "&apt-conf;, &apt-get;, &sources-list;" #. type: Content of: <refentry><refsect1><para> -#: apt-cdrom.8.xml:158 +#: apt-cdrom.8.xml:150 msgid "" "<command>apt-cdrom</command> returns zero on normal operation, decimal 100 " "on error." @@ -3809,12 +3775,12 @@ msgid "" "be used." msgstr "" "<literal>http::Proxy</literal> define o proxy http predefinido a usar para " -"URIs de HTTP. Está no formato standard de <literal>http://[[user][:pass]@]" -"host[:port]/</literal>. Também podem ser especificados proxies por máquina " -"ao usar o formato <literal>http::Proxy::<host></literal> com a palavra " -"chave especial <literal>DIRECT</literal> que significa não usar proxies. Se " -"nenhuma das definições acima for especificada, será usada a variável de " -"ambiente <envar>http_proxy</envar>." +"URIs de HTTP. Está no formato standard de <literal>http://[[user][:" +"pass]@]host[:port]/</literal>. Também podem ser especificados proxies por " +"máquina ao usar o formato <literal>http::Proxy::<host></literal> com a " +"palavra chave especial <literal>DIRECT</literal> que significa não usar " +"proxies. Se nenhuma das definições acima for especificada, será usada a " +"variável de ambiente <envar>http_proxy</envar>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:366 @@ -3987,8 +3953,9 @@ msgstr "" "servidor proxy ao que se ligar. Por favor veja &configureindex; para um " "exemplo de como fazer isto. As variáveis de substituição que representam o " "componente URI correspondente são <literal>$(PROXY_USER)</literal> <literal>" -"$(PROXY_PASS)</literal> <literal>$(SITE_USER)</literal> <literal>$(SITE_PASS)" -"</literal> <literal>$(SITE)</literal> e <literal>$(SITE_PORT)</literal>." +"$(PROXY_PASS)</literal> <literal>$(SITE_USER)</literal> <literal>" +"$(SITE_PASS)</literal> <literal>$(SITE)</literal> e <literal>$(SITE_PORT)</" +"literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:451 @@ -6616,13 +6583,13 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:92 msgid "" -"<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)" -"</literal> which expands to the Debian architecture (such as <literal>amd64</" -"literal> or <literal>armel</literal>) used on the system. This permits " -"architecture-independent <filename>sources.list</filename> files to be used. " -"In general this is only of interest when specifying an exact path, " -"<literal>APT</literal> will automatically generate a URI with the current " -"architecture otherwise." +"<literal>distribution</literal> may also contain a variable, <literal>" +"$(ARCH)</literal> which expands to the Debian architecture (such as " +"<literal>amd64</literal> or <literal>armel</literal>) used on the system. " +"This permits architecture-independent <filename>sources.list</filename> " +"files to be used. In general this is only of interest when specifying an " +"exact path, <literal>APT</literal> will automatically generate a URI with " +"the current architecture otherwise." msgstr "" "<literal>distribution</literal> também pode conter uma variável. <literal>" "$(ARCH)</literal> a qual se expande à arquitectura Debian (tal como " @@ -8119,9 +8086,9 @@ msgstr "DESCRIÇÃO" #: apt.8:31 msgid "" "APT is a management system for software packages. For normal day to day " -"package management there are several frontends available, such as B<aptitude>" -"(8) for the command line or B<synaptic>(8) for the X Window System. Some " -"options are only implemented in B<apt-get>(8) though." +"package management there are several frontends available, such as " +"B<aptitude>(8) for the command line or B<synaptic>(8) for the X Window " +"System. Some options are only implemented in B<apt-get>(8) though." msgstr "" "APT é um sistema de gestão para pacotes de software. Para a gestão de " "pacotes normal do dia-a-dia existem vários frontends disponíveis, como o " @@ -8400,11 +8367,11 @@ msgid "" "instance," msgstr "" "O primeira <footnote><p>se você está a usar um servidor proxy http você tem " -"que definir a variável de ambiente http_proxy primeiro, veja sources.list(5)" -"</p></footnote> coisa que deve ser feita antes de usar <prgn>apt-get</prgn> " -"é obter as listas de pacotes a partir das <em>Sources</em> para que ele " -"saiba que pacotes estão disponíveis. Isto é feito com <tt>apt-get update</" -"tt>. Por exemplo," +"que definir a variável de ambiente http_proxy primeiro, veja sources." +"list(5)</p></footnote> coisa que deve ser feita antes de usar <prgn>apt-get</" +"prgn> é obter as listas de pacotes a partir das <em>Sources</em> para que " +"ele saiba que pacotes estão disponíveis. Isto é feito com <tt>apt-get " +"update</tt>. Por exemplo," #. type: <example></example> #: guide.sgml:116 diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po index 7b105cf47..a5df9e80e 100644 --- a/doc/po/pt_BR.po +++ b/doc/po/pt_BR.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-07-02 17:09+0300\n" +"POT-Creation-Date: 2013-06-13 13:46+0300\n" "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" @@ -586,9 +586,9 @@ msgid "" "installation or upgrading. Each package is a package name, not a fully " "qualified filename (for instance, in a Debian system, <package>apt-utils</" "package> would be the argument provided, not <filename>apt-utils_&apt-" -"product-version;_amd64.deb</filename>). All packages required by the package" -"(s) specified for installation will also be retrieved and installed. The " -"<filename>/etc/apt/sources.list</filename> file is used to locate the " +"product-version;_amd64.deb</filename>). All packages required by the " +"package(s) specified for installation will also be retrieved and installed. " +"The <filename>/etc/apt/sources.list</filename> file is used to locate the " "desired packages. If a hyphen is appended to the package name (with no " "intervening space), the identified package will be removed if it is " "installed. Similarly a plus sign can be used to designate a package to " @@ -1097,7 +1097,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131 -#: apt-secure.8.xml:191 apt-cdrom.8.xml:152 apt-config.8.xml:109 +#: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109 #: apt.conf.5.xml:1173 apt_preferences.5.xml:705 sources.list.5.xml:252 #: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63 #: apt-ftparchive.1.xml:607 @@ -1115,7 +1115,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-get.8.xml:534 apt-cache.8.xml:355 apt-mark.8.xml:135 -#: apt-cdrom.8.xml:157 apt-config.8.xml:114 apt-extracttemplates.1.xml:74 +#: apt-cdrom.8.xml:149 apt-config.8.xml:114 apt-extracttemplates.1.xml:74 #: apt-sortpkgs.1.xml:67 apt-ftparchive.1.xml:611 msgid "Diagnostics" msgstr "" @@ -1618,8 +1618,8 @@ msgid "" "Update the local keyring with the archive keyring and remove from the local " "keyring the archive keys which are no longer valid. The archive keyring is " "shipped in the <literal>archive-keyring</literal> package of your " -"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in " -"Ubuntu." +"distribution, e.g. the &keyring-package; package in " +"&keyring-distro;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> @@ -1669,23 +1669,23 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:183 -msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>" +msgid "&keyring-filename;" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:184 -msgid "Keyring of Ubuntu archive trusted keys." +msgid "Keyring of &keyring-distro; archive trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:187 msgid "" -"<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>" +"&keyring-removed-filename;" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:188 -msgid "Keyring of Ubuntu archive removed trusted keys." +msgid "Keyring of &keyring-distro; archive removed trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><para> @@ -1863,10 +1863,10 @@ msgid "" "maintainer signature is stripped off, and checksums of the package are " "computed and put in the Packages file. The checksums of all of the Packages " "files are then computed and put into the Release file. The Release file is " -"then signed by the archive key for this Debian release, and distributed " -"alongside the packages and the Packages files on Debian mirrors. The keys " -"are in the Debian archive keyring available in the <package>debian-archive-" -"keyring</package> package." +"then signed by the archive key for this &keyring-distro; release, and distributed " +"alongside the packages and the Packages files on &keyring-distro; mirrors. The keys " +"are in the &keyring-distro; archive keyring available in the &keyring-package; " +"package." msgstr "" #. type: Content of: <refentry><refsect1><para> @@ -2061,21 +2061,13 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cdrom.8.xml:85 msgid "" -"Do not try to auto-detect the CD-ROM path. Usually combined with the " -"<option>--cdrom</option> option. Configuration Item: <literal>Acquire::" -"cdrom::AutoDetect</literal>." -msgstr "" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:93 -msgid "" "Mount point; specify the location to mount the CD-ROM. This mount point must " "be listed in <filename>/etc/fstab</filename> and properly configured. " "Configuration Item: <literal>Acquire::cdrom::mount</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:102 +#: apt-cdrom.8.xml:94 msgid "" "Rename a disc; change the label of a disc or override the disc's given " "label. This option will cause <command>apt-cdrom</command> to prompt for a " @@ -2083,7 +2075,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:111 +#: apt-cdrom.8.xml:103 msgid "" "No mounting; prevent <command>apt-cdrom</command> from mounting and " "unmounting the mount point. Configuration Item: <literal>APT::CDROM::" @@ -2091,7 +2083,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:119 +#: apt-cdrom.8.xml:111 msgid "" "Fast Copy; Assume the package files are valid and do not check every " "package. This option should be used only if <command>apt-cdrom</command> has " @@ -2100,7 +2092,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:129 +#: apt-cdrom.8.xml:121 msgid "" "Thorough Package Scan; This option may be needed with some old Debian " "1.1/1.2 discs that have Package files in strange places. It takes much " @@ -2108,7 +2100,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cdrom.8.xml:140 +#: apt-cdrom.8.xml:132 msgid "" "No Changes; Do not change the &sources-list; file and do not write index " "files. Everything is still checked however. Configuration Item: " @@ -2116,13 +2108,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-cdrom.8.xml:153 +#: apt-cdrom.8.xml:145 #, fuzzy msgid "&apt-conf;, &apt-get;, &sources-list;" msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;" #. type: Content of: <refentry><refsect1><para> -#: apt-cdrom.8.xml:158 +#: apt-cdrom.8.xml:150 msgid "" "<command>apt-cdrom</command> returns zero on normal operation, decimal 100 " "on error." @@ -4847,8 +4839,8 @@ msgid "" "id=\"0\"/>" msgstr "" "Com um arquivo &sources-list; adequado e o arquivo de preferências do APT " -"acima, quaisquer dos comandos a seguir farão com que o APT atualize para a" -"(s) última(s) versão(ões) <literal>testing</literal>." +"acima, quaisquer dos comandos a seguir farão com que o APT atualize para " +"a(s) última(s) versão(ões) <literal>testing</literal>." #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> #: apt_preferences.5.xml:633 @@ -5068,13 +5060,13 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:92 msgid "" -"<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)" -"</literal> which expands to the Debian architecture (such as <literal>amd64</" -"literal> or <literal>armel</literal>) used on the system. This permits " -"architecture-independent <filename>sources.list</filename> files to be used. " -"In general this is only of interest when specifying an exact path, " -"<literal>APT</literal> will automatically generate a URI with the current " -"architecture otherwise." +"<literal>distribution</literal> may also contain a variable, <literal>" +"$(ARCH)</literal> which expands to the Debian architecture (such as " +"<literal>amd64</literal> or <literal>armel</literal>) used on the system. " +"This permits architecture-independent <filename>sources.list</filename> " +"files to be used. In general this is only of interest when specifying an " +"exact path, <literal>APT</literal> will automatically generate a URI with " +"the current architecture otherwise." msgstr "" #. type: Content of: <refentry><refsect1><para> @@ -6195,9 +6187,9 @@ msgstr "" #: apt.8:31 msgid "" "APT is a management system for software packages. For normal day to day " -"package management there are several frontends available, such as B<aptitude>" -"(8) for the command line or B<synaptic>(8) for the X Window System. Some " -"options are only implemented in B<apt-get>(8) though." +"package management there are several frontends available, such as " +"B<aptitude>(8) for the command line or B<synaptic>(8) for the X Window " +"System. Some options are only implemented in B<apt-get>(8) though." msgstr "" #. type: SH diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml index fa32297c2..87fb4d71e 100644 --- a/doc/sources.list.5.xml +++ b/doc/sources.list.5.xml @@ -8,6 +8,8 @@ <!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent"> %aptverbatiment; +<!ENTITY % aptvendor SYSTEM "apt-vendor.ent"> +%aptvendor; ]> <refentry> diff --git a/test/integration/framework b/test/integration/framework index 20f3487cc..89b5bb0e4 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -192,6 +192,7 @@ setupenvironment() { fi echo "DPKG::options:: \"--log=${TMPWORKINGDIRECTORY}/rootdir/var/log/dpkg.log\";" >> aptconfig.conf echo 'quiet::NoUpdate "true";' >> aptconfig.conf + echo "Acquire::https::CaInfo \"${TESTDIR}/apt.pem\";" > rootdir/etc/apt/apt.conf.d/99https export LC_ALL=C export PATH="${PATH}:/usr/local/sbin:/usr/sbin:/sbin" configcompression '.' 'gz' #'bz2' 'lzma' 'xz' @@ -791,6 +792,22 @@ signreleasefiles() { msgdone "info" } +webserverconfig() { + msgtest "Set webserver config option '${1}' to" "$2" + downloadfile "http://localhost:8080/_config/set/${1}/${2}" '/dev/null' >/dev/null + local DOWNLOG='download-testfile.log' + rm -f "$DOWNLOG" + local STATUS="$(mktemp)" + addtrap "rm $STATUS;" + downloadfile "http://localhost:8080/_config/find/aptwebserver::last-status-code" "$STATUS" > "$DOWNLOG" + if [ "$(cat "$STATUS")" = '200' ]; then + msgpass + else + cat >&2 "$DOWNLOG" + msgfail "Statuscode was $(cat "$STATUS")" + fi +} + rewritesourceslist() { local APTARCHIVE="file://$(readlink -f "${TMPWORKINGDIRECTORY}/aptarchive")" for LIST in $(find rootdir/etc/apt/sources.list.d/ -name 'apt-test-*.list'); do @@ -799,6 +816,11 @@ rewritesourceslist() { } changetowebserver() { + if [ "$1" != '--no-rewrite' ]; then + rewritesourceslist 'http://localhost:8080/' + else + shift + fi local LOG='/dev/null' if test -x ${BUILDDIRECTORY}/aptwebserver; then cd aptarchive @@ -812,9 +834,6 @@ changetowebserver() { else msgdie 'You have to build aptwerbserver or install a webserver' fi - if [ "$1" != '--no-rewrite' ]; then - rewritesourceslist 'http://localhost:8080/' - fi } changetohttpswebserver() { @@ -826,6 +845,7 @@ changetohttpswebserver() { fi echo "pid = ${TMPWORKINGDIRECTORY}/aptarchive/stunnel.pid cert = ${TESTDIRECTORY}/apt.pem +output = /dev/null [https] accept = 4433 diff --git a/test/integration/test-bug-719263-print-uris-removes-authentication b/test/integration/test-bug-719263-print-uris-removes-authentication index 1c1a27ceb..5e674db0b 100755 --- a/test/integration/test-bug-719263-print-uris-removes-authentication +++ b/test/integration/test-bug-719263-print-uris-removes-authentication @@ -25,6 +25,7 @@ Inst unrelated [1] (2 unstable [all]) Conf unrelated (2 unstable [all])' aptget install unrelated -s testsuccess aptget install unrelated -y testdpkginstalled unrelated + rm -rf rootdir/var/cache/apt/*.bin cp -a rootdir/var/lib/dpkg/status-backup-noact rootdir/var/lib/dpkg/status } diff --git a/test/integration/test-partial-file-support b/test/integration/test-partial-file-support index 8d1c51ae0..382789e68 100755 --- a/test/integration/test-partial-file-support +++ b/test/integration/test-partial-file-support @@ -18,7 +18,7 @@ testdownloadfile() { rm -f "$DOWNLOG" msgtest "Testing download of file $2 with" "$1" if ! downloadfile "$2" "$3" > "$DOWNLOG"; then - cat "$DOWNLOG" + cat >&2 "$DOWNLOG" msgfail else msgpass @@ -40,21 +40,23 @@ testdownloadfile() { if [ "$EXPECTED" "$4" "$hash" ]; then msgpass else - cat "$DOWNLOG" + cat >&2 "$DOWNLOG" msgfail "expected: $EXPECTED ; got: $hash" fi done } testwebserverlaststatuscode() { - STATUS="$(mktemp)" + local DOWNLOG='download-testfile.log' + rm -f "$DOWNLOG" + local STATUS="$(mktemp)" addtrap "rm $STATUS;" msgtest 'Test last status code from the webserver was' "$1" - downloadfile "http://localhost:8080/_config/find/aptwebserver::last-status-code" "$STATUS" >/dev/null + downloadfile "http://localhost:8080/_config/find/aptwebserver::last-status-code" "$STATUS" > "$DOWNLOG" if [ "$(cat "$STATUS")" = "$1" ]; then msgpass else - cat download-testfile.log + cat >&2 "$DOWNLOG" msgfail "Status was $(cat "$STATUS")" fi } @@ -64,8 +66,7 @@ TESTFILE='aptarchive/testfile' cp -a ${TESTDIR}/framework $TESTFILE testrun() { - downloadfile "$1/_config/set/aptwebserver::support::range/true" '/dev/null' >/dev/null - testwebserverlaststatuscode '200' + webserverconfig 'aptwebserver::support::range' 'true' copysource $TESTFILE 0 ./testfile testdownloadfile 'no data' "${1}/testfile" './testfile' '=' @@ -92,8 +93,7 @@ testrun() { testdownloadfile 'old data' "${1}/testfile" './testfile' '=' testwebserverlaststatuscode '200' - downloadfile "$1/_config/set/aptwebserver::support::range/false" '/dev/null' >/dev/null - testwebserverlaststatuscode '200' + webserverconfig 'aptwebserver::support::range' 'false' copysource $TESTFILE 20 ./testfile testdownloadfile 'no server support' "${1}/testfile" './testfile' '=' diff --git a/test/integration/test-releasefile-verification b/test/integration/test-releasefile-verification index 9d34a521a..e558b83e8 100755 --- a/test/integration/test-releasefile-verification +++ b/test/integration/test-releasefile-verification @@ -11,7 +11,7 @@ buildaptarchive setupflataptarchive changetowebserver -downloadfile "http://localhost:8080/_config/set/aptwebserver::support::range/false" '/dev/null' >/dev/null +webserverconfig 'aptwebserver::support::range' 'false' prepare() { local DATE="${2:-now}" diff --git a/test/interactive-helper/aptwebserver.cc b/test/interactive-helper/aptwebserver.cc index 4dae342dd..b7663a76a 100644 --- a/test/interactive-helper/aptwebserver.cc +++ b/test/interactive-helper/aptwebserver.cc @@ -112,7 +112,7 @@ bool sendHead(int const client, int const httpcode, std::list<std::string> &head date.append(TimeRFC1123(time(NULL))); headers.push_back(date); - std::clog << ">>> RESPONSE >>>" << std::endl; + std::clog << ">>> RESPONSE to " << client << " >>>" << std::endl; bool Success = true; for (std::list<std::string>::const_iterator h = headers.begin(); Success == true && h != headers.end(); ++h) @@ -137,21 +137,21 @@ bool sendFile(int const client, FileFd &data) /*{{{*/ { if (actual == 0) break; - if (Success == true) - Success &= FileFd::Write(client, buffer, actual); + Success &= FileFd::Write(client, buffer, actual); } - if (Success == true) - Success &= FileFd::Write(client, "\r\n", 2); + if (Success == false) + std::cerr << "SENDFILE: READ/WRITE ERROR to " << client << std::endl; return Success; } /*}}}*/ bool sendData(int const client, std::string const &data) /*{{{*/ { - bool Success = true; - Success &= FileFd::Write(client, data.c_str(), data.size()); - if (Success == true) - Success &= FileFd::Write(client, "\r\n", 2); - return Success; + if (FileFd::Write(client, data.c_str(), data.size()) == false) + { + std::cerr << "SENDDATA: WRITE ERROR to " << client << std::endl; + return false; + } + return true; } /*}}}*/ void sendError(int const client, int const httpcode, std::string const &request,/*{{{*/ @@ -198,7 +198,17 @@ void sendRedirect(int const client, int const httpcode, std::string const &uri,/ addDataHeaders(headers, response); std::string location("Location: "); if (strncmp(uri.c_str(), "http://", 7) != 0) - location.append("http://").append(LookupTag(request, "Host")).append("/").append(uri); + { + location.append("http://").append(LookupTag(request, "Host")).append("/"); + if (strncmp("/home/", uri.c_str(), strlen("/home/")) == 0 && uri.find("/public_html/") != std::string::npos) + { + std::string homeuri = SubstVar(uri, "/home/", "~"); + homeuri = SubstVar(homeuri, "/public_html/", "/"); + location.append(homeuri); + } + else + location.append(uri); + } else location.append(uri); headers.push_back(location); @@ -267,7 +277,7 @@ void sendDirectoryListing(int const client, std::string const &dir, /*{{{*/ << "</head>" << std::endl << "<body><h1>Index of " << dir << "</h1>" << std::endl << "<table><tr><th>#</th><th>Name</th><th>Size</th><th>Last-Modified</th></tr>" << std::endl; - if (dir != ".") + if (dir != "./") listing << "<tr><td>d</td><td><a href=\"..\">Parent Directory</a></td><td>-</td><td>-</td></tr>"; for (int i = 0; i < counter; ++i) { struct stat fs; @@ -298,7 +308,7 @@ void sendDirectoryListing(int const client, std::string const &dir, /*{{{*/ } /*}}}*/ bool parseFirstLine(int const client, std::string const &request, /*{{{*/ - std::string &filename, bool &sendContent, + std::string &filename, std::string ¶ms, bool &sendContent, bool &closeConnection) { if (strncmp(request.c_str(), "HEAD ", 5) == 0) @@ -365,6 +375,14 @@ bool parseFirstLine(int const client, std::string const &request, /*{{{*/ sendError(client, 400, request, sendContent, "Request is absolutePath, but configured to not accept that"); return false; } + + size_t paramspos = filename.find('?'); + if (paramspos != std::string::npos) + { + params = filename.substr(paramspos + 1); + filename.erase(paramspos); + } + filename = DeQuoteString(filename); // this is not a secure server, but at least prevent the obvious … @@ -380,7 +398,32 @@ bool parseFirstLine(int const client, std::string const &request, /*{{{*/ // nuke the first character which is a / as we assured above filename.erase(0, 1); if (filename.empty() == true) - filename = "."; + filename = "./"; + // support ~user/ uris to refer to /home/user/public_html/ as a kind-of special directory + else if (filename[0] == '~') + { + // /home/user is actually not entirely correct, but good enough for now + size_t dashpos = filename.find('/'); + if (dashpos != std::string::npos) + { + std::string home = filename.substr(1, filename.find('/') - 1); + std::string pubhtml = filename.substr(filename.find('/') + 1); + filename = "/home/" + home + "/public_html/" + pubhtml; + } + else + filename = "/home/" + filename.substr(1) + "/public_html/"; + } + + // if no filename is given, but a valid directory see if we can use an index or + // have to resort to a autogenerated directory listing later on + if (DirectoryExists(filename) == true) + { + std::string const directoryIndex = _config->Find("aptwebserver::directoryindex"); + if (directoryIndex.empty() == false && directoryIndex == flNotDir(directoryIndex) && + RealFileExists(filename + directoryIndex) == true) + filename += directoryIndex; + } + return true; } /*}}}*/ @@ -427,6 +470,173 @@ bool handleOnTheFlyReconfiguration(int const client, std::string const &request, return false; } /*}}}*/ +void * handleClient(void * voidclient) /*{{{*/ +{ + int client = *((int*)(voidclient)); + std::clog << "ACCEPT client " << client << std::endl; + std::vector<std::string> messages; + while (ReadMessages(client, messages)) + { + bool closeConnection = false; + for (std::vector<std::string>::const_iterator m = messages.begin(); + m != messages.end() && closeConnection == false; ++m) { + std::clog << ">>> REQUEST from " << client << " >>>" << std::endl << *m + << std::endl << "<<<<<<<<<<<<<<<<" << std::endl; + std::list<std::string> headers; + std::string filename; + std::string params; + bool sendContent = true; + if (parseFirstLine(client, *m, filename, params, sendContent, closeConnection) == false) + continue; + + // special webserver command request + if (filename.length() > 1 && filename[0] == '_') + { + std::vector<std::string> parts = VectorizeString(filename, '/'); + if (parts[0] == "_config") + { + handleOnTheFlyReconfiguration(client, *m, parts); + continue; + } + } + + // string replacements in the requested filename + ::Configuration::Item const *Replaces = _config->Tree("aptwebserver::redirect::replace"); + if (Replaces != NULL) + { + std::string redirect = "/" + filename; + for (::Configuration::Item *I = Replaces->Child; I != NULL; I = I->Next) + redirect = SubstVar(redirect, I->Tag, I->Value); + redirect.erase(0,1); + if (redirect != filename) + { + sendRedirect(client, 301, redirect, *m, sendContent); + continue; + } + } + + ::Configuration::Item const *Overwrite = _config->Tree("aptwebserver::overwrite"); + if (Overwrite != NULL) + { + for (::Configuration::Item *I = Overwrite->Child; I != NULL; I = I->Next) + { + regex_t *pattern = new regex_t; + int const res = regcomp(pattern, I->Tag.c_str(), REG_EXTENDED | REG_ICASE | REG_NOSUB); + if (res != 0) + { + char error[300]; + regerror(res, pattern, error, sizeof(error)); + sendError(client, 500, *m, sendContent, error); + continue; + } + if (regexec(pattern, filename.c_str(), 0, 0, 0) == 0) + { + filename = _config->Find("aptwebserver::overwrite::" + I->Tag + "::filename", filename); + if (filename[0] == '/') + filename.erase(0,1); + regfree(pattern); + break; + } + regfree(pattern); + } + } + + // deal with the request + if (RealFileExists(filename) == true) + { + FileFd data(filename, FileFd::ReadOnly); + std::string condition = LookupTag(*m, "If-Modified-Since", ""); + if (_config->FindB("aptwebserver::support::modified-since", true) == true && condition.empty() == false) + { + time_t cache; + if (RFC1123StrToTime(condition.c_str(), cache) == true && + cache >= data.ModificationTime()) + { + sendHead(client, 304, headers); + continue; + } + } + + if (_config->FindB("aptwebserver::support::range", true) == true) + condition = LookupTag(*m, "Range", ""); + else + condition.clear(); + if (condition.empty() == false && strncmp(condition.c_str(), "bytes=", 6) == 0) + { + time_t cache; + std::string ifrange; + if (_config->FindB("aptwebserver::support::if-range", true) == true) + ifrange = LookupTag(*m, "If-Range", ""); + bool validrange = (ifrange.empty() == true || + (RFC1123StrToTime(ifrange.c_str(), cache) == true && + cache <= data.ModificationTime())); + + // FIXME: support multiple byte-ranges (APT clients do not do this) + if (condition.find(',') == std::string::npos) + { + size_t start = 6; + unsigned long long filestart = strtoull(condition.c_str() + start, NULL, 10); + // FIXME: no support for last-byte-pos being not the end of the file (APT clients do not do this) + size_t dash = condition.find('-') + 1; + unsigned long long fileend = strtoull(condition.c_str() + dash, NULL, 10); + unsigned long long filesize = data.FileSize(); + if ((fileend == 0 || (fileend == filesize && fileend >= filestart)) && + validrange == true) + { + if (filesize > filestart) + { + data.Skip(filestart); + std::ostringstream contentlength; + contentlength << "Content-Length: " << (filesize - filestart); + headers.push_back(contentlength.str()); + std::ostringstream contentrange; + contentrange << "Content-Range: bytes " << filestart << "-" + << filesize - 1 << "/" << filesize; + headers.push_back(contentrange.str()); + sendHead(client, 206, headers); + if (sendContent == true) + sendFile(client, data); + continue; + } + else + { + headers.push_back("Content-Length: 0"); + std::ostringstream contentrange; + contentrange << "Content-Range: bytes */" << filesize; + headers.push_back(contentrange.str()); + sendHead(client, 416, headers); + continue; + } + } + } + } + + addFileHeaders(headers, data); + sendHead(client, 200, headers); + if (sendContent == true) + sendFile(client, data); + } + else if (DirectoryExists(filename) == true) + { + if (filename[filename.length()-1] == '/') + sendDirectoryListing(client, filename, *m, sendContent); + else + sendRedirect(client, 301, filename.append("/"), *m, sendContent); + } + else + sendError(client, 404, *m, sendContent); + } + _error->DumpErrors(std::cerr); + messages.clear(); + if (closeConnection == true) + break; + } + close(client); + std::clog << "CLOSE client " << client << std::endl; + return NULL; +} + /*}}}*/ + int main(int const argc, const char * argv[]) { CommandLine::Args Args[] = { @@ -447,6 +657,9 @@ int main(int const argc, const char * argv[]) // create socket, bind and listen to it {{{ // ignore SIGPIPE, this can happen on write() if the socket closes connection signal(SIGPIPE, SIG_IGN); + // we don't care for our slaves, so ignore their death + signal(SIGCHLD, SIG_IGN); + int sock = socket(AF_INET6, SOCK_STREAM, 0); if(sock < 0) { @@ -514,178 +727,47 @@ int main(int const argc, const char * argv[]) std::clog << "Serving ANY file on port: " << port << std::endl; - listen(sock, 1); + int const slaves = _config->FindB("aptwebserver::slaves", SOMAXCONN); + listen(sock, slaves); /*}}}*/ _config->CndSet("aptwebserver::response-header::Server", "APT webserver"); _config->CndSet("aptwebserver::response-header::Accept-Ranges", "bytes"); + _config->CndSet("aptwebserver::directoryindex", "index.html"); - std::vector<std::string> messages; - int client; - while ((client = accept(sock, NULL, NULL)) != -1) - { - std::clog << "ACCEPT client " << client - << " on socket " << sock << std::endl; + std::list<int> accepted_clients; - while (ReadMessages(client, messages)) + while (true) + { + int client = accept(sock, NULL, NULL); + if (client == -1) { - bool closeConnection = false; - for (std::vector<std::string>::const_iterator m = messages.begin(); - m != messages.end() && closeConnection == false; ++m) { - std::clog << ">>> REQUEST >>>>" << std::endl << *m - << std::endl << "<<<<<<<<<<<<<<<<" << std::endl; - std::list<std::string> headers; - std::string filename; - bool sendContent = true; - if (parseFirstLine(client, *m, filename, sendContent, closeConnection) == false) - continue; - - // special webserver command request - if (filename.length() > 1 && filename[0] == '_') - { - std::vector<std::string> parts = VectorizeString(filename, '/'); - if (parts[0] == "_config") - { - handleOnTheFlyReconfiguration(client, *m, parts); - continue; - } - } - - // string replacements in the requested filename - ::Configuration::Item const *Replaces = _config->Tree("aptwebserver::redirect::replace"); - if (Replaces != NULL) - { - std::string redirect = "/" + filename; - for (::Configuration::Item *I = Replaces->Child; I != NULL; I = I->Next) - redirect = SubstVar(redirect, I->Tag, I->Value); - redirect.erase(0,1); - if (redirect != filename) - { - sendRedirect(client, 301, redirect, *m, sendContent); - continue; - } - } - - ::Configuration::Item const *Overwrite = _config->Tree("aptwebserver::overwrite"); - if (Overwrite != NULL) - { - for (::Configuration::Item *I = Overwrite->Child; I != NULL; I = I->Next) - { - regex_t *pattern = new regex_t; - int const res = regcomp(pattern, I->Tag.c_str(), REG_EXTENDED | REG_ICASE | REG_NOSUB); - if (res != 0) - { - char error[300]; - regerror(res, pattern, error, sizeof(error)); - sendError(client, 500, *m, sendContent, error); - continue; - } - if (regexec(pattern, filename.c_str(), 0, 0, 0) == 0) - { - filename = _config->Find("aptwebserver::overwrite::" + I->Tag + "::filename", filename); - if (filename[0] == '/') - filename.erase(0,1); - regfree(pattern); - break; - } - regfree(pattern); - } - } - - // deal with the request - if (RealFileExists(filename) == true) - { - FileFd data(filename, FileFd::ReadOnly); - std::string condition = LookupTag(*m, "If-Modified-Since", ""); - if (condition.empty() == false) - { - time_t cache; - if (RFC1123StrToTime(condition.c_str(), cache) == true && - cache >= data.ModificationTime()) - { - sendHead(client, 304, headers); - continue; - } - } - - if (_config->FindB("aptwebserver::support::range", true) == true) - condition = LookupTag(*m, "Range", ""); - else - condition.clear(); - if (condition.empty() == false && strncmp(condition.c_str(), "bytes=", 6) == 0) - { - time_t cache; - std::string ifrange; - if (_config->FindB("aptwebserver::support::if-range", true) == true) - ifrange = LookupTag(*m, "If-Range", ""); - bool validrange = (ifrange.empty() == true || - (RFC1123StrToTime(ifrange.c_str(), cache) == true && - cache <= data.ModificationTime())); - - // FIXME: support multiple byte-ranges (APT clients do not do this) - if (condition.find(',') == std::string::npos) - { - size_t start = 6; - unsigned long long filestart = strtoull(condition.c_str() + start, NULL, 10); - // FIXME: no support for last-byte-pos being not the end of the file (APT clients do not do this) - size_t dash = condition.find('-') + 1; - unsigned long long fileend = strtoull(condition.c_str() + dash, NULL, 10); - unsigned long long filesize = data.FileSize(); - if ((fileend == 0 || (fileend == filesize && fileend >= filestart)) && - validrange == true) - { - if (filesize > filestart) - { - data.Skip(filestart); - std::ostringstream contentlength; - contentlength << "Content-Length: " << (filesize - filestart); - headers.push_back(contentlength.str()); - std::ostringstream contentrange; - contentrange << "Content-Range: bytes " << filestart << "-" - << filesize - 1 << "/" << filesize; - headers.push_back(contentrange.str()); - sendHead(client, 206, headers); - if (sendContent == true) - sendFile(client, data); - continue; - } - else - { - headers.push_back("Content-Length: 0"); - std::ostringstream contentrange; - contentrange << "Content-Range: bytes */" << filesize; - headers.push_back(contentrange.str()); - sendHead(client, 416, headers); - continue; - } - } - } - } + if (errno == EINTR) + continue; + _error->Errno("accept", "Couldn't accept client on socket %d", sock); + _error->DumpErrors(std::cerr); + return 6; + } - addFileHeaders(headers, data); - sendHead(client, 200, headers); - if (sendContent == true) - sendFile(client, data); - } - else if (DirectoryExists(filename) == true) - { - if (filename == "." || filename[filename.length()-1] == '/') - sendDirectoryListing(client, filename, *m, sendContent); - else - sendRedirect(client, 301, filename.append("/"), *m, sendContent); - } - else - sendError(client, 404, *m, sendContent); - } + pthread_attr_t attr; + if (pthread_attr_init(&attr) != 0 || pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED) != 0) + { + _error->Errno("pthread_attr", "Couldn't set detach attribute for a fresh thread to handle client %d on socket %d", client, sock); _error->DumpErrors(std::cerr); - messages.clear(); - if (closeConnection == true) - break; + close(client); + continue; } - std::clog << "CLOSE client " << client - << " on socket " << sock << std::endl; - close(client); + pthread_t tid; + // thats rather dirty, but we need to store the client socket somewhere safe + accepted_clients.push_front(client); + if (pthread_create(&tid, &attr, &handleClient, &(*accepted_clients.begin())) != 0) + { + _error->Errno("pthread_create", "Couldn't create a fresh thread to handle client %d on socket %d", client, sock); + _error->DumpErrors(std::cerr); + close(client); + continue; + } } pidfile.Close(); diff --git a/test/interactive-helper/makefile b/test/interactive-helper/makefile index f43df97e3..8dc014b98 100644 --- a/test/interactive-helper/makefile +++ b/test/interactive-helper/makefile @@ -41,7 +41,7 @@ include $(PROGRAM_H) # Program for testing udevcdrom PROGRAM=aptwebserver -SLIBS = -lapt-pkg +SLIBS = -lapt-pkg -lpthread LIB_MAKES = apt-pkg/makefile SOURCE = aptwebserver.cc include $(PROGRAM_H) diff --git a/vendor/debian/apt-vendor.ent b/vendor/debian/apt-vendor.ent new file mode 100644 index 000000000..6cda5995c --- /dev/null +++ b/vendor/debian/apt-vendor.ent @@ -0,0 +1,7 @@ +<!-- details about the keys used by the distribution --> +<!ENTITY keyring-distro "Debian"> +<!ENTITY keyring-package "<package>debian-archive-keyring</package>"> +<!ENTITY keyring-filename "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"> +<!ENTITY keyring-removed-filename "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"> +<!ENTITY keyring-master-filename ""> +<!ENTITY keyring-uri ""> diff --git a/vendor/debian/makefile b/vendor/debian/makefile new file mode 100644 index 000000000..dd35a70f0 --- /dev/null +++ b/vendor/debian/makefile @@ -0,0 +1,11 @@ +# -*- make -*- +BASE=../.. +SUBDIR=vendor/debian + +# Bring in the default rules +include ../../buildlib/defaults.mak + +doc: sources.list + +sources.list: sources.list.in ../../doc/apt-verbatim.ent + sed -e 's#&stable-codename;#$(shell ../getinfo debian-stable-codename)#g' $< > $@ diff --git a/doc/examples/sources.list.in b/vendor/debian/sources.list.in index 00db2f8cd..00db2f8cd 100644 --- a/doc/examples/sources.list.in +++ b/vendor/debian/sources.list.in diff --git a/vendor/getinfo b/vendor/getinfo new file mode 100755 index 000000000..ac816e10e --- /dev/null +++ b/vendor/getinfo @@ -0,0 +1,36 @@ +#!/bin/sh +# small helper to extract information form *.ent files + +BASEDIR="$(readlink -f "$(dirname $0)")" +INFO="$(readlink -f "${BASEDIR}/current/apt-vendor.ent")" + +if [ -z "$INFO" ] || [ ! -e "$INFO" ]; then + echo >&2 'The current vendor is not valid or not chosen by the buildsystem yet.' + exit 1 +fi + +getrawfield() { + grep --max-count=1 "^<!ENTITY $1 \"" "${2:-$INFO}" | cut -d'"' -f 2 +} + +getfield() { + local FIELD="$(getrawfield "$@")" + FIELD="${FIELD#*>}" + echo "${FIELD%<*}" +} + +case "$1" in +debian-stable-codename) + getrawfield 'stable-codename' "${BASEDIR}/../doc/apt-verbatim.ent" + ;; +ubuntu-codename) + getrawfield 'stable-codename' "${BASEDIR}/../doc/apt-verbatim.ent" + ;; +keyring-package|keyring-filename|keyring-master-filename|keyring-removed-filename|keyring-uri) + getfield "$1" + ;; +*) + echo >&2 "Unknown data field $1 requested" + exit 2 + ;; +esac diff --git a/vendor/makefile b/vendor/makefile new file mode 100644 index 000000000..a6d53abd0 --- /dev/null +++ b/vendor/makefile @@ -0,0 +1,42 @@ +# -*- make -*- +BASE=.. +SUBDIR=vendor + +# Bring in the default rules +include ../buildlib/defaults.mak + +all headers library binary program doc manpages debiandoc test update-po startup dirs: current +all: all/subdirs +binary: binary/subdirs +doc: doc/subdirs +clean: clean/subdirs +veryclean: veryclean/subdirs +dirs: dirs/subdirs + +all/subdirs binary/subdirs doc/subdirs dirs/subdirs: + $(MAKE) -C current $(patsubst %/subdirs,%,$@) + +clean/subdirs veryclean/subdirs: + test ! -e current || $(MAKE) -C current $(patsubst %/subdirs,%,$@) + +current: + rm -f $@ + # search for an exact match to use the correct sources.list example + find -mindepth 1 -maxdepth 1 -type d | cut -d'/' -f 2 | while read DISTRO; do \ + if dpkg-vendor --is $$DISTRO; then \ + ln -s $$DISTRO $@; \ + break; \ + fi; \ + done + # if we haven't found a specific, look for a deriving in hardcoded order + test -e $@ || \ + (dpkg-vendor --derives-from ubuntu && cp ln -s ubuntu $@ ) || \ + ln -s debian $@ + +.PHONY: clean veryclean all binary vendor + +clean: clean/current + +clean/current: + test ! -e current || $(MAKE) -C current clean + rm -f current diff --git a/vendor/ubuntu/apt-vendor.ent b/vendor/ubuntu/apt-vendor.ent new file mode 100644 index 000000000..caa532699 --- /dev/null +++ b/vendor/ubuntu/apt-vendor.ent @@ -0,0 +1,7 @@ +<!-- details about the keys used by the distribution --> +<!ENTITY keyring-distro "Ubuntu"> +<!ENTITY keyring-package "<package>ubuntu-keyring</package>"> +<!ENTITY keyring-filename "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>"> +<!ENTITY keyring-removed-filename "<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>"> +<!ENTITY keyring-master-filename "/usr/share/keyrings/ubuntu-master-keyring.gpg"> +<!ENTITY keyring-uri "http://archive.ubuntu.com/ubuntu/project/ubuntu-archive-keyring.gpg"> diff --git a/vendor/ubuntu/makefile b/vendor/ubuntu/makefile new file mode 100644 index 000000000..ea67e6e63 --- /dev/null +++ b/vendor/ubuntu/makefile @@ -0,0 +1,11 @@ +# -*- make -*- +BASE=../.. +SUBDIR=vendor/ubuntu + +# Bring in the default rules +include ../../buildlib/defaults.mak + +doc: sources.list + +sources.list: sources.list.in ../../doc/apt-verbatim.ent + sed -e 's#&ubuntu-codename;#$(shell ../getinfo ubuntu-codename)#g' $< > $@ diff --git a/vendor/ubuntu/sources.list.in b/vendor/ubuntu/sources.list.in new file mode 100644 index 000000000..b9aa8c3d0 --- /dev/null +++ b/vendor/ubuntu/sources.list.in @@ -0,0 +1,10 @@ + # See sources.list(5) manpage for more information + # Remember that CD-ROMs, DVDs and such are managed through the apt-cdrom tool. +deb http://us.archive.ubuntu.com/ubuntu &ubuntu-codename; main restricted +deb-src http://us.archive.ubuntu.com/ubuntu &ubuntu-codename; main restricted + +deb http://security.ubuntu.com/ubuntu &ubuntu-codename;-security main restricted +deb-src http://security.ubuntu.com/ubuntu &ubuntu-codename;-security main restricted + +deb http://us.archive.ubuntu.com/ubuntu &ubuntu-codename;-updates main restricted +deb-src http://us.archive.ubuntu.com/ubuntu &ubuntu-codename;-updates main restricted |