diff options
43 files changed, 5491 insertions, 3135 deletions
diff --git a/apt-inst/makefile b/apt-inst/makefile index 785dc62ba..32d231240 100644 --- a/apt-inst/makefile +++ b/apt-inst/makefile @@ -14,7 +14,7 @@ include ../buildlib/libversion.mak # The library name LIBRARY=apt-inst -MAJOR=1.2 +MAJOR=1.3 MINOR=0 SLIBS=$(PTHREADLIB) -lapt-pkg APT_DOMAIN:=libapt-inst$(MAJOR) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 36abe0ac3..d790bd898 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -271,6 +271,14 @@ void pkgAcqSubIndex::Done(string Message,unsigned long Size,string Md5Hash, /*{{ string FinalFile = _config->FindDir("Dir::State::lists")+URItoFileName(Desc.URI); + /* Downloaded invalid transindex => Error (LP: #346386) (Closes: #627642) */ + indexRecords SubIndexParser; + if (FileExists(DestFile) == true && !SubIndexParser.Load(DestFile)) { + Status = StatError; + ErrorText = SubIndexParser.ErrorText; + return; + } + // sucess in downloading the index // rename the index if(Debug) @@ -894,6 +902,30 @@ void pkgAcqIndex::Done(string Message,unsigned long Size,string Hash, ReportMirrorFailure("HashChecksumFailure"); return; } + + /* Verify the index file for correctness (all indexes must + * have a Package field) (LP: #346386) (Closes: #627642) */ + { + FileFd fd(DestFile, FileFd::ReadOnly); + pkgTagSection sec; + pkgTagFile tag(&fd); + + // Only test for correctness if the file is not empty (empty is ok) + if (fd.Size() > 0) { + if (_error->PendingError() || !tag.Step(sec)) { + Status = StatError; + _error->DumpErrors(); + Rename(DestFile,DestFile + ".FAILED"); + return; + } else if (!sec.Exists("Package")) { + Status = StatError; + ErrorText = ("Encountered a section with no Package: header"); + Rename(DestFile,DestFile + ".FAILED"); + return; + } + } + } + // Done, move it into position string FinalFile = _config->FindDir("Dir::State::lists"); FinalFile += URItoFileName(RealURI); @@ -1330,6 +1362,16 @@ void pkgAcqMetaIndex::AuthDone(string Message) /*{{{*/ /*}}}*/ void pkgAcqMetaIndex::QueueIndexes(bool verify) /*{{{*/ { +#if 0 + /* Reject invalid, existing Release files (LP: #346386) (Closes: #627642) + * FIXME: Disabled; it breaks unsigned repositories without hashes */ + if (!verify && FileExists(DestFile) && !MetaIndexParser->Load(DestFile)) + { + Status = StatError; + ErrorText = MetaIndexParser->ErrorText; + return; + } +#endif for (vector <struct IndexTarget*>::const_iterator Target = IndexTargets->begin(); Target != IndexTargets->end(); Target++) @@ -1493,6 +1535,12 @@ void pkgAcqMetaIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf) LookupTag(Message,"Message").c_str()); RunScripts("APT::Update::Auth-Failure"); return; + } else if (LookupTag(Message,"Message").find("NODATA") != string::npos) { + /* Invalid signature file, reject (LP: #346386) (Closes: #627642) */ + _error->Error(_("GPG error: %s: %s"), + Desc.Description.c_str(), + LookupTag(Message,"Message").c_str()); + return; } else { _error->Warning(_("GPG error: %s: %s"), Desc.Description.c_str(), diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc index ca602d4bf..e8c8e73d0 100644 --- a/apt-pkg/aptconfiguration.cc +++ b/apt-pkg/aptconfiguration.cc @@ -224,7 +224,7 @@ std::vector<std::string> const Configuration::getLanguages(bool const &All, environment.push_back("en"); } - // Support settings like Acquire::Translation=none on the command line to + // Support settings like Acquire::Languages=none on the command line to // override the configuration settings vector of languages. string const forceLang = _config->Find("Acquire::Languages",""); if (forceLang.empty() == false) { diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc index 1e8c04033..c9e7f1176 100644 --- a/apt-pkg/deb/debindexfile.cc +++ b/apt-pkg/deb/debindexfile.cc @@ -423,12 +423,10 @@ string debTranslationsIndex::IndexURI(const char *Type) const /* */ bool debTranslationsIndex::GetIndexes(pkgAcquire *Owner) const { - if (TranslationsAvailable()) { - string const TranslationFile = string("Translation-").append(Language); - new pkgAcqIndexTrans(Owner, IndexURI(Language), - Info(TranslationFile.c_str()), - TranslationFile); - } + string const TranslationFile = string("Translation-").append(Language); + new pkgAcqIndexTrans(Owner, IndexURI(Language), + Info(TranslationFile.c_str()), + TranslationFile); return true; } @@ -468,9 +466,6 @@ string debTranslationsIndex::Info(const char *Type) const /*}}}*/ bool debTranslationsIndex::HasPackages() const /*{{{*/ { - if(!TranslationsAvailable()) - return false; - return FileExists(IndexFile(Language)); } /*}}}*/ @@ -510,7 +505,7 @@ bool debTranslationsIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const { // Check the translation file, if in use string TranslationFile = IndexFile(Language); - if (TranslationsAvailable() && FileExists(TranslationFile)) + if (FileExists(TranslationFile)) { FileFd Trans(TranslationFile,FileFd::ReadOnlyGzip); debListParser TransParser(&Trans); diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index a94b79f05..b708296d3 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -196,7 +196,7 @@ string debListParser::DescriptionLanguage() if (Section.FindS("Description").empty() == false) return ""; - std::vector<string> const lang = APT::Configuration::getLanguages(); + std::vector<string> const lang = APT::Configuration::getLanguages(true); for (std::vector<string>::const_iterator l = lang.begin(); l != lang.end(); l++) if (Section.FindS(string("Description-").append(*l).c_str()).empty() == false) diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index cd7c4e5d5..019b72bb8 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -14,8 +14,8 @@ #include <apt-pkg/depcache.h> #include <apt-pkg/pkgrecords.h> #include <apt-pkg/strutl.h> -#include <apti18n.h> #include <apt-pkg/fileutl.h> +#include <apt-pkg/cachefile.h> #include <unistd.h> #include <stdlib.h> @@ -32,6 +32,8 @@ #include <algorithm> #include <sstream> #include <map> +#include <pwd.h> +#include <grp.h> #include <termios.h> #include <unistd.h> @@ -683,7 +685,13 @@ bool pkgDPkgPM::OpenLog() return _error->WarningE("OpenLog", _("Could not open file '%s'"), logfile_name.c_str()); setvbuf(d->term_out, NULL, _IONBF, 0); SetCloseExec(fileno(d->term_out), true); - chmod(logfile_name.c_str(), 0600); + struct passwd *pw; + struct group *gr; + pw = getpwnam("root"); + gr = getgrnam("adm"); + if (pw != NULL && gr != NULL) + chown(logfile_name.c_str(), pw->pw_uid, gr->gr_gid); + chmod(logfile_name.c_str(), 0644); fprintf(d->term_out, "\nLog started: %s\n", timestr); } @@ -697,31 +705,42 @@ bool pkgDPkgPM::OpenLog() return _error->WarningE("OpenLog", _("Could not open file '%s'"), history_name.c_str()); chmod(history_name.c_str(), 0644); fprintf(d->history_out, "\nStart-Date: %s\n", timestr); - string remove, purge, install, upgrade, downgrade; + string remove, purge, install, reinstall, upgrade, downgrade; for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; I++) { - if (Cache[I].NewInstall()) - { - install += I.FullName(false) + string(" (") + Cache[I].CandVersion; - if (Cache[I].Flags & pkgCache::Flag::Auto) - install+= ", automatic"; - install += string("), "); - } - else if (Cache[I].Upgrade()) - upgrade += I.FullName(false) + string(" (") + Cache[I].CurVersion + string(", ") + Cache[I].CandVersion + string("), "); - else if (Cache[I].Downgrade()) - downgrade += I.FullName(false) + string(" (") + Cache[I].CurVersion + string(", ") + Cache[I].CandVersion + string("), "); - else if (Cache[I].Delete()) - { - if ((Cache[I].iFlags & pkgDepCache::Purge) == pkgDepCache::Purge) - purge += I.FullName(false) + string(" (") + Cache[I].CurVersion + string("), "); - else - remove += I.FullName(false) + string(" (") + Cache[I].CurVersion + string("), "); + enum { CANDIDATE, CANDIDATE_AUTO, CURRENT_CANDIDATE, CURRENT } infostring; + string *line = NULL; + #define HISTORYINFO(X, Y) { line = &X; infostring = Y; } + if (Cache[I].NewInstall() == true) + HISTORYINFO(install, CANDIDATE_AUTO) + else if (Cache[I].ReInstall() == true) + HISTORYINFO(reinstall, CANDIDATE) + else if (Cache[I].Upgrade() == true) + HISTORYINFO(upgrade, CURRENT_CANDIDATE) + else if (Cache[I].Downgrade() == true) + HISTORYINFO(downgrade, CURRENT_CANDIDATE) + else if (Cache[I].Delete() == true) + HISTORYINFO((Cache[I].Purge() ? purge : remove), CURRENT) + else + continue; + #undef HISTORYINFO + line->append(I.FullName(false)).append(" ("); + switch (infostring) { + case CANDIDATE: line->append(Cache[I].CandVersion); break; + case CANDIDATE_AUTO: + line->append(Cache[I].CandVersion); + if ((Cache[I].Flags & pkgCache::Flag::Auto) == pkgCache::Flag::Auto) + line->append(", automatic"); + break; + case CURRENT_CANDIDATE: line->append(Cache[I].CurVersion).append(", ").append(Cache[I].CandVersion); break; + case CURRENT: line->append(Cache[I].CurVersion); break; } + line->append("), "); } if (_config->Exists("Commandline::AsString") == true) WriteHistoryTag("Commandline", _config->Find("Commandline::AsString")); WriteHistoryTag("Install", install); + WriteHistoryTag("Reinstall", reinstall); WriteHistoryTag("Upgrade", upgrade); WriteHistoryTag("Downgrade",downgrade); WriteHistoryTag("Remove",remove); @@ -1285,6 +1304,23 @@ bool pkgDPkgPM::Go(int OutStatusFd) if (RunScripts("DPkg::Post-Invoke") == false) return false; + if (_config->FindB("Debug::pkgDPkgPM",false) == false) + { + std::string const oldpkgcache = _config->FindFile("Dir::cache::pkgcache"); + if (oldpkgcache.empty() == false && RealFileExists(oldpkgcache) == true && + unlink(oldpkgcache.c_str()) == 0) + { + std::string const srcpkgcache = _config->FindFile("Dir::cache::srcpkgcache"); + if (srcpkgcache.empty() == false && RealFileExists(srcpkgcache) == true) + { + _error->PushToStack(); + pkgCacheFile CacheFile; + CacheFile.BuildCaches(NULL, true); + _error->RevertToStack(); + } + } + } + Cache.writeStateFile(NULL); return true; } diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h index 2942558b0..adc010c28 100644 --- a/apt-pkg/depcache.h +++ b/apt-pkg/depcache.h @@ -231,6 +231,7 @@ class pkgDepCache : protected pkgCache::Namespace // Various test members for the current status of the package inline bool NewInstall() const {return Status == 2 && Mode == ModeInstall;}; inline bool Delete() const {return Mode == ModeDelete;}; + inline bool Purge() const {return Delete() == true && (iFlags & pkgDepCache::Purge) == pkgDepCache::Purge; }; inline bool Keep() const {return Mode == ModeKeep;}; inline bool Protect() const {return (iFlags & Protected) == Protected;}; inline bool Upgrade() const {return Status > 0 && Mode == ModeInstall;}; @@ -242,6 +243,7 @@ class pkgDepCache : protected pkgCache::Namespace inline bool InstBroken() const {return (DepState & DepInstMin) != DepInstMin;}; inline bool InstPolicyBroken() const {return (DepState & DepInstPolicy) != DepInstPolicy;}; inline bool Install() const {return Mode == ModeInstall;}; + inline bool ReInstall() const {return Delete() == false && (iFlags & pkgDepCache::ReInstall) == pkgDepCache::ReInstall;}; inline VerIterator InstVerIter(pkgCache &Cache) {return VerIterator(Cache,InstallVer);}; inline VerIterator CandidateVerIter(pkgCache &Cache) diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc index aff585e3b..66b0119e6 100644 --- a/apt-pkg/init.cc +++ b/apt-pkg/init.cc @@ -87,9 +87,6 @@ bool pkgInitConfig(Configuration &Cnf) Cnf.Set("Dir::Ignore-Files-Silently::", "\\.bak$"); Cnf.Set("Dir::Ignore-Files-Silently::", "\\.dpkg-[a-z]+$"); - // Translation - Cnf.Set("APT::Acquire::Translation", "environment"); - // Default cdrom mount point Cnf.Set("Acquire::cdrom::mount", "/media/cdrom/"); diff --git a/apt-pkg/init.h b/apt-pkg/init.h index 15a1165b9..6b92dd200 100644 --- a/apt-pkg/init.h +++ b/apt-pkg/init.h @@ -22,8 +22,8 @@ // Non-ABI-Breaks should only increase RELEASE number. // See also buildlib/libversion.mak #define APT_PKG_MAJOR 4 -#define APT_PKG_MINOR 10 -#define APT_PKG_RELEASE 1 +#define APT_PKG_MINOR 11 +#define APT_PKG_RELEASE 0 extern const char *pkgVersion; extern const char *pkgLibVersion; diff --git a/apt-pkg/orderlist.cc b/apt-pkg/orderlist.cc index ba43bc757..19661fc2d 100644 --- a/apt-pkg/orderlist.cc +++ b/apt-pkg/orderlist.cc @@ -1073,6 +1073,12 @@ bool pkgOrderList::CheckDep(DepIterator D) just needs one */ if (D.IsNegative() == false) { + // ignore provides by older versions of this package + if (((D.Reverse() == false && Pkg == D.ParentPkg()) || + (D.Reverse() == true && Pkg == D.TargetPkg())) && + Cache[Pkg].InstallVer != *I) + continue; + /* Try to find something that does not have the after flag set if at all possible */ if (IsFlag(Pkg,After) == true) diff --git a/cmdline/apt-config.cc b/cmdline/apt-config.cc index 9919a9c94..589ee7ada 100644 --- a/cmdline/apt-config.cc +++ b/cmdline/apt-config.cc @@ -20,6 +20,8 @@ #include <apt-pkg/error.h> #include <apt-pkg/init.h> #include <apt-pkg/strutl.h> +#include <apt-pkg/configuration.h> +#include <apt-pkg/aptconfiguration.h> #include <config.h> #include <apti18n.h> @@ -27,6 +29,7 @@ #include <locale.h> #include <iostream> #include <string> +#include <vector> /*}}}*/ using namespace std; @@ -119,6 +122,16 @@ int main(int argc,const char *argv[]) /*{{{*/ CmdL.FileSize() == 0) return ShowHelp(); + std::vector<std::string> const langs = APT::Configuration::getLanguages(true); + _config->Clear("Acquire::Languages"); + for (std::vector<std::string>::const_iterator l = langs.begin(); l != langs.end(); ++l) + _config->Set("Acquire::Languages::", *l); + + std::vector<std::string> const archs = APT::Configuration::getArchitectures(); + _config->Clear("APT::Architectures"); + for (std::vector<std::string>::const_iterator a = archs.begin(); a != archs.end(); ++a) + _config->Set("APT::Architectures::", *a); + // Match the operation CmdL.DispatchArg(Cmds); diff --git a/configure.in b/configure.in index b2880c99c..3dde2fe47 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.8.2") +AC_DEFINE_UNQUOTED(VERSION,"0.8.15") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/apt-utils.install b/debian/apt-utils.install index d947f26d4..8b1378917 100644 --- a/debian/apt-utils.install +++ b/debian/apt-utils.install @@ -1 +1 @@ -bin/libapt-inst*.so.* usr/lib/ + diff --git a/debian/apt.install b/debian/apt.install index 979e04ce2..9d4008fab 100644 --- a/debian/apt.install +++ b/debian/apt.install @@ -1,5 +1,4 @@ bin/apt-* usr/bin/ -bin/libapt-pkg*.so.* usr/lib/ bin/methods/* usr/lib/apt/methods/ scripts/dselect/* usr/lib/dpkg/methods/apt/ -locale usr/share/ +usr/share/locale/*/*/apt.mo diff --git a/debian/changelog b/debian/changelog index 999417bff..701f03252 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (0.8.15) UNRELEASED; urgency=low +apt (0.8.16~exp2) UNRELEASEDexperimental; urgency=low [ David Kalnischkies ] * [ABI-Break] Implement EDSP in libapt-pkg so that all front-ends which @@ -28,8 +28,228 @@ apt (0.8.15) UNRELEASED; urgency=low * [ABI-Break] merge lp:~mvo/apt/sha512-template to add support for sha512 * [ABI-Break] merge lp:~mvo/apt/dpointer to support easier extending without breaking the ABI + * increase ABI version and update package names - -- David Kalnischkies <kalnischkies@gmail.com> Tue, 17 May 2011 18:43:21 +0200 + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 29 Jun 2011 12:26:54 +0100 + +apt (0.8.16~exp1) experimental; urgency=low + + * merged with the debian/unstable upload + + -- Michael Vogt <mvo@debian.org> Wed, 29 Jun 2011 12:40:31 +0200 + +apt (0.8.15) unstable; urgency=low + + [ Julian Andres Klode ] + * apt-pkg/depcache.cc: + - Really release action groups only once (Closes: #622744) + - Make purge work again for config-files (LP: #244598) (Closes: #150831) + * apt-pkg/acquire-item.cc: + - Reject files known to be invalid (LP: #346386) (Closes: #627642) + * debian/apt.cron.daily: + - Check power after wait, patch by manuel-soto (LP: #705269) + * debian/control: + - Move ${shlibs:Depends} to Pre-Depends, as we do not want APT + unpacked if a library is too old and thus break upgrades + * doc/apt-key.8.xml: + - Document apt-key net-update (LP: #192810) + + [ Christian Perrier ] + * Galician translation update (Miguel Anxo Bouzada). Closes: #626505 + * Italian translation update (Milo Casagrande). Closes: #627834 + * German documentation translation update (Chris Leick). Closes: #629949 + * Catalan translation update (Jordi Mallach). Closes: #630657 + + [ David Kalnischkies ] + * fix a bunch of cppcheck warnings/errors based on a patch by + Niels Thykier, thanks! (Closes: #622805) + * apt-pkg/depcache.cc: + - really include 'rc' packages in the delete count by fixing a + typo which exists since 1999 in the source… (LP: #761175) + - if critical or-group can't be satisfied, exit directly. + * apt-pkg/acquire-method.cc: + - write directly to stdout instead of creating the message in + memory first before writing to avoid hitting limits + - fix order of CurrentURI and UsedMirror in Status() and Log() + * apt-pkg/orderlist.cc: + - let VisitRProvides report if the calls were successful + * apt-pkg/deb/dpkgpm.cc: + - replace obsolete usleep with nanosleep + - remove invalid pkgcache.bin and rebuild it if possible + - log reinstall commands in history.log + * debian/apt{,-utils}.symbols: + - update both experimental symbol-files to reflect 0.8.14 state + * debian/rules: + - remove unused embedded jquery by doxygen from libapt-pkg-doc + * cmdline/apt-mark.cc: + - reimplement apt-mark in c++ + - provide a 'showmanual' command (Closes: #582791) + - provide a 'dpkg --set-selections' wrapper to set/release holds + * cmdline/apt-get.cc: + - deprecate mostly undocumented 'markauto' in favor of 'apt-mark' + * cmdline/apt-cache.cc: + - deprecate mostly undocumented 'showauto' in favor of 'apt-mark' + * apt-pkg/pkgcache.cc: + - really ignore :arch in FindPkg() in non-multiarch environment + * doc/po/de.po: + - undo the translation of the command 'dump' in manpage of apt-config + as report by Burghard Grossmann on debian-l10n-german, thanks! + * apt-pkg/deb/debmetaindex.cc: + - do not download TranslationIndex if no Translation-* will be + downloaded later on anyway (Closes: #624218) + * test/versions.lst: + - disable obscure version number tests with versions dpkg doesn't + allow any more as they don't start with a number + * apt-pkg/acquire-worker.cc: + - print filename in the unmatching size warning (Closes: #623137) + * apt-pkg/acquire-item.cc: + - apply fix for poorly worded 'locate file' error message from + Ben Finney, thanks! (Closes: #623171) + * methods/http.cc: + - add config option to ignore a closed stdin to be able to easily + use the method as a simple standalone downloader + - Location header in redirects should be absolute URI, but some + servers just send an absolute path so still deal with it properly + - dequote URL taken from Location in redirects as we will otherwise + quote an already quoted string in the request later (Closes: #602412) + * apt-pkg/contrib/netrc.cc: + - replace non-posix gnu-extension strdupa with strdup + * apt-pkg/packagemanager.cc: + - ensure for Multi-Arch:same packages that they are unpacked in + lock step even in immediate configuration (Closes: #618288) + * apt-pkg/init.cc: + - don't set deprecated APT::Acquire::Translation, thanks Jörg Sommer! + * cmdline/apt-config.cc: + - show Acquire::Languages and APT::Architectures settings + in 'dump' (Closes: 626739) + * apt-pkg/orderlist.cc: + - ensure that an old version of a package with a provides can + never satisfy a dependency of a newer version of this package + + [ Michael Vogt ] + * methods/mirror.cc: + - ignore lines starting with "#" in the mirror file + - ignore non http urls in the mirrors + - append the dist (e.g. sid, wheezy) as a query string when + asking for a suitable mirror + * apt-pkg/deb/deblistparser.cc: + - include all known languages when building the apt cache + (LP: #794907) + * apt-pkg/deb/debindexfile.cc: + - remove some no longer valid checks for "TranslationsAvailable()" + + [ Kenneth Solbø Andersen ] + * apt-pkg/deb/dpkgpm.cc: + - set permissions of term.log to root.adm and 644 (LP: #404724) + + [ Chris Leick ] + * various typo and syntax corrections in doc/*.xml + + -- Michael Vogt <mvo@debian.org> Tue, 28 Jun 2011 18:00:48 +0200 + +apt (0.8.15~exp3) experimental; urgency=low + + * debian/control: + - add Breaks: 0.8.15~exp3) for libapt-pkg4.10 and + libapt-inst1.2 (thanks to Jonathan Nieder, closes: #630214) + - use depends for the ${shlibs:Depends} to make the breaks work + + -- Michael Vogt <mvo@debian.org> Fri, 17 Jun 2011 21:51:41 +0200 + +apt (0.8.15~exp2) experimental; urgency=low + + * debian/control: + - fix incorrect Replaces (closes: #630204) for libapt-inst1.2 + + -- Michael Vogt <mvo@debian.org> Wed, 15 Jun 2011 16:51:14 +0200 + +apt (0.8.15~exp1) experimental; urgency=low + + [ Julian Andres Klode ] + * apt-pkg/depcache.cc: + - Really release action groups only once (Closes: #622744) + - Make purge work again for config-files (LP: #244598) (Closes: #150831) + * apt-pkg/acquire-item.cc: + - Reject files known to be invalid (LP: #346386) (Closes: #627642) + * debian/apt.cron.daily: + - Check power after wait, patch by manuel-soto (LP: #705269) + * debian/control: + - Move ${shlibs:Depends} to Pre-Depends, as we do not want APT + unpacked if a library is too old and thus break upgrades + * doc/apt-key.8.xml: + - Document apt-key net-update (LP: #192810) + + [ Christian Perrier ] + * Galician translation update (Miguel Anxo Bouzada). Closes: #626505 + * Italian translation update (Milo Casagrande). Closes: #627834 + * German documentation translation update (Chris Leick). Closes: #629949 + + [ David Kalnischkies ] + * fix a bunch of cppcheck warnings/errors based on a patch by + Niels Thykier, thanks! (Closes: #622805) + * apt-pkg/depcache.cc: + - really include 'rc' packages in the delete count by fixing a + typo which exists since 1999 in the source… (LP: #761175) + - if critical or-group can't be satisfied, exit directly. + * apt-pkg/acquire-method.cc: + - write directly to stdout instead of creating the message in + memory first before writing to avoid hitting limits + - fix order of CurrentURI and UsedMirror in Status() and Log() + * apt-pkg/orderlist.cc: + - let VisitRProvides report if the calls were successful + * apt-pkg/deb/dpkgpm.cc: + - replace obsolete usleep with nanosleep + * debian/apt{,-utils}.symbols: + - update both experimental symbol-files to reflect 0.8.14 state + * debian/rules: + - remove unused embedded jquery by doxygen from libapt-pkg-doc + * cmdline/apt-mark.cc: + - reimplement apt-mark in c++ + - provide a 'showmanual' command (Closes: #582791) + - provide a 'dpkg --set-selections' wrapper to set/release holds + * cmdline/apt-get.cc: + - deprecate mostly undocumented 'markauto' in favor of 'apt-mark' + * cmdline/apt-cache.cc: + - deprecate mostly undocumented 'showauto' in favor of 'apt-mark' + * apt-pkg/pkgcache.cc: + - really ignore :arch in FindPkg() in non-multiarch environment + * doc/po/de.po: + - undo the translation of the command 'dump' in manpage of apt-config + as report by Burghard Grossmann on debian-l10n-german, thanks! + * apt-pkg/deb/debmetaindex.cc: + - do not download TranslationIndex if no Translation-* will be + downloaded later on anyway (Closes: #624218) + * test/versions.lst: + - disable obscure version number tests with versions dpkg doesn't + allow any more as they don't start with a number + * apt-pkg/acquire-worker.cc: + - print filename in the unmatching size warning (Closes: #623137) + * apt-pkg/acquire-item.cc: + - apply fix for poorly worded 'locate file' error message from + Ben Finney, thanks! (Closes: #623171) + * methods/http.cc: + - add config option to ignore a closed stdin to be able to easily + use the method as a simple standalone downloader + - Location header in redirects should be absolute URI, but some + servers just send an absolute path so still deal with it properly + - dequote URL taken from Location in redirects as we will otherwise + quote an already quoted string in the request later (Closes: #602412) + * apt-pkg/contrib/netrc.cc: + - replace non-posix gnu-extension strdupa with strdup + * apt-pkg/packagemanager.cc: + - ensure for Multi-Arch:same packages that they are unpacked in + lock step even in immediate configuration (Closes: #618288) + + [ Michael Vogt ] + * methods/mirror.cc: + - ignore lines starting with "#" in the mirror file + - ignore non http urls in the mirrors + - append the dist (e.g. sid, wheezy) as a query string when + asking for a suitable mirror + * debian/control: + - add libapt-pkg4.10 and libapt-inst1.2 library packages + + -- Michael Vogt <mvo@debian.org> Fri, 10 Jun 2011 15:32:07 +0200 apt (0.8.14.2) UNRELEASED; urgency=low diff --git a/debian/control b/debian/control index 6d0f16b70..8d85b48e8 100644 --- a/debian/control +++ b/debian/control @@ -6,26 +6,63 @@ Uploaders: Michael Vogt <mvo@debian.org>, Otavio Salvador <otavio@debian.org>, Christian Perrier <bubulle@debian.org>, Daniel Burrows <dburrows@debian.org>, Julian Andres Klode <jak@debian.org> Standards-Version: 3.9.2 -Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 7.2.3~), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.19.0), zlib1g-dev | libz-dev, debiandoc-sgml, xsltproc, docbook-xsl, docbook-xml, po4a (>= 0.34-2), autotools-dev, autoconf, automake, doxygen +Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 7.2.3~), libdb-dev, + gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.19.0), + zlib1g-dev | libz-dev, debiandoc-sgml, xsltproc, docbook-xsl, docbook-xml, + po4a (>= 0.34-2), autotools-dev, autoconf, automake, doxygen Build-Conflicts: autoconf2.13, automake1.4 Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/ Vcs-Browser: http://bzr.debian.org/loggerhead/apt/debian-sid/ Package: apt Architecture: any -Pre-Depends: ${shlibs:Depends} -Depends: debian-archive-keyring, ${misc:Depends}, gnupg +Depends: ${shlibs:Depends}, ${misc:Depends}, debian-archive-keyring, gnupg Replaces: manpages-pl (<< 20060617-3~) -Provides: ${libapt-pkg:provides} Conflicts: python-apt (<< 0.7.93.2~) Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, bzip2, lzma, python-apt -Description: Advanced front-end for dpkg - This is Debian's next generation front-end for the dpkg package manager. - It provides the apt-get utility and APT dselect method that provides a - simpler, safer way to install and upgrade packages. +Description: APT's commandline package manager + This package provides commandline tools for searching and + managing as well as querying information about packages + as a low-level access to all features of the libapt-pkg library. . - APT features complete installation ordering, multiple source capability - and several other unique features, see the Users Guide in apt-doc. + These include: + * apt-get for retrieval of packages and information about them + from authenticated sources and for installation, upgrade and + removal of packages together with their dependencies + * apt-cache for querying available information about installed + as well as installable packages + * apt-cdrom to use removable media as a source for packages + * apt-config as an interface to the configuration settings + * apt-key as an interface to manage authentication keys + +Package: libapt-pkg4.11 +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Replaces: apt (<< 0.8.15) +Description: APT's package managment runtime library + This library provides the common functionality for searching and + managing packages as well as information about packages. + Higher-level package managers can depend upon this library. + . + This includes: + * retrieval of information about packages from multiple sources + * retrieval of packages and all dependent packages + needed to satisfy a request either through an internal + solver or by interfacing with an external one + * authenticating the sources and validating the retrieved data + * installation and removal of packages in the system + * providing different transports to retrieve data over cdrom, ftp, + http, rsh as well as an interface to add more transports like + https (apt-transport-https) and debtorrent (apt-transport-debtorrent). + +Package: libapt-inst1.3 +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Replaces: apt-utils (<< 0.8.15), apt (<< 0.8.15) +Description: APT's deb package format runtime library + This library provides methods to query and extract information + from deb packages. This includes the control data and the package + file content. Package: apt-doc Architecture: all @@ -33,13 +70,13 @@ Priority: optional Depends: ${misc:Depends} Section: doc Description: Documentation for APT - This package contains the user guide and offline guide, for APT, an - Advanced Package Tool. + This package contains the user guide and offline guide for various + APT tools which are provided in a html and a text-only version. Package: libapt-pkg-dev Architecture: any Priority: optional -Depends: apt (= ${binary:Version}), apt-utils (= ${binary:Version}), ${libapt-pkg:provides}, ${libapt-inst:provides}, ${misc:Depends}, zlib1g-dev | zlib-dev +Depends: ${libapt-pkg-name} (= ${binary:Version}), ${libapt-inst-name} (= ${binary:Version}), ${misc:Depends}, zlib1g-dev | zlib-dev Section: libdevel Description: Development files for APT's libapt-pkg and libapt-inst This package contains the header files and libraries for @@ -61,19 +98,25 @@ Description: Documentation for APT development Package: apt-utils Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Provides: ${libapt-inst:provides} Description: APT utility programs - This package contains some APT utility programs such as apt-ftparchive, - apt-sortpkgs and apt-extracttemplates. + This package contains some less used commandline utilities related + to package managment with APT. . - apt-extracttemplates is used by debconf to prompt for configuration - questions before installation. apt-ftparchive is used to create Package - and other index files. apt-sortpkgs is a Package/Source file normalizer. + * apt-extracttemplates is used by debconf to prompt for configuration + questions before installation. + * apt-ftparchive is used to create Packages and other index files + needed to publish an archive of debian packages + * apt-sortpkgs is a Packages/Sources file normalizer. Package: apt-transport-https Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Priority: optional -Description: APT https transport - This package contains a APT https transport. It makes it possible to - use 'deb https://foo distro main' lines in the sources.list. +Description: https download transport for APT + This package enables the usage of 'deb https://foo distro main' lines + in the /etc/apt/sources.list so that all package managers using the + libapt-pkg library can access metadata and packages available in sources + accessable over https (Hypertext Transfer Protocol Secure). + . + This transport supports server as well as client authenification + with certificates. diff --git a/debian/libapt-inst1.3.install b/debian/libapt-inst1.3.install new file mode 100644 index 000000000..b7b63be81 --- /dev/null +++ b/debian/libapt-inst1.3.install @@ -0,0 +1,2 @@ +bin/libapt-inst*.so.* usr/lib/ +usr/share/locale/*/*/libapt-inst*.mo diff --git a/debian/apt-utils.symbols b/debian/libapt-inst1.3.symbols index 9ba283a51..d9ea55b3d 100644 --- a/debian/apt-utils.symbols +++ b/debian/libapt-inst1.3.symbols @@ -1,5 +1,4 @@ -libapt-inst.so.1.2 libapt-inst1.2 -| apt-utils #MINVER# +libapt-inst.so.1.2 libapt-inst1.2 #MINVER# * Build-Depends-Package: libapt-pkg-dev (c++)"ExtractTar::Done(bool)@Base" 0.8.0 (c++)"ExtractTar::Go(pkgDirStream&)@Base" 0.8.0 @@ -114,7 +113,7 @@ libapt-inst.so.1.2 libapt-inst1.2 # (c++|regex|optional=std)"^char\* std::[^ ]+<.+ >::_.+@Base$" 0.8.0 # (c++|optional=std)"std::basic_string<char, std::char_traits<char>, std::allocator<char> >& std::basic_string<char, std::char_traits<char>, std::allocator<char> >::append<unsigned char*>(unsigned char*, unsigned char*)@Base" 0.8.0 ### gcc-4.6 specific - (c++|optional=std)"std::vector<APT::Configuration::Compressor, std::allocator<APT::Configuration::Compressor> >::~vector()@Base" 0.8.12 1 + (c++|optional=std)"std::vector<APT::Configuration::Compressor, std::allocator<APT::Configuration::Compressor> >::~vector()@Base" 0.8.12 (c++|optional=std)"std::basic_string<char, std::char_traits<char>, std::allocator<char> >& std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_M_replace_dispatch<unsigned char*>(__gnu_cxx::__normal_iterator<char*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, __gnu_cxx::__normal_iterator<char*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, unsigned char*, unsigned char*, std::__false_type)@Base" 0.8.0 ### try to ignore std:: template instances (c++|regex|optional=std)"^std::basic_string<.+ >\(.+\)@Base$" 0.8.0 diff --git a/debian/libapt-pkg4.11.install b/debian/libapt-pkg4.11.install new file mode 100644 index 000000000..91b39a31b --- /dev/null +++ b/debian/libapt-pkg4.11.install @@ -0,0 +1,2 @@ +bin/libapt-pkg*.so.* usr/lib/ +usr/share/locale/*/*/libapt-pkg*.mo diff --git a/debian/apt.symbols b/debian/libapt-pkg4.11.symbols index bb60c22be..16b630214 100644 --- a/debian/apt.symbols +++ b/debian/libapt-pkg4.11.symbols @@ -1,5 +1,4 @@ -libapt-pkg.so.4.10 libapt-pkg4.10 -| apt #MINVER# +libapt-pkg.so.4.10 libapt-pkg4.10 #MINVER# * Build-Depends-Package: libapt-pkg-dev TFRewritePackageOrder@Base 0.8.0 TFRewriteSourceOrder@Base 0.8.0 @@ -1273,48 +1272,51 @@ libapt-pkg.so.4.10 libapt-pkg4.10 (c++|regex|optional=std)"^typeinfo name for std::iterator<.*>@Base$" 0.8.0 (c++|regex|optional=std)"^typeinfo for std::iterator<.*>@Base$" 0.8.0 ### - (c++)"Configuration::MatchAgainstConfig::clearPatterns()@Base" 0.8.1 1 - (c++)"CreateAPTDirectoryIfNeeded(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.2 1 - (c++)"FileFd::FileSize()@Base" 0.8.8 1 - (c++)"Base256ToNum(char const*, unsigned long&, unsigned int)@Base" 0.8.11 1 - (c++)"pkgDepCache::SetCandidateRelease(pkgCache::VerIterator, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::list<std::pair<pkgCache::VerIterator, pkgCache::VerIterator>, std::allocator<std::pair<pkgCache::VerIterator, pkgCache::VerIterator> > >&)@Base" 0.8.11 1 - (c++)"pkgDepCache::SetCandidateRelease(pkgCache::VerIterator, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.11 1 - (c++)"RealFileExists(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.11 1 - (c++)"StripEpoch(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.11 1 - (c++)"IndexTarget::~IndexTarget()@Base" 0.8.11 1 - (c++)"pkgAcqIndex::Init(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.11 1 - (c++)"pkgAcqIndex::pkgAcqIndex(pkgAcquire*, IndexTarget const*, HashString const&, indexRecords const*)@Base" 0.8.11 1 - (c++)"pkgTagSection::FindFlag(unsigned long&, unsigned long, char const*, char const*)@Base" 0.8.11 1 - (c++)"pkgAcqSubIndex::ParseIndex(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.11 1 - (c++)"pkgAcqSubIndex::Custom600Headers()@Base" 0.8.11 1 - (c++)"pkgAcqSubIndex::Done(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.11 1 - (c++)"pkgAcqSubIndex::Failed(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.11 1 - (c++)"pkgAcqSubIndex::DescURI()@Base" 0.8.11 1 - (c++)"pkgAcqSubIndex::pkgAcqSubIndex(pkgAcquire*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, HashString const&)@Base" 0.8.11 1 - (c++)"pkgAcqSubIndex::~pkgAcqSubIndex()@Base" 0.8.11 1 - (c++)"pkgAcqMetaClearSig::Failed(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.11 1 - (c++)"pkgAcqMetaClearSig::pkgAcqMetaClearSig(pkgAcquire*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::vector<IndexTarget*, std::allocator<IndexTarget*> > const*, indexRecords*)@Base" 0.8.11 1 - (c++)"pkgAcqMetaClearSig::~pkgAcqMetaClearSig()@Base" 0.8.11 1 - (c++)"pkgAcqIndexTrans::pkgAcqIndexTrans(pkgAcquire*, IndexTarget const*, HashString const&, indexRecords const*)@Base" 0.8.11 1 - (c++)"IndexTarget::IsOptional() const@Base" 0.8.11 1 - (c++)"IndexTarget::IsSubIndex() const@Base" 0.8.11 1 - (c++)"debReleaseIndex::TranslationIndexURI(char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const@Base" 0.8.11 1 - (c++)"debReleaseIndex::TranslationIndexURISuffix(char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const@Base" 0.8.11 1 - (c++)"typeinfo for pkgAcqSubIndex@Base" 0.8.11 1 - (c++)"typeinfo for pkgAcqMetaClearSig@Base" 0.8.11 1 - (c++)"typeinfo name for pkgAcqSubIndex@Base" 0.8.11 1 - (c++)"typeinfo name for pkgAcqMetaClearSig@Base" 0.8.11 1 - (c++)"vtable for pkgAcqSubIndex@Base" 0.8.11 1 - (c++)"vtable for pkgAcqMetaClearSig@Base" 0.8.11 1 - (c++)"FindMountPointForDevice(char const*)@Base" 0.8.12 1 - (c++)"pkgUdevCdromDevices::ScanForRemovable(bool)@Base" 0.8.12 1 - (c++)"APT::Configuration::Compressor::Compressor(char const*, char const*, char const*, char const*, char const*, unsigned short)@Base" 0.8.12 1 - (c++)"APT::Configuration::Compressor::~Compressor()@Base" 0.8.12 1 - (c++)"APT::Configuration::getCompressors(bool)@Base" 0.8.12 1 - (c++)"APT::Configuration::getCompressorExtensions()@Base" 0.8.12 1 - (c++)"APT::Configuration::setDefaultConfigurationForCompressors()@Base" 0.8.12 1 - (c++)"pkgDepCache::SetCandidateVersion(pkgCache::VerIterator, bool const&)@Base" 0.8.12 1 - (c++)"pkgAcqMetaClearSig::Custom600Headers()@Base" 0.8.13 1 - (c++|optional=private)"debListParser::NewProvidesAllArch(pkgCache::VerIterator&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.13.2 1 - (c++|optional=private)"PrintMode(char)@Base" 0.8.13.2 1 - (c++)"pkgDepCache::IsModeChangeOk(pkgDepCache::ModeList, pkgCache::PkgIterator const&, unsigned long, bool)@Base" 0.8.13.2 1 + (c++)"Configuration::MatchAgainstConfig::clearPatterns()@Base" 0.8.1 + (c++)"CreateAPTDirectoryIfNeeded(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.2 + (c++)"FileFd::FileSize()@Base" 0.8.8 + (c++)"Base256ToNum(char const*, unsigned long&, unsigned int)@Base" 0.8.11 + (c++)"pkgDepCache::SetCandidateRelease(pkgCache::VerIterator, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::list<std::pair<pkgCache::VerIterator, pkgCache::VerIterator>, std::allocator<std::pair<pkgCache::VerIterator, pkgCache::VerIterator> > >&)@Base" 0.8.11 + (c++)"pkgDepCache::SetCandidateRelease(pkgCache::VerIterator, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.11 + (c++)"RealFileExists(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.11 + (c++)"StripEpoch(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.11 + (c++)"IndexTarget::~IndexTarget()@Base" 0.8.11 + (c++)"pkgAcqIndex::Init(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.11 + (c++)"pkgAcqIndex::pkgAcqIndex(pkgAcquire*, IndexTarget const*, HashString const&, indexRecords const*)@Base" 0.8.11 + (c++)"pkgTagSection::FindFlag(unsigned long&, unsigned long, char const*, char const*)@Base" 0.8.11 + (c++)"pkgAcqSubIndex::ParseIndex(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.11 + (c++)"pkgAcqSubIndex::Custom600Headers()@Base" 0.8.11 + (c++)"pkgAcqSubIndex::Done(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.11 + (c++)"pkgAcqSubIndex::Failed(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.11 + (c++)"pkgAcqSubIndex::DescURI()@Base" 0.8.11 + (c++)"pkgAcqSubIndex::pkgAcqSubIndex(pkgAcquire*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, HashString const&)@Base" 0.8.11 + (c++)"pkgAcqSubIndex::~pkgAcqSubIndex()@Base" 0.8.11 + (c++)"pkgAcqMetaClearSig::Failed(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.11 + (c++)"pkgAcqMetaClearSig::pkgAcqMetaClearSig(pkgAcquire*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::vector<IndexTarget*, std::allocator<IndexTarget*> > const*, indexRecords*)@Base" 0.8.11 + (c++)"pkgAcqMetaClearSig::~pkgAcqMetaClearSig()@Base" 0.8.11 + (c++)"pkgAcqIndexTrans::pkgAcqIndexTrans(pkgAcquire*, IndexTarget const*, HashString const&, indexRecords const*)@Base" 0.8.11 + (c++)"IndexTarget::IsOptional() const@Base" 0.8.11 + (c++)"IndexTarget::IsSubIndex() const@Base" 0.8.11 + (c++)"debReleaseIndex::TranslationIndexURI(char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const@Base" 0.8.11 + (c++)"debReleaseIndex::TranslationIndexURISuffix(char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const@Base" 0.8.11 + (c++)"typeinfo for pkgAcqSubIndex@Base" 0.8.11 + (c++)"typeinfo for pkgAcqMetaClearSig@Base" 0.8.11 + (c++)"typeinfo name for pkgAcqSubIndex@Base" 0.8.11 + (c++)"typeinfo name for pkgAcqMetaClearSig@Base" 0.8.11 + (c++)"vtable for pkgAcqSubIndex@Base" 0.8.11 + (c++)"vtable for pkgAcqMetaClearSig@Base" 0.8.11 + (c++)"FindMountPointForDevice(char const*)@Base" 0.8.12 + (c++)"pkgUdevCdromDevices::ScanForRemovable(bool)@Base" 0.8.12 + (c++)"APT::Configuration::Compressor::Compressor(char const*, char const*, char const*, char const*, char const*, unsigned short)@Base" 0.8.12 + (c++)"APT::Configuration::Compressor::~Compressor()@Base" 0.8.12 + (c++)"APT::Configuration::getCompressors(bool)@Base" 0.8.12 + (c++)"APT::Configuration::getCompressorExtensions()@Base" 0.8.12 + (c++)"APT::Configuration::setDefaultConfigurationForCompressors()@Base" 0.8.12 + (c++)"pkgDepCache::SetCandidateVersion(pkgCache::VerIterator, bool const&)@Base" 0.8.12 + (c++)"pkgAcqMetaClearSig::Custom600Headers()@Base" 0.8.13 + (c++|optional=private)"debListParser::NewProvidesAllArch(pkgCache::VerIterator&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.13.2 + (c++|optional=private)"PrintMode(char)@Base" 0.8.13.2 + (c++)"pkgDepCache::IsModeChangeOk(pkgDepCache::ModeList, pkgCache::PkgIterator const&, unsigned long, bool)@Base" 0.8.13.2 + (c++)"pkgPackageManager::SmartUnPack(pkgCache::PkgIterator, bool)@Base" 0.8.15~exp1 + (c++)"pkgAcqMethod::PrintStatus(char const*, char const*, char*&) const@Base" 0.8.15~exp1 + (c++)"pkgCache::DepIterator::IsNegative() const@Base" 0.8.15~exp1 diff --git a/debian/rules b/debian/rules index 6c58d82bb..ef30568d5 100755 --- a/debian/rules +++ b/debian/rules @@ -70,9 +70,9 @@ APT_UTILS=ftparchive sortpkgs extracttemplates internal-solver # Find the libapt-pkg major version for use in other control files include buildlib/libversion.mak -# Determine which package we should provide in the control files -LIBAPTPKG_PROVIDE=libapt-pkg$(LIBAPTPKG_MAJOR) -LIBAPTINST_PROVIDE=libapt-inst$(LIBAPTINST_MAJOR) +# Determine which library package names to use +LIBAPT_PKG=libapt-pkg$(LIBAPTPKG_MAJOR) +LIBAPT_INST=libapt-inst$(LIBAPTINST_MAJOR) # do not fail as we are just experimenting with symbol files for now export DPKG_GENSYMBOLS_CHECK_LEVEL=0 @@ -97,6 +97,10 @@ build/configure-stamp: configure build/build-stamp: build/configure-stamp # Add here commands to compile the package. $(MAKE) binary + # compat symlink for the locale split + mkdir -p build/usr/share + cd build/usr/share && ln -f -s ../../locale . + # done here touch $@ build/build-doc-stamp: build/configure-stamp @@ -137,7 +141,7 @@ libapt-pkg-doc: build-doc dh_compress -p$@ dh_fixperms -p$@ dh_installdeb -p$@ - dh_gencontrol -p$@ -- -Vlibapt-pkg:provides=$(LIBAPTPKG_PROVIDE) + dh_gencontrol -p$@ dh_md5sums -p$@ dh_builddeb -p$@ @@ -165,7 +169,7 @@ apt-doc: build-doc # Build architecture-dependent files here. -binary-arch: apt libapt-pkg-dev apt-utils apt-transport-https +binary-arch: $(LIBAPT_PKG) $(LIBAPT_INST) apt libapt-pkg-dev apt-utils apt-transport-https apt_MANPAGES = apt-cache apt-cdrom apt-config apt-get apt-key apt-mark apt-secure apt apt.conf apt_preferences sources.list apt: build build-doc dh_testdir -p$@ @@ -205,10 +209,9 @@ apt: build build-doc dh_strip -p$@ dh_compress -p$@ dh_fixperms -p$@ - dh_makeshlibs -p$@ dh_installdeb -p$@ - dh_shlibdeps -p$@ -l$(CURDIR)/debian/apt/usr/lib:$(CURDIR)/debian/$@/usr/lib - dh_gencontrol -p$@ -- -Vlibapt-pkg:provides=$(LIBAPTPKG_PROVIDE) + dh_shlibdeps -p$@ + dh_gencontrol -p$@ dh_md5sums -p$@ dh_builddeb -p$@ @@ -227,7 +230,7 @@ libapt-pkg-dev: build dh_compress -p$@ dh_fixperms -p$@ dh_installdeb -p$@ - dh_gencontrol -p$@ -- -Vlibapt-pkg:provides=$(LIBAPTPKG_PROVIDE) -Vlibapt-inst:provides=$(LIBAPTINST_PROVIDE) + dh_gencontrol -p$@ -- -Vlibapt-pkg-name=$(LIBAPT_PKG) -Vlibapt-inst-name=$(LIBAPT_INST) dh_md5sums -p$@ dh_builddeb -p$@ @@ -255,8 +258,46 @@ apt-utils: build dh_fixperms -p$@ dh_makeshlibs -p$@ dh_installdeb -p$@ - dh_shlibdeps -p$@ -l$(CURDIR)/debian/apt/usr/lib:$(CURDIR)/debian/$@/usr/lib - dh_gencontrol -p$@ -- -Vlibapt-inst:provides=$(LIBAPTINST_PROVIDE) + dh_shlibdeps -p$@ + dh_gencontrol -p$@ + dh_md5sums -p$@ + dh_builddeb -p$@ + +$(LIBAPT_PKG): build + dh_testdir -p$@ + dh_testroot -p$@ + dh_prep -p$@ + dh_installdirs -p$@ + + dh_install -p$@ --sourcedir=$(BLD) + dh_installdocs -p$@ + dh_installchangelogs -p$@ + dh_strip -p$@ + dh_compress -p$@ + dh_fixperms -p$@ + dh_makeshlibs -p$@ + dh_installdeb -p$@ + dh_shlibdeps -p$@ + dh_gencontrol -p$@ + dh_md5sums -p$@ + dh_builddeb -p$@ + +$(LIBAPT_INST): build + dh_testdir -p$@ + dh_testroot -p$@ + dh_prep -p$@ + dh_installdirs -p$@ + + dh_install -p$@ --sourcedir=$(BLD) + dh_installdocs -p$@ + dh_installchangelogs -p$@ + dh_strip -p$@ + dh_compress -p$@ + dh_fixperms -p$@ + dh_makeshlibs -p$@ + dh_installdeb -p$@ + dh_shlibdeps -p$@ + dh_gencontrol -p$@ dh_md5sums -p$@ dh_builddeb -p$@ @@ -278,7 +319,7 @@ apt-transport-https: build libapt-pkg-dev dh_compress -p$@ dh_fixperms -p$@ dh_installdeb -p$@ - dh_shlibdeps -p$@ -l$(CURDIR)/debian/apt/usr/lib:$(CURDIR)/debian/$@/usr/lib + dh_shlibdeps -p$@ dh_gencontrol -p$@ dh_md5sums -p$@ dh_builddeb -p$@ diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml index 9c6c64dac..431ef8704 100644 --- a/doc/apt-cache.8.xml +++ b/doc/apt-cache.8.xml @@ -315,7 +315,7 @@ Reverse Provides: <term><option>--no-replaces</option></term> <term><option>--no-enhances</option></term> <listitem><para>Per default the <literal>depends</literal> and - <literal>rdepends</literal> print all dependencies. This can be twicked with + <literal>rdepends</literal> print all dependencies. This can be tweaked with these flags which will omit the specified dependency type. Configuration Item: <literal>APT::Cache::Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::Cache::ShowRecommends</literal>.</para></listitem> diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml index 8e5df1f36..b08ebe80f 100644 --- a/doc/apt-ftparchive.1.xml +++ b/doc/apt-ftparchive.1.xml @@ -532,8 +532,9 @@ for i in Sections do index files will not have the checksum fields where possible. Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</replaceable></literal> and <literal>APT::FTPArchive::<replaceable>Index</replaceable>::<replaceable>Checksum</replaceable></literal> where - <literal>Index</literal> can be <literal>Packages</literal>, <literal>Sources</literal> or <literal>Release</literal> and - <literal>Checksum</literal> can be <literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>.</para></listitem> + <literal><replaceable>Index</replaceable></literal> can be <literal>Packages</literal>, <literal>Sources</literal> or + <literal>Release</literal> and <literal><replaceable>Checksum</replaceable></literal> can be <literal>MD5</literal>, + <literal>SHA1</literal> or <literal>SHA256</literal>.</para></listitem> </varlistentry> <varlistentry><term><option>-d</option></term><term><option>--db</option></term> diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index 18f26e569..11b53e5e7 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -280,7 +280,7 @@ <varlistentry><term>download</term> <listitem><para><literal>download</literal> will download the given - binary package into the current directoy. + binary package into the current directory. </para></listitem> </varlistentry> diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index 477507598..02de89f3b 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -50,7 +50,7 @@ <listitem><para>the file specified by the <envar>APT_CONFIG</envar> environment variable (if any)</para></listitem> <listitem><para>all files in <literal>Dir::Etc::Parts</literal> in - alphanumeric ascending order which have no or "<literal>conf</literal>" + alphanumeric ascending order which have either no or "<literal>conf</literal>" as filename extension and which only contain alphanumeric, hyphen (-), underscore (_) and period (.) characters. Otherwise APT will print a notice that it has ignored a file if the file @@ -441,13 +441,13 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; It is not needed to add <literal>bz2</literal> explicit to the list as it will be added automatic.</para> <para>Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</replaceable></literal> will be checked: If this setting exists the method will only be used if this file exists, e.g. for - the bzip2 method (the inbuilt) setting is <literallayout>Dir::Bin::bzip2 "/bin/bzip2";</literallayout> + the bzip2 method (the inbuilt) setting is: <literallayout>Dir::Bin::bzip2 "/bin/bzip2";</literallayout> Note also that list entries specified on the command line will be added at the end of the list specified in the configuration files, but before the default entries. To prefer a type in this case over the ones specified in the configuration files you can set the option direct - not in list style. This will not override the defined list, it will only prefix the list with this type.</para> <para>The special type <literal>uncompressed</literal> can be used to give uncompressed files a - preference, but note that most archives doesn't provide uncompressed files so this is mostly only + preference, but note that most archives don't provide uncompressed files so this is mostly only useable for local mirrors.</para></listitem> </varlistentry> diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml index 55504f3e5..f08f92b94 100644 --- a/doc/apt_preferences.5.xml +++ b/doc/apt_preferences.5.xml @@ -69,8 +69,8 @@ You have been warned.</para> <para>Note that the files in the <filename>/etc/apt/preferences.d</filename> directory are parsed in alphanumeric ascending order and need to obey the -following naming convention: The files have no or "<literal>pref</literal>" -as filename extension and which only contain alphanumeric, hyphen (-), +following naming convention: The files have either no or "<literal>pref</literal>" +as filename extension and only contain alphanumeric, hyphen (-), underscore (_) and period (.) characters. Otherwise APT will print a notice that it has ignored a file if the file doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</literal> @@ -265,7 +265,7 @@ APT also supports pinning by glob() expressions and regular expressions surrounded by /. For example, the following example assigns the priority 500 to all packages from experimental where the name starts with gnome (as a glob()-like -expression or contains the word kde (as a POSIX extended regular +expression) or contains the word kde (as a POSIX extended regular expression surrounded by slashes). </para> @@ -277,7 +277,7 @@ Pin-Priority: 500 <para> The rule for those expressions is that they can occur anywhere -where a string can occur. Those, the following pin assigns the +where a string can occur. Thus, the following pin assigns the priority 990 to all packages from a release starting with karmic. </para> diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index 159f86e6a..cc60e5497 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2011-02-14 13:42+0100\n" +"POT-Creation-Date: 2011-06-08 16:54+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" @@ -566,7 +566,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50 apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:114 apt-key.8.xml:38 apt-mark.8.xml:55 apt-secure.8.xml:43 apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36 sources.list.5.xml:36 +#: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50 apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:114 apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43 apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36 sources.list.5.xml:36 msgid "Description" msgstr "" @@ -944,7 +944,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59 apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:92 apt-sortpkgs.1.xml:57 apt.conf.5.xml:560 apt.conf.5.xml:582 +#: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59 apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:126 apt-sortpkgs.1.xml:57 apt.conf.5.xml:560 apt.conf.5.xml:582 msgid "options" msgstr "" @@ -967,7 +967,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:288 apt-ftparchive.1.xml:568 apt-get.8.xml:393 apt-sortpkgs.1.xml:61 +#: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393 apt-sortpkgs.1.xml:61 msgid "<option>-s</option>" msgstr "" @@ -987,12 +987,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:296 apt-ftparchive.1.xml:542 apt-get.8.xml:383 +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 msgid "<option>-q</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:296 apt-ftparchive.1.xml:542 apt-get.8.xml:383 +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 msgid "<option>--quiet</option>" msgstr "" @@ -1091,7 +1091,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:580 +#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583 msgid "<option>-a</option>" msgstr "" @@ -1187,12 +1187,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608 apt-get.8.xml:570 apt-sortpkgs.1.xml:67 +#: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570 apt-mark.8.xml:140 apt-sortpkgs.1.xml:67 msgid "&apt-commonoptions;" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:156 apt-mark.8.xml:125 apt.conf.5.xml:1093 apt_preferences.5.xml:649 +#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:172 apt-mark.8.xml:144 apt.conf.5.xml:1093 apt_preferences.5.xml:697 msgid "Files" msgstr "" @@ -1202,7 +1202,7 @@ msgid "&file-sourceslist; &file-statelists;" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106 apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:624 apt-get.8.xml:585 apt-key.8.xml:177 apt-mark.8.xml:131 apt-secure.8.xml:185 apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:656 sources.list.5.xml:234 +#: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106 apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585 apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185 apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704 sources.list.5.xml:234 msgid "See Also" msgstr "" @@ -1212,7 +1212,7 @@ msgid "&apt-conf;, &sources-list;, &apt-get;" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111 apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:628 apt-get.8.xml:591 apt-mark.8.xml:135 apt-sortpkgs.1.xml:76 +#: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111 apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591 apt-mark.8.xml:154 apt-sortpkgs.1.xml:76 msgid "Diagnostics" msgstr "" @@ -1311,12 +1311,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-cdrom.8.xml:94 apt-key.8.xml:142 +#: apt-cdrom.8.xml:94 apt-key.8.xml:158 msgid "Options" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:536 apt-get.8.xml:345 +#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345 msgid "<option>-d</option>" msgstr "" @@ -1519,7 +1519,7 @@ msgid "Just show the contents of the configuration space." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:625 apt-sortpkgs.1.xml:73 +#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628 apt-sortpkgs.1.xml:73 msgid "&apt-conf;" msgstr "" @@ -2432,31 +2432,37 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-ftparchive.1.xml:529 -msgid "<option>--md5</option>" +msgid "<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:531 msgid "" -"Generate MD5 sums. This defaults to on, when turned off the generated index " -"files will not have MD5Sum fields where possible. Configuration Item: " -"<literal>APT::FTPArchive::MD5</literal>" +"Generate the given checksum. These options default to on, when turned off " +"the generated index files will not have the checksum fields where possible. " +"Configuration Items: " +"<literal>APT::FTPArchive::<replaceable>Checksum</replaceable></literal> and " +"<literal>APT::FTPArchive::<replaceable>Index</replaceable>::<replaceable>Checksum</replaceable></literal> " +"where <literal>Index</literal> can be <literal>Packages</literal>, " +"<literal>Sources</literal> or <literal>Release</literal> and " +"<literal>Checksum</literal> can be <literal>MD5</literal>, " +"<literal>SHA1</literal> or <literal>SHA256</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:536 +#: apt-ftparchive.1.xml:539 msgid "<option>--db</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:538 +#: apt-ftparchive.1.xml:541 msgid "" "Use a binary caching DB. This has no effect on the generate command. " "Configuration Item: <literal>APT::FTPArchive::DB</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:544 +#: apt-ftparchive.1.xml:547 msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quiet up to a maximum of 2. You can also use " @@ -2465,12 +2471,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:550 +#: apt-ftparchive.1.xml:553 msgid "<option>--delink</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:552 +#: apt-ftparchive.1.xml:555 msgid "" "Perform Delinking. If the <literal>External-Links</literal> setting is used " "then this option actually enables delinking of the files. It defaults to on " @@ -2479,12 +2485,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:558 +#: apt-ftparchive.1.xml:561 msgid "<option>--contents</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:560 +#: apt-ftparchive.1.xml:563 msgid "" "Perform contents generation. When this option is set and package indexes are " "being generated with a cache DB then the file listing will also be extracted " @@ -2494,12 +2500,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:568 +#: apt-ftparchive.1.xml:571 msgid "<option>--source-override</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:570 +#: apt-ftparchive.1.xml:573 msgid "" "Select the source override file to use with the <literal>sources</literal> " "command. Configuration Item: " @@ -2507,24 +2513,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:574 +#: apt-ftparchive.1.xml:577 msgid "<option>--readonly</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:576 +#: apt-ftparchive.1.xml:579 msgid "" "Make the caching databases read only. Configuration Item: " "<literal>APT::FTPArchive::ReadOnlyDB</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:580 +#: apt-ftparchive.1.xml:583 msgid "<option>--arch</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:581 +#: apt-ftparchive.1.xml:584 msgid "" "Accept in the <literal>packages</literal> and <literal>contents</literal> " "commands only package files matching <literal>*_arch.deb</literal> or " @@ -2533,12 +2539,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:587 +#: apt-ftparchive.1.xml:590 msgid "<option>APT::FTPArchive::AlwaysStat</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:589 +#: apt-ftparchive.1.xml:592 msgid "" "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If " "packages are recompiled and/or republished with the same version again, this " @@ -2552,12 +2558,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:599 +#: apt-ftparchive.1.xml:602 msgid "<option>APT::FTPArchive::LongDescription</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:601 +#: apt-ftparchive.1.xml:604 msgid "" "This configuration option defaults to \"<literal>true</literal>\" and should " "only be set to <literal>\"false\"</literal> if the Archive generated with " @@ -2567,12 +2573,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:613 apt.conf.5.xml:1087 apt_preferences.5.xml:496 sources.list.5.xml:198 +#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:544 sources.list.5.xml:198 msgid "Examples" msgstr "" #. type: Content of: <refentry><refsect1><para><programlisting> -#: apt-ftparchive.1.xml:619 +#: apt-ftparchive.1.xml:622 #, no-wrap msgid "" "<command>apt-ftparchive</command> packages " @@ -2581,14 +2587,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:615 +#: apt-ftparchive.1.xml:618 msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:629 +#: apt-ftparchive.1.xml:632 msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@ -3610,20 +3616,34 @@ msgid "" "from the keyring the archive keys which are no longer valid." msgstr "" +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:140 +msgid "net-update" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:144 +msgid "" +"Update the local keyring with the keys of a key server and removes from the " +"keyring the archive keys which are no longer valid. This requires an " +"installed wget and an APT build configured to have a server to fetch " +"from. APT in Debian does not support this command, but Ubuntu's APT does." +msgstr "" + #. type: Content of: <refentry><refsect1><para> -#: apt-key.8.xml:143 +#: apt-key.8.xml:159 msgid "" "Note that options need to be defined before the commands described in the " "previous section." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:145 +#: apt-key.8.xml:161 msgid "--keyring <replaceable>filename</replaceable>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:146 +#: apt-key.8.xml:162 msgid "" "With this option it is possible to specify a specific keyring file the " "command should operate on. The default is that a command is executed on the " @@ -3634,42 +3654,42 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt-key.8.xml:159 +#: apt-key.8.xml:175 msgid "&file-trustedgpg;" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:161 +#: apt-key.8.xml:177 msgid "<filename>/etc/apt/trustdb.gpg</filename>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:162 +#: apt-key.8.xml:178 msgid "Local trust database of archive keys." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:165 +#: apt-key.8.xml:181 msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:166 +#: apt-key.8.xml:182 msgid "Keyring of Debian archive trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:169 +#: apt-key.8.xml:185 msgid "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:170 +#: apt-key.8.xml:186 msgid "Keyring of Debian archive removed trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-key.8.xml:179 +#: apt-key.8.xml:195 msgid "&apt-get;, &apt-secure;" msgstr "" @@ -3677,8 +3697,8 @@ msgstr "" #. type: Content of: <refentry><refentryinfo> #: apt-mark.8.xml:16 msgid "" -"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 " -"August 2009</date>" +"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>21 " +"April 2011</date>" msgstr "" #. type: Content of: <refentry><refnamediv><refname> @@ -3697,21 +3717,21 @@ msgid "" " <command>apt-mark</command> <arg><option>-hv</option></arg> " "<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> <group " "choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg " -"choice=\"plain\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> " +"choice=\"plain\">auto</arg> <arg choice=\"plain\">manual</arg> <arg " +"choice=\"plain\">showauto</arg> <arg choice=\"plain\">showmanual</arg> " "</group> <arg choice=\"plain\" " -"rep=\"repeat\"><replaceable>package</replaceable></arg> </arg> <arg " -"choice=\"plain\">showauto</arg> </group>" +"rep=\"repeat\"><replaceable>package</replaceable></arg> </arg> </group>" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:56 +#: apt-mark.8.xml:57 msgid "" "<command>apt-mark</command> will change whether a package has been marked as " "being automatically installed." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:60 +#: apt-mark.8.xml:61 msgid "" "When you request that a package is installed, and as a result other packages " "are installed to satisfy its dependencies, the dependencies are marked as " @@ -3721,104 +3741,128 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:68 -msgid "markauto" +#: apt-mark.8.xml:69 +msgid "auto" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:69 +#: apt-mark.8.xml:70 msgid "" -"<literal>markauto</literal> is used to mark a package as being automatically " +"<literal>auto</literal> is used to mark a package as being automatically " "installed, which will cause the package to be removed when no more manually " "installed packages depend on this package." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:76 -msgid "unmarkauto" +#: apt-mark.8.xml:77 +msgid "manual" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:77 +#: apt-mark.8.xml:78 msgid "" -"<literal>unmarkauto</literal> is used to mark a package as being manually " +"<literal>manual</literal> is used to mark a package as being manually " "installed, which will prevent the package from being automatically removed " "if no other packages depend on it." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:84 -msgid "showauto" +#: apt-mark.8.xml:85 +msgid "hold" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:85 +#: apt-mark.8.xml:86 msgid "" -"<literal>showauto</literal> is used to print a list of automatically " -"installed packages with each package on a new line." +"<literal>hold</literal> is used to mark a package as hold back, which will " +"prevent the package from being automatically installed, upgraded or " +"removed. The command is only a wrapper around <command>dpkg " +"--set-selections</command> and the state is therefore maintained by &dpkg; " +"and not effected by the <option>--filename</option> option." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:95 +msgid "unhold" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-mark.8.xml:96 -msgid "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>" +msgid "" +"<literal>unhold</literal> is used to cancel a previously set hold on a " +"package to allow all actions again." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:97 -msgid "<option>--file=<filename><replaceable>FILENAME</replaceable></filename></option>" +#: apt-mark.8.xml:101 +msgid "showauto" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:100 +#: apt-mark.8.xml:102 msgid "" -"Read/Write package stats from " -"<filename><replaceable>FILENAME</replaceable></filename> instead of the " -"default location, which is <filename>extended_status</filename> in the " -"directory defined by the Configuration Item: <literal>Dir::State</literal>." +"<literal>showauto</literal> is used to print a list of automatically " +"installed packages with each package on a new line. All automatically " +"installed packages will be listed if no package is given. If packages are " +"given only those which are automatically installed will be shown." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:106 -msgid "<option>-h</option>" +#: apt-mark.8.xml:109 +msgid "showmanual" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:110 +msgid "" +"<literal>showmanual</literal> can be used in the same way as " +"<literal>showauto</literal> except that it will print a list of manually " +"installed packages instead." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:107 -msgid "<option>--help</option>" +#: apt-mark.8.xml:116 +msgid "showhold" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:108 -msgid "Show a short usage summary." +#: apt-mark.8.xml:117 +msgid "" +"<literal>showhold</literal> is used to print a list of packages on hold in " +"the same way as for the other show commands." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:114 -msgid "<option>-v</option>" +#: apt-mark.8.xml:130 +msgid "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:115 -msgid "<option>--version</option>" +#: apt-mark.8.xml:131 +msgid "<option>--file=<filename><replaceable>FILENAME</replaceable></filename></option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:116 -msgid "Show the program version." +#: apt-mark.8.xml:134 +msgid "" +"Read/Write package stats from " +"<filename><replaceable>FILENAME</replaceable></filename> instead of the " +"default location, which is <filename>extended_status</filename> in the " +"directory defined by the Configuration Item: <literal>Dir::State</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt-mark.8.xml:127 +#: apt-mark.8.xml:146 msgid " &file-extended_states;" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:132 +#: apt-mark.8.xml:151 msgid "&apt-get;,&aptitude;,&apt-conf;" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:136 +#: apt-mark.8.xml:155 msgid "" "<command>apt-mark</command> returns zero on normal operation, non-zero on " "error." @@ -5874,39 +5918,44 @@ msgstr "" #: apt_preferences.5.xml:107 msgid "" "to the versions coming from archives which in their " -"<filename>Release</filename> files are marked as \"NotAutomatic: yes\" like " -"the debian experimental archive." +"<filename>Release</filename> files are marked as \"NotAutomatic: yes\" but " +"<emphasis>not</emphasis> as \"ButAutomaticUpgrades: yes\" like the debian " +"<literal>experimental</literal> archive." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:112 +#: apt_preferences.5.xml:113 msgid "priority 100" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:113 -msgid "to the version that is already installed (if any)." +#: apt_preferences.5.xml:114 +msgid "" +"to the version that is already installed (if any) and to the versions coming " +"from archives which in their <filename>Release</filename> files are marked " +"as \"NotAutomatic: yes\" and \"ButAutomaticUpgrades: yes\" like the debian " +"backports archive since <literal>squeeze-backports</literal>." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:117 +#: apt_preferences.5.xml:121 msgid "priority 500" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:118 +#: apt_preferences.5.xml:122 msgid "" "to the versions that are not installed and do not belong to the target " "release." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:122 +#: apt_preferences.5.xml:126 msgid "priority 990" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:123 +#: apt_preferences.5.xml:127 msgid "to the versions that are not installed and belong to the target release." msgstr "" @@ -5919,24 +5968,25 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:128 +#: apt_preferences.5.xml:132 msgid "" "If the target release has not been specified then APT simply assigns " "priority 100 to all installed package versions and priority 500 to all " -"uninstalled package versions, expect versions coming from archives which in " +"uninstalled package versions, except versions coming from archives which in " "their <filename>Release</filename> files are marked as \"NotAutomatic: yes\" " -"- these versions get the priority 1." +"- these versions get the priority 1 or priority 100 if it is additionally " +"marked as \"ButAutomaticUpgrades: yes\"." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:134 +#: apt_preferences.5.xml:139 msgid "" "APT then applies the following rules, listed in order of precedence, to " "determine which version of a package to install." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:137 +#: apt_preferences.5.xml:142 msgid "" "Never downgrade unless the priority of an available version exceeds 1000. " "(\"Downgrading\" is installing a less recent version of a package in place " @@ -5946,19 +5996,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:143 +#: apt_preferences.5.xml:148 msgid "Install the highest priority version." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:144 +#: apt_preferences.5.xml:149 msgid "" "If two or more versions have the same priority, install the most recent one " "(that is, the one with the higher version number)." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:147 +#: apt_preferences.5.xml:152 msgid "" "If two or more versions have the same priority and version number but either " "the packages differ in some of their metadata or the " @@ -5966,7 +6016,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:153 +#: apt_preferences.5.xml:158 msgid "" "In a typical situation, the installed version of a package (priority 100) " "is not as recent as one of the versions available from the sources listed in " @@ -5977,7 +6027,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:160 +#: apt_preferences.5.xml:165 msgid "" "More rarely, the installed version of a package is <emphasis>more</emphasis> " "recent than any of the other available versions. The package will not be " @@ -5987,7 +6037,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:165 +#: apt_preferences.5.xml:170 msgid "" "Sometimes the installed version of a package is more recent than the version " "belonging to the target release, but not as recent as a version belonging to " @@ -5999,12 +6049,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:174 +#: apt_preferences.5.xml:179 msgid "The Effect of APT Preferences" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:176 +#: apt_preferences.5.xml:181 msgid "" "The APT preferences file allows the system administrator to control the " "assignment of priorities. The file consists of one or more multi-line " @@ -6013,7 +6063,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:182 +#: apt_preferences.5.xml:187 msgid "" "The specific form assigns a priority (a \"Pin-Priority\") to one or more " "specified packages and specified version or version range. For example, the " @@ -6023,7 +6073,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:189 +#: apt_preferences.5.xml:194 #, no-wrap msgid "" "Package: perl\n" @@ -6032,7 +6082,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:195 +#: apt_preferences.5.xml:200 msgid "" "The general form assigns a priority to all of the package versions in a " "given distribution (that is, to all the versions of packages that are listed " @@ -6042,7 +6092,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:201 +#: apt_preferences.5.xml:206 msgid "" "This general-form entry in the APT preferences file applies only to groups " "of packages. For example, the following record assigns a high priority to " @@ -6050,7 +6100,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:206 +#: apt_preferences.5.xml:211 #, no-wrap msgid "" "Package: *\n" @@ -6059,7 +6109,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:211 +#: apt_preferences.5.xml:216 msgid "" "A note of caution: the keyword used here is \"<literal>origin</literal>\" " "which can be used to match a hostname. The following record will assign a " @@ -6068,7 +6118,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:215 +#: apt_preferences.5.xml:220 #, no-wrap msgid "" "Package: *\n" @@ -6077,7 +6127,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:219 +#: apt_preferences.5.xml:224 msgid "" "This should <emphasis>not</emphasis> be confused with the Origin of a " "distribution as specified in a <filename>Release</filename> file. What " @@ -6087,7 +6137,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:224 +#: apt_preferences.5.xml:229 msgid "" "The following record assigns a low priority to all package versions " "belonging to any distribution whose Archive name is " @@ -6095,7 +6145,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:228 +#: apt_preferences.5.xml:233 #, no-wrap msgid "" "Package: *\n" @@ -6104,7 +6154,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:233 +#: apt_preferences.5.xml:238 msgid "" "The following record assigns a high priority to all package versions " "belonging to any distribution whose Codename is " @@ -6112,7 +6162,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:237 +#: apt_preferences.5.xml:242 #, no-wrap msgid "" "Package: *\n" @@ -6121,7 +6171,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:242 +#: apt_preferences.5.xml:247 msgid "" "The following record assigns a high priority to all package versions " "belonging to any release whose Archive name is \"<literal>stable</literal>\" " @@ -6129,7 +6179,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:247 +#: apt_preferences.5.xml:252 #, no-wrap msgid "" "Package: *\n" @@ -6138,82 +6188,133 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:258 +#: apt_preferences.5.xml:262 +msgid "Regular expressions and glob() syntax" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:264 +msgid "" +"APT also supports pinning by glob() expressions and regular expressions " +"surrounded by /. For example, the following example assigns the priority 500 " +"to all packages from experimental where the name starts with gnome (as a " +"glob()-like expression or contains the word kde (as a POSIX extended regular " +"expression surrounded by slashes)." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><programlisting> +#: apt_preferences.5.xml:273 +#, no-wrap +msgid "" +"Package: gnome* /kde/\n" +"Pin: release n=experimental\n" +"Pin-Priority: 500\n" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:279 +msgid "" +"The rule for those expressions is that they can occur anywhere where a " +"string can occur. Those, the following pin assigns the priority 990 to all " +"packages from a release starting with karmic." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><programlisting> +#: apt_preferences.5.xml:285 +#, no-wrap +msgid "" +"Package: *\n" +"Pin: release n=karmic*\n" +"Pin-Priority: 990\n" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><literal> +#: apt_preferences.5.xml:290 +msgid "Package" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><literal> +#: apt_preferences.5.xml:296 +msgid "*" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt_preferences.5.xml:306 msgid "How APT Interprets Priorities" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:266 +#: apt_preferences.5.xml:314 msgid "P > 1000" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:267 +#: apt_preferences.5.xml:315 msgid "" "causes a version to be installed even if this constitutes a downgrade of the " "package" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:271 +#: apt_preferences.5.xml:319 msgid "990 < P <=1000" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:272 +#: apt_preferences.5.xml:320 msgid "" "causes a version to be installed even if it does not come from the target " "release, unless the installed version is more recent" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:277 +#: apt_preferences.5.xml:325 msgid "500 < P <=990" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:278 +#: apt_preferences.5.xml:326 msgid "" "causes a version to be installed unless there is a version available " "belonging to the target release or the installed version is more recent" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:283 +#: apt_preferences.5.xml:331 msgid "100 < P <=500" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:284 +#: apt_preferences.5.xml:332 msgid "" "causes a version to be installed unless there is a version available " "belonging to some other distribution or the installed version is more recent" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:289 +#: apt_preferences.5.xml:337 msgid "0 < P <=100" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:290 +#: apt_preferences.5.xml:338 msgid "" "causes a version to be installed only if there is no installed version of " "the package" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:294 +#: apt_preferences.5.xml:342 msgid "P < 0" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:295 +#: apt_preferences.5.xml:343 msgid "prevents the version from being installed" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:261 +#: apt_preferences.5.xml:309 msgid "" "Priorities (P) assigned in the APT preferences file must be positive or " "negative integers. They are interpreted as follows (roughly speaking): " @@ -6221,7 +6322,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:300 +#: apt_preferences.5.xml:348 msgid "" "If any specific-form records match an available package version then the " "first such record determines the priority of the package version. Failing " @@ -6230,14 +6331,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:306 +#: apt_preferences.5.xml:354 msgid "" "For example, suppose the APT preferences file contains the three records " "presented earlier:" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><programlisting> -#: apt_preferences.5.xml:310 +#: apt_preferences.5.xml:358 #, no-wrap msgid "" "Package: perl\n" @@ -6254,12 +6355,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:323 +#: apt_preferences.5.xml:371 msgid "Then:" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:325 +#: apt_preferences.5.xml:373 msgid "" "The most recent available version of the <literal>perl</literal> package " "will be installed, so long as that version's version number begins with " @@ -6269,7 +6370,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:330 +#: apt_preferences.5.xml:378 msgid "" "A version of any package other than <literal>perl</literal> that is " "available from the local system has priority over other versions, even " @@ -6277,7 +6378,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:334 +#: apt_preferences.5.xml:382 msgid "" "A version of a package whose origin is not the local system but some other " "site listed in &sources-list; and which belongs to an " @@ -6286,12 +6387,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:344 +#: apt_preferences.5.xml:392 msgid "Determination of Package Version and Distribution Properties" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:346 +#: apt_preferences.5.xml:394 msgid "" "The locations listed in the &sources-list; file should provide " "<filename>Packages</filename> and <filename>Release</filename> files to " @@ -6299,27 +6400,27 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:358 +#: apt_preferences.5.xml:406 msgid "the <literal>Package:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:359 +#: apt_preferences.5.xml:407 msgid "gives the package name" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:362 apt_preferences.5.xml:412 +#: apt_preferences.5.xml:410 apt_preferences.5.xml:460 msgid "the <literal>Version:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:363 +#: apt_preferences.5.xml:411 msgid "gives the version number for the named package" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:350 +#: apt_preferences.5.xml:398 msgid "" "The <filename>Packages</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable>/<replaceable>component</replaceable>/<replaceable>arch</replaceable></filename>: " @@ -6331,12 +6432,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:379 +#: apt_preferences.5.xml:427 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:380 +#: apt_preferences.5.xml:428 msgid "" "names the archive to which all the packages in the directory tree belong. " "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies " @@ -6347,18 +6448,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:390 +#: apt_preferences.5.xml:438 #, no-wrap msgid "Pin: release a=stable\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:396 +#: apt_preferences.5.xml:444 msgid "the <literal>Codename:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:397 +#: apt_preferences.5.xml:445 msgid "" "names the codename to which all the packages in the directory tree belong. " "For example, the line \"Codename: &testing-codename;\" specifies that all of " @@ -6369,13 +6470,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:406 +#: apt_preferences.5.xml:454 #, no-wrap msgid "Pin: release n=&testing-codename;\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:413 +#: apt_preferences.5.xml:461 msgid "" "names the release version. For example, the packages in the tree might " "belong to Debian GNU/Linux release version 3.0. Note that there is normally " @@ -6386,7 +6487,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:422 +#: apt_preferences.5.xml:470 #, no-wrap msgid "" "Pin: release v=3.0\n" @@ -6395,12 +6496,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:431 +#: apt_preferences.5.xml:479 msgid "the <literal>Component:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:432 +#: apt_preferences.5.xml:480 msgid "" "names the licensing component associated with the packages in the directory " "tree of the <filename>Release</filename> file. For example, the line " @@ -6412,18 +6513,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:441 +#: apt_preferences.5.xml:489 #, no-wrap msgid "Pin: release c=main\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:447 +#: apt_preferences.5.xml:495 msgid "the <literal>Origin:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:448 +#: apt_preferences.5.xml:496 msgid "" "names the originator of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is " @@ -6432,18 +6533,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:454 +#: apt_preferences.5.xml:502 #, no-wrap msgid "Pin: release o=Debian\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:460 +#: apt_preferences.5.xml:508 msgid "the <literal>Label:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:461 +#: apt_preferences.5.xml:509 msgid "" "names the label of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is " @@ -6452,13 +6553,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:467 +#: apt_preferences.5.xml:515 #, no-wrap msgid "Pin: release l=Debian\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:368 +#: apt_preferences.5.xml:416 msgid "" "The <filename>Release</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for " @@ -6472,7 +6573,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:474 +#: apt_preferences.5.xml:522 msgid "" "All of the <filename>Packages</filename> and <filename>Release</filename> " "files retrieved from locations listed in the &sources-list; file are stored " @@ -6487,12 +6588,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:487 +#: apt_preferences.5.xml:535 msgid "Optional Lines in an APT Preferences Record" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:489 +#: apt_preferences.5.xml:537 msgid "" "Each record in the APT preferences file can optionally begin with one or " "more lines beginning with the word <literal>Explanation:</literal>. This " @@ -6500,12 +6601,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:498 +#: apt_preferences.5.xml:546 msgid "Tracking Stable" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:506 +#: apt_preferences.5.xml:554 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated\n" @@ -6520,7 +6621,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:500 +#: apt_preferences.5.xml:548 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -6530,7 +6631,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:523 apt_preferences.5.xml:569 apt_preferences.5.xml:627 +#: apt_preferences.5.xml:571 apt_preferences.5.xml:617 apt_preferences.5.xml:675 #, no-wrap msgid "" "apt-get install <replaceable>package-name</replaceable>\n" @@ -6539,7 +6640,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:518 +#: apt_preferences.5.xml:566 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@ -6548,13 +6649,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:535 +#: apt_preferences.5.xml:583 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/testing\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:529 +#: apt_preferences.5.xml:577 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>testing</literal> distribution; the package " @@ -6563,12 +6664,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:541 +#: apt_preferences.5.xml:589 msgid "Tracking Testing or Unstable" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:550 +#: apt_preferences.5.xml:598 #, no-wrap msgid "" "Package: *\n" @@ -6585,7 +6686,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:543 +#: apt_preferences.5.xml:591 msgid "" "The following APT preferences file will cause APT to assign a high priority " "to package versions from the <literal>testing</literal> distribution, a " @@ -6596,7 +6697,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:564 +#: apt_preferences.5.xml:612 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@ -6605,13 +6706,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:584 +#: apt_preferences.5.xml:632 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/unstable\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:575 +#: apt_preferences.5.xml:623 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>unstable</literal> distribution. " @@ -6623,12 +6724,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:591 +#: apt_preferences.5.xml:639 msgid "Tracking the evolution of a codename release" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:605 +#: apt_preferences.5.xml:653 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated package " @@ -6650,7 +6751,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:593 +#: apt_preferences.5.xml:641 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -6665,7 +6766,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:622 +#: apt_preferences.5.xml:670 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest version(s) in " @@ -6674,13 +6775,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:642 +#: apt_preferences.5.xml:690 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/sid\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:633 +#: apt_preferences.5.xml:681 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>sid</literal> distribution. Thereafter, " @@ -6692,12 +6793,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt_preferences.5.xml:651 +#: apt_preferences.5.xml:699 msgid "&file-preferences;" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt_preferences.5.xml:657 +#: apt_preferences.5.xml:705 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;" msgstr "" diff --git a/doc/po/de.po b/doc/po/de.po index 891e69964..a608161d3 100644 --- a/doc/po/de.po +++ b/doc/po/de.po @@ -1,14 +1,14 @@ # Translation of apt-doc to German # Copyright (C) 1997, 1998, 1999 Jason Gunthorpe and others. # This file is distributed under the same license as the apt-doc package. -# Chris Leick <c.leick@vollbio.de>, 2009, 2010. +# Chris Leick <c.leick@vollbio.de>, 2009-2011. # msgid "" msgstr "" -"Project-Id-Version: apt-doc 0.7.25.3\n" +"Project-Id-Version: apt-doc 0.8.14-1\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2011-02-14 13:42+0100\n" -"PO-Revision-Date: 2010-09-16 19:04+0100\n" +"POT-Creation-Date: 2011-06-08 16:54+0300\n" +"PO-Revision-Date: 2011-05-31 21:00+0100\n" "Last-Translator: Chris Leick <c.leick@vollbio.de>\n" "Language-Team: German <debian-l10n-german@lists.debian.org>\n" "Language: de\n" @@ -656,16 +656,12 @@ msgstr "" #. The last update date #. type: Content of: <refentry><refentryinfo> #: apt-cache.8.xml:16 -#, fuzzy -#| msgid "" -#| "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; " -#| "<date>14 February 2004</date>" msgid "" "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>04 " "February 2011</date>" msgstr "" "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; " -"<date>14. Februar 2004</date>" +"<date>04. Februar 2011</date>" #. type: Content of: <refentry><refnamediv><refname> #: apt-cache.8.xml:25 apt-cache.8.xml:32 @@ -690,33 +686,10 @@ msgstr "APT" #. type: Content of: <refentry><refnamediv><refpurpose> #: apt-cache.8.xml:33 msgid "query the APT cache" -msgstr "" +msgstr "den APT-Zwischenspeicher abfragen" #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> #: apt-cache.8.xml:39 -#, fuzzy -#| msgid "" -#| "<command>apt-cache</command> <arg><option>-hvsn</option></arg> " -#| "<arg><option>-o=<replaceable>config string</replaceable></option></arg> " -#| "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group " -#| "choice=\"req\"> <arg>add <arg choice=\"plain\" rep=\"repeat" -#| "\"><replaceable>file</replaceable></arg></arg> <arg>gencaches</arg> " -#| "<arg>showpkg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</" -#| "replaceable></arg></arg> <arg>showsrc <arg choice=\"plain\" rep=\"repeat" -#| "\"><replaceable>pkg</replaceable></arg></arg> <arg>stats</arg> <arg>dump</" -#| "arg> <arg>dumpavail</arg> <arg>unmet</arg> <arg>search <arg choice=\"plain" -#| "\"><replaceable>regex</replaceable></arg></arg> <arg>show <arg choice=" -#| "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> " -#| "<arg>depends <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</" -#| "replaceable></arg></arg> <arg>rdepends <arg choice=\"plain\" rep=\"repeat" -#| "\"><replaceable>pkg</replaceable></arg></arg> <arg>pkgnames <arg choice=" -#| "\"plain\"><replaceable>prefix</replaceable></arg></arg> <arg>dotty <arg " -#| "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></" -#| "arg> <arg>xvcg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</" -#| "replaceable></arg></arg> <arg>policy <arg choice=\"plain\" rep=\"repeat" -#| "\"><replaceable>pkgs</replaceable></arg></arg> <arg>madison <arg choice=" -#| "\"plain\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></arg> </" -#| "group>" msgid "" "<command>apt-cache</command> <arg><option>-hvsn</option></arg> <arg><option>-" "o=<replaceable>config string</replaceable></option></arg> <arg><option>-" @@ -741,16 +714,15 @@ msgstr "" "<command>apt-cache</command> <arg><option>-hvsn</option></arg> <arg><option>-" "o=<replaceable>Konfigurationszeichenkette</replaceable></option></arg> " "<arg><option>-c=<replaceable>Datei</replaceable></option></arg> <group " -"choice=\"req\"> <arg>add <arg choice=\"plain\" rep=\"repeat" -"\"><replaceable>Datei</replaceable></arg></arg> <arg>gencaches</arg> " -"<arg>showpkg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</" -"replaceable></arg></arg> <arg>showsrc <arg choice=\"plain\" rep=\"repeat" -"\"><replaceable>pkg</replaceable></arg></arg> <arg>stats</arg> <arg>dump</" -"arg> <arg>dumpavail</arg> <arg>unmet</arg> <arg>search <arg choice=\"plain" -"\"><replaceable>regex</replaceable></arg></arg> <arg>show <arg choice=\"plain" -"\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg>depends " -"<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></" -"arg> <arg>rdepends <arg choice=\"plain\" rep=\"repeat\"><replaceable>Paket</" +"choice=\"req\"> <arg>gencaches</arg> <arg>showpkg <arg choice=\"plain\" rep=" +"\"repeat\"><replaceable>Paket</replaceable></arg></arg> <arg>showsrc <arg " +"choice=\"plain\" rep=\"repeat\"><replaceable>Paket</replaceable></arg></arg> " +"<arg>stats</arg> <arg>dump</arg> <arg>dumpavail</arg> <arg>unmet</arg> " +"<arg>search <arg choice=\"plain\"><replaceable>regulärer_Ausdruck</" +"replaceable></arg></arg> <arg>show <arg choice=\"plain\" rep=\"repeat" +"\"><replaceable>Paket</replaceable></arg></arg> <arg>depends <arg choice=" +"\"plain\" rep=\"repeat\"><replaceable>Paket</replaceable></arg></arg> " +"<arg>rdepends <arg choice=\"plain\" rep=\"repeat\"><replaceable>Paket</" "replaceable></arg></arg> <arg>pkgnames <arg choice=\"plain" "\"><replaceable>Präfix</replaceable></arg></arg> <arg>dotty <arg choice=" "\"plain\" rep=\"repeat\"><replaceable>Paket</replaceable></arg></arg> " @@ -763,7 +735,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50 #: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:114 -#: apt-key.8.xml:38 apt-mark.8.xml:55 apt-secure.8.xml:43 +#: apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43 #: apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36 #: sources.list.5.xml:36 msgid "Description" @@ -1282,7 +1254,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59 -#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:92 +#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:126 #: apt-sortpkgs.1.xml:57 apt.conf.5.xml:560 apt.conf.5.xml:582 msgid "options" msgstr "Optionen" @@ -1310,7 +1282,7 @@ msgstr "" "pkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:288 apt-ftparchive.1.xml:568 apt-get.8.xml:393 +#: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393 #: apt-sortpkgs.1.xml:61 msgid "<option>-s</option>" msgstr "<option>-s</option>" @@ -1338,12 +1310,12 @@ msgstr "" "srcpkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:296 apt-ftparchive.1.xml:542 apt-get.8.xml:383 +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 msgid "<option>-q</option>" msgstr "<option>-q</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:296 apt-ftparchive.1.xml:542 apt-get.8.xml:383 +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 msgid "<option>--quiet</option>" msgstr "<option>--quiet</option>" @@ -1458,7 +1430,7 @@ msgstr "" "Konfigurationselement: <literal>APT::Cache::ShowFull</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:580 +#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583 msgid "<option>-a</option>" msgstr "<option>-a</option>" @@ -1575,14 +1547,14 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist> #: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101 -#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608 apt-get.8.xml:570 -#: apt-sortpkgs.1.xml:67 +#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570 +#: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67 msgid "&apt-commonoptions;" msgstr "&apt-commonoptions;" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:156 apt-mark.8.xml:125 -#: apt.conf.5.xml:1093 apt_preferences.5.xml:649 +#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:172 apt-mark.8.xml:144 +#: apt.conf.5.xml:1093 apt_preferences.5.xml:697 msgid "Files" msgstr "Dateien" @@ -1593,9 +1565,9 @@ msgstr "&file-sourceslist; &file-statelists;" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106 -#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:624 apt-get.8.xml:585 -#: apt-key.8.xml:177 apt-mark.8.xml:131 apt-secure.8.xml:185 -#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:656 +#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585 +#: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185 +#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704 #: sources.list.5.xml:234 msgid "See Also" msgstr "Siehe auch" @@ -1607,8 +1579,8 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111 -#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:628 apt-get.8.xml:591 -#: apt-mark.8.xml:135 apt-sortpkgs.1.xml:76 +#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591 +#: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76 msgid "Diagnostics" msgstr "Diagnose" @@ -1737,12 +1709,12 @@ msgstr "" "<placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><title> -#: apt-cdrom.8.xml:94 apt-key.8.xml:142 +#: apt-cdrom.8.xml:94 apt-key.8.xml:158 msgid "Options" msgstr "Optionen" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:536 apt-get.8.xml:345 +#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345 msgid "<option>-d</option>" msgstr "<option>-d</option>" @@ -1912,7 +1884,7 @@ msgstr "" "<command>apt-config</command><arg><option>-hv</option></arg><arg><option>-" "o=<replaceable>Konfigurationszeichenkette</replaceable></option></" "arg><arg><option>-c=<replaceable>Datei</replaceable></option></arg><group " -"choice=\"req\"> <arg>shell</arg> <arg>dump</arg> </group>" +"choice=\"req\"> <arg>shell</arg> <arg>Abbild</arg> </group>" #. type: Content of: <refentry><refsect1><para> #: apt-config.8.xml:51 @@ -1996,7 +1968,7 @@ msgid "Just show the contents of the configuration space." msgstr "Nur der Inhalt des Konfigurationsbereichs wird angezeigt." #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:625 +#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628 #: apt-sortpkgs.1.xml:73 msgid "&apt-conf;" msgstr "&apt-conf;" @@ -2309,6 +2281,18 @@ msgid "" "literal>. It then writes to stdout a Release file containing a MD5, SHA1 " "and SHA256 digest for each file." msgstr "" +"Der Befehl <literal>release</literal> erzeugt eine Release-Datei aus einem " +"Verzeichnisbaum. Standardmäßig durchsucht er rekursiv das angegebene " +"Verzeichnis nach nicht komprimierten <filename>Packages</filename>- und " +"<filename>Sources</filename>-Dateien und denen, die mit <command>gzip</" +"command>, <command>bzip2</command> oder <command>lzma</command> komprimiert " +"wurden, ebenso wie <filename>Release</filename>- und <filename>md5sum.txt</" +"filename>-Dateien (<literal>APT::FTPArchive::Release::Default-Patterns</" +"literal>). Zusätzliche Muster für Dateinamen können hinzugefügt werden, " +"indem sie in <literal>APT::FTPArchive::Release::Patterns</literal> " +"aufgeführt werden. Dann schreibt er eine Release-Datei auf die " +"Standardausgabe, die für jede Datei eine MD5-, SHA1- und SHA256-Prüfsumme " +"enthält." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:125 @@ -3144,27 +3128,43 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-ftparchive.1.xml:529 -msgid "<option>--md5</option>" -msgstr "<option>--md5</option>" +msgid "" +"<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>" +msgstr "" +"<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>" +# FIXME <literal>Checksum</literal> im letzten Abschnitt <replaceable>? #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:531 msgid "" -"Generate MD5 sums. This defaults to on, when turned off the generated index " -"files will not have MD5Sum fields where possible. Configuration Item: " -"<literal>APT::FTPArchive::MD5</literal>" -msgstr "" -"Generiert MD5-Summen. Dies ist standardmäßig an, wenn es ausgeschaltet ist, " -"haben die generierten Indexdateien keine MD5Sum-Felder, sofern dies möglich " -"ist. Konfigurationselement: <literal>APT::FTPArchive::MD5</literal>" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:536 +"Generate the given checksum. These options default to on, when turned off " +"the generated index files will not have the checksum fields where possible. " +"Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</" +"replaceable></literal> and <literal>APT::FTPArchive::<replaceable>Index</" +"replaceable>::<replaceable>Checksum</replaceable></literal> where " +"<literal>Index</literal> can be <literal>Packages</literal>, " +"<literal>Sources</literal> or <literal>Release</literal> and " +"<literal>Checksum</literal> can be <literal>MD5</literal>, <literal>SHA1</" +"literal> or <literal>SHA256</literal>." +msgstr "" +"erzeugt die vorgegebene Prüfsumme. Diese Optionen sind standardmäßig " +"aktiviert. Wenn sie deaktiviert sind, werden die erzeugten Indexdateien nach " +"Möglichkeit keine Prüfsummenfelder erhalten. Konfigurationselemente: " +"<literal>APT::FTPArchive::<replaceable>Prüfsumme</replaceable></literal> und " +"<literal>APT::FTPArchive::<replaceable>Index</replaceable>::" +"<replaceable>Prüfsumme</replaceable></literal>, wobei <literal>Index</" +"literal> <literal>Packages</literal>, <literal>Sources</literal> oder " +"<literal>Release</literal> sein kann und <literal>Checksum</literal> " +"<literal>MD5</literal>, <literal>SHA1</literal> oder <literal>SHA256</" +"literal> sein kann." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:539 msgid "<option>--db</option>" msgstr "<option>--db</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:538 +#: apt-ftparchive.1.xml:541 msgid "" "Use a binary caching DB. This has no effect on the generate command. " "Configuration Item: <literal>APT::FTPArchive::DB</literal>." @@ -3174,7 +3174,7 @@ msgstr "" "DB</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:544 +#: apt-ftparchive.1.xml:547 msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quiet up to a maximum of 2. You can also use " @@ -3188,12 +3188,12 @@ msgstr "" "Konfigurationselement: <literal>quiet</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:550 +#: apt-ftparchive.1.xml:553 msgid "<option>--delink</option>" msgstr "<option>--delink</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:552 +#: apt-ftparchive.1.xml:555 msgid "" "Perform Delinking. If the <literal>External-Links</literal> setting is used " "then this option actually enables delinking of the files. It defaults to on " @@ -3207,12 +3207,12 @@ msgstr "" "DeLinkAct</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:558 +#: apt-ftparchive.1.xml:561 msgid "<option>--contents</option>" msgstr "<option>--contents</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:560 +#: apt-ftparchive.1.xml:563 msgid "" "Perform contents generation. When this option is set and package indexes are " "being generated with a cache DB then the file listing will also be extracted " @@ -3228,12 +3228,12 @@ msgstr "" "Konfigurationselement: <literal>APT::FTPArchive::Contents</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:568 +#: apt-ftparchive.1.xml:571 msgid "<option>--source-override</option>" msgstr "<option>--source-override</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:570 +#: apt-ftparchive.1.xml:573 msgid "" "Select the source override file to use with the <literal>sources</literal> " "command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</" @@ -3244,12 +3244,12 @@ msgstr "" "SourceOverride</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:574 +#: apt-ftparchive.1.xml:577 msgid "<option>--readonly</option>" msgstr "<option>--readonly</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:576 +#: apt-ftparchive.1.xml:579 msgid "" "Make the caching databases read only. Configuration Item: <literal>APT::" "FTPArchive::ReadOnlyDB</literal>." @@ -3258,12 +3258,12 @@ msgstr "" "<literal>APT::FTPArchive::ReadOnlyDB</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:580 +#: apt-ftparchive.1.xml:583 msgid "<option>--arch</option>" msgstr "<option>--arch</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:581 +#: apt-ftparchive.1.xml:584 msgid "" "Accept in the <literal>packages</literal> and <literal>contents</literal> " "commands only package files matching <literal>*_arch.deb</literal> or " @@ -3277,12 +3277,12 @@ msgstr "" "Architecture</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:587 +#: apt-ftparchive.1.xml:590 msgid "<option>APT::FTPArchive::AlwaysStat</option>" msgstr "<option>APT::FTPArchive::AlwaysStat</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:589 +#: apt-ftparchive.1.xml:592 msgid "" "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If " "packages are recompiled and/or republished with the same version again, this " @@ -3306,12 +3306,12 @@ msgstr "" "haben sollte und all diese zusätzlichen Prüfungen daher nutzlos sind." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:599 +#: apt-ftparchive.1.xml:602 msgid "<option>APT::FTPArchive::LongDescription</option>" msgstr "<option>APT::FTPArchive::LongDescription</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:601 +#: apt-ftparchive.1.xml:604 msgid "" "This configuration option defaults to \"<literal>true</literal>\" and should " "only be set to <literal>\"false\"</literal> if the Archive generated with " @@ -3327,19 +3327,19 @@ msgstr "" "werden kann." #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:613 apt.conf.5.xml:1087 apt_preferences.5.xml:496 +#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:544 #: sources.list.5.xml:198 msgid "Examples" msgstr "Beispiele" #. type: Content of: <refentry><refsect1><para><programlisting> -#: apt-ftparchive.1.xml:619 +#: apt-ftparchive.1.xml:622 #, no-wrap msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" msgstr "<command>apt-ftparchive</command> Pakete <replaceable>Verzeichnis</replaceable> | <command>gzip</command> > <filename>Pakete.gz</filename>\n" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:615 +#: apt-ftparchive.1.xml:618 msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" @@ -3349,7 +3349,7 @@ msgstr "" ">" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:629 +#: apt-ftparchive.1.xml:632 msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@ -3819,14 +3819,17 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:281 msgid "download" -msgstr "" +msgstr "download" +# FIXME s/directoy/directory/ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:282 msgid "" "<literal>download</literal> will download the given binary package into the " "current directoy." msgstr "" +"<literal>download</literal> wird das angegebene Binärpaket in das aktuelle " +"Verzeichnis herunterladen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:288 @@ -3891,7 +3894,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:312 msgid "changelog" -msgstr "" +msgstr "changelog" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:313 @@ -3905,6 +3908,14 @@ msgid "" "installed. However, you can specify the same options as for the " "<option>install</option> command." msgstr "" +"<literal>changelog</literal> lädt ein Changelog eines Pakets herunter und " +"zeigt es mit <command>sensible-pager</command> an. Der Servername und das " +"Basisverzeichnis sind in der Variable <literal>APT::Changelogs::Server</" +"literal> definiert (z.B. <ulink>http://packages.debian.org/changelogs</" +"ulink> für Debian oder <ulink>http://changelogs.ubuntu.com/changelogs</" +"ulink> für Ubuntu). Standardmäßig zeigt es das Changelog für die " +"installierte Version. Sie können jedoch die gleichen Optionen wie für den " +"Befehl <option>install</option> angeben." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:335 @@ -3922,23 +3933,17 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:340 -#, fuzzy -#| msgid "<option>--no-suggests</option>" msgid "<option>--install-suggests</option>" -msgstr "<option>--no-suggests</option>" +msgstr "<option>--install-suggests</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:341 -#, fuzzy -#| msgid "" -#| "Do not consider recommended packages as a dependency for installing. " -#| "Configuration Item: <literal>APT::Install-Recommends</literal>." msgid "" "Consider suggested packages as a dependency for installing. Configuration " "Item: <literal>APT::Install-Suggests</literal>." msgstr "" -"Empfohlene Pakete nicht als Abhängigkeit für die Installation betrachten. " -"Konfigurationselement: <literal>APT::Install-Recommends</literal>." +"Empfohlene Pakete als Abhängigkeit für die Installation betrachten. " +"Konfigurationselement: <literal>APT::Install-Suggests</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:345 @@ -4714,8 +4719,24 @@ msgstr "" "aktualisieren und aus dem Schlüsselbund die Archivschlüssel entfernen, die " "nicht länger gültig sind." +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:140 +#, fuzzy +#| msgid "update" +msgid "net-update" +msgstr "update" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:144 +msgid "" +"Update the local keyring with the keys of a key server and removes from the " +"keyring the archive keys which are no longer valid. This requires an " +"installed wget and an APT build configured to have a server to fetch from. " +"APT in Debian does not support this command, but Ubuntu's APT does." +msgstr "" + #. type: Content of: <refentry><refsect1><para> -#: apt-key.8.xml:143 +#: apt-key.8.xml:159 msgid "" "Note that options need to be defined before the commands described in the " "previous section." @@ -4724,12 +4745,12 @@ msgstr "" "Befehlen definiert sein müssen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:145 +#: apt-key.8.xml:161 msgid "--keyring <replaceable>filename</replaceable>" msgstr "--keyring <replaceable>Dateiname</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:146 +#: apt-key.8.xml:162 msgid "" "With this option it is possible to specify a specific keyring file the " "command should operate on. The default is that a command is executed on the " @@ -4746,54 +4767,58 @@ msgstr "" "Schlüssel werden zu diesem hinzugefügt." #. type: Content of: <refentry><refsect1><variablelist> -#: apt-key.8.xml:159 +#: apt-key.8.xml:175 msgid "&file-trustedgpg;" msgstr "&file-trustedgpg;" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:161 +#: apt-key.8.xml:177 msgid "<filename>/etc/apt/trustdb.gpg</filename>" msgstr "<filename>/etc/apt/trustdb.gpg</filename>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:162 +#: apt-key.8.xml:178 msgid "Local trust database of archive keys." msgstr "Lokale Datenbank vertrauenswürdiger Archivschlüssel." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:165 +#: apt-key.8.xml:181 msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:166 +#: apt-key.8.xml:182 msgid "Keyring of Debian archive trusted keys." msgstr "Schlüsselbund vertrauenswürdiger Schlüssel des Debian-Archivs." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:169 +#: apt-key.8.xml:185 msgid "" "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" msgstr "" "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:170 +#: apt-key.8.xml:186 msgid "Keyring of Debian archive removed trusted keys." msgstr "" "Schlüsselbund entfernter vertrauenswürdiger Schlüssel des Debian-Archivs." #. type: Content of: <refentry><refsect1><para> -#: apt-key.8.xml:179 +#: apt-key.8.xml:195 msgid "&apt-get;, &apt-secure;" msgstr "&apt-get;, &apt-secure;" #. The last update date #. type: Content of: <refentry><refentryinfo> #: apt-mark.8.xml:16 +#, fuzzy +#| msgid "" +#| "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 " +#| "August 2009</date>" msgid "" -"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 " -"August 2009</date>" +"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>21 " +"April 2011</date>" msgstr "" "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9. " "August 2009</date>" @@ -4812,13 +4837,22 @@ msgstr "" #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> #: apt-mark.8.xml:39 +#, fuzzy +#| msgid "" +#| " <command>apt-mark</command> <arg><option>-hv</option></arg> " +#| "<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> <group " +#| "choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg " +#| "choice=\"plain\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </" +#| "group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>package</" +#| "replaceable></arg> </arg> <arg choice=\"plain\">showauto</arg> </group>" msgid "" " <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-" "f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain" "\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain" -"\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </group> <arg " +"\">auto</arg> <arg choice=\"plain\">manual</arg> <arg choice=\"plain" +"\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </group> <arg " "choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </" -"arg> <arg choice=\"plain\">showauto</arg> </group>" +"arg> </group>" msgstr "" " <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-" "f=<replaceable>DATEINAME</replaceable></option></arg> <group choice=\"plain" @@ -4828,7 +4862,7 @@ msgstr "" "arg> <arg choice=\"plain\">showauto</arg> </group>" #. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:56 +#: apt-mark.8.xml:57 msgid "" "<command>apt-mark</command> will change whether a package has been marked as " "being automatically installed." @@ -4837,7 +4871,7 @@ msgstr "" "installiert markiert ist." #. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:60 +#: apt-mark.8.xml:61 msgid "" "When you request that a package is installed, and as a result other packages " "are installed to satisfy its dependencies, the dependencies are marked as " @@ -4853,14 +4887,21 @@ msgstr "" "<command>aptitude</command> entfernt." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:68 -msgid "markauto" +#: apt-mark.8.xml:69 +#, fuzzy +#| msgid "markauto" +msgid "auto" msgstr "markauto" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:69 +#: apt-mark.8.xml:70 +#, fuzzy +#| msgid "" +#| "<literal>markauto</literal> is used to mark a package as being " +#| "automatically installed, which will cause the package to be removed when " +#| "no more manually installed packages depend on this package." msgid "" -"<literal>markauto</literal> is used to mark a package as being automatically " +"<literal>auto</literal> is used to mark a package as being automatically " "installed, which will cause the package to be removed when no more manually " "installed packages depend on this package." msgstr "" @@ -4869,14 +4910,19 @@ msgstr "" "keine manuell installierten Pakete von ihm abhängen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:76 -msgid "unmarkauto" -msgstr "unmarkauto" +#: apt-mark.8.xml:77 +msgid "manual" +msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:77 +#: apt-mark.8.xml:78 +#, fuzzy +#| msgid "" +#| "<literal>unmarkauto</literal> is used to mark a package as being manually " +#| "installed, which will prevent the package from being automatically " +#| "removed if no other packages depend on it." msgid "" -"<literal>unmarkauto</literal> is used to mark a package as being manually " +"<literal>manual</literal> is used to mark a package as being manually " "installed, which will prevent the package from being automatically removed " "if no other packages depend on it." msgstr "" @@ -4885,28 +4931,102 @@ msgstr "" "entfernt wird, wenn kein anderes Paket von ihm abhängt." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:84 +#: apt-mark.8.xml:85 +msgid "hold" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:86 +msgid "" +"<literal>hold</literal> is used to mark a package as hold back, which will " +"prevent the package from being automatically installed, upgraded or " +"removed. The command is only a wrapper around <command>dpkg --set-" +"selections</command> and the state is therefore maintained by &dpkg; and not " +"effected by the <option>--filename</option> option." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:95 +msgid "unhold" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:96 +#, fuzzy +#| msgid "" +#| "<literal>showauto</literal> is used to print a list of automatically " +#| "installed packages with each package on a new line." +msgid "" +"<literal>unhold</literal> is used to cancel a previously set hold on a " +"package to allow all actions again." +msgstr "" +"<literal>showauto</literal> wird benutzt, um eine Liste automatisch " +"installierter Pakete mit einem Paket in jeder neuen Zeile, auszugeben." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:101 msgid "showauto" msgstr "showauto" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:85 +#: apt-mark.8.xml:102 +#, fuzzy +#| msgid "" +#| "<literal>showauto</literal> is used to print a list of automatically " +#| "installed packages with each package on a new line." msgid "" "<literal>showauto</literal> is used to print a list of automatically " -"installed packages with each package on a new line." +"installed packages with each package on a new line. All automatically " +"installed packages will be listed if no package is given. If packages are " +"given only those which are automatically installed will be shown." msgstr "" "<literal>showauto</literal> wird benutzt, um eine Liste automatisch " "installierter Pakete mit einem Paket in jeder neuen Zeile, auszugeben." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:96 +#: apt-mark.8.xml:109 +#, fuzzy +#| msgid "showauto" +msgid "showmanual" +msgstr "showauto" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:110 +msgid "" +"<literal>showmanual</literal> can be used in the same way as " +"<literal>showauto</literal> except that it will print a list of manually " +"installed packages instead." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:116 +#, fuzzy +#| msgid "showauto" +msgid "showhold" +msgstr "showauto" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:117 +#, fuzzy +#| msgid "" +#| "<literal>showauto</literal> is used to print a list of automatically " +#| "installed packages with each package on a new line." +msgid "" +"<literal>showhold</literal> is used to print a list of packages on hold in " +"the same way as for the other show commands." +msgstr "" +"<literal>showauto</literal> wird benutzt, um eine Liste automatisch " +"installierter Pakete mit einem Paket in jeder neuen Zeile, auszugeben." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:130 msgid "" "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>" msgstr "" "<option>-f=<filename><replaceable>DATEINAME</replaceable></filename></option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:97 +#: apt-mark.8.xml:131 msgid "" "<option>--file=<filename><replaceable>FILENAME</replaceable></filename></" "option>" @@ -4915,7 +5035,7 @@ msgstr "" "option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:100 +#: apt-mark.8.xml:134 msgid "" "Read/Write package stats from <filename><replaceable>FILENAME</replaceable></" "filename> instead of the default location, which is " @@ -4927,48 +5047,18 @@ msgstr "" "filename> im von Konfigurationselement <literal>Dir::State</literal> " "definierten Verzeichnis, ist." -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:106 -msgid "<option>-h</option>" -msgstr "<option>-h</option>" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:107 -msgid "<option>--help</option>" -msgstr "<option>--help</option>" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:108 -msgid "Show a short usage summary." -msgstr "Eine kurze Zusammenfassung anzeigen." - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:114 -msgid "<option>-v</option>" -msgstr "<option>-v</option>" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:115 -msgid "<option>--version</option>" -msgstr "<option>--version</option>" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:116 -msgid "Show the program version." -msgstr "Die Programmversion anzeigen." - #. type: Content of: <refentry><refsect1><variablelist> -#: apt-mark.8.xml:127 +#: apt-mark.8.xml:146 msgid " &file-extended_states;" msgstr " &file-extended_states;" #. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:132 +#: apt-mark.8.xml:151 msgid "&apt-get;,&aptitude;,&apt-conf;" msgstr "&apt-get;,&aptitude;,&apt-conf;" #. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:136 +#: apt-mark.8.xml:155 msgid "" "<command>apt-mark</command> returns zero on normal operation, non-zero on " "error." @@ -5183,14 +5273,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt-secure.8.xml:147 -#, fuzzy -#| msgid "" -#| "In order to add a new key you need to first download it (you should make " -#| "sure you are using a trusted communication channel when retrieving it), " -#| "add it with <command>apt-key</command> and then run <command>apt-get " -#| "update</command> so that apt can download and verify the " -#| "<filename>Release.gpg</filename> files from the archives you have " -#| "configured." msgid "" "In order to add a new key you need to first download it (you should make " "sure you are using a trusted communication channel when retrieving it), add " @@ -5203,8 +5285,9 @@ msgstr "" "(Sie sollten sicherstellen, dass Sie einen vertrauenswürdigen " "Kommunikationskanal benutzen, wenn Sie ihn herunterladen), ihn mit " "<command>apt-key</command> hinzufügen und dann <command>apt-get update</" -"command> ausführen, so dass APT die <filename>Release.gpg</filename>-Dateien " -"der von Ihnen konfigurierten Archive herunterladen und prüfen kann." +"command> ausführen, so dass APT die Dateien <filename>InRelease</filename> " +"oder <filename>Release.gpg</filename> der von Ihnen konfigurierten Archive " +"herunterladen und prüfen kann." #. type: Content of: <refentry><refsect1><title> #: apt-secure.8.xml:156 @@ -5233,17 +5316,14 @@ msgstr "" #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para> #: apt-secure.8.xml:168 -#, fuzzy -#| msgid "" -#| "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg -" -#| "abs -o Release.gpg Release</command>." msgid "" "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg --" "clearsign -o InRelease Release</command> and <command>gpg -abs -o Release." "gpg Release</command>." msgstr "" "<emphasis>Es signieren</emphasis>. Sie können dies tun, indem Sie " -"<command>gpg -abs -o Release.gpg Release</command> ausführen." +"<command>gpg --clearsign -o InRelease Release</command> und <command>gpg -" +"abs -o Release.gpg Release</command> ausführen." #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para> #: apt-secure.8.xml:172 @@ -5434,14 +5514,9 @@ msgstr "" "die Datei, die durch die Umgebungsvariable <envar>APT_CONFIG</envar> " "angegeben wird (falls gesetzt)" +# FIXME s/no or/no/ #. type: Content of: <refentry><refsect1><orderedlist><listitem><para> #: apt.conf.5.xml:52 -#, fuzzy -#| msgid "" -#| "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending " -#| "order which have no or \"<literal>conf</literal>\" as filename extension " -#| "and which only contain alphanumeric, hyphen (-), underscore (_) and " -#| "period (.) characters - otherwise they will be silently ignored." msgid "" "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending " "order which have no or \"<literal>conf</literal>\" as filename extension and " @@ -5452,9 +5527,12 @@ msgid "" msgstr "" "alle Dateien in <literal>Dir::Etc::Parts</literal> in aufsteigender " "alphanumerischer Reihenfolge, die kein »<literal>conf</literal>« als " -"Dateinamenserweiterung haben und die alphanumerische Zeichen, Bindestriche " -"(-), Unterstriche (_) und Punkte (.) enthalten – andernfalls werden sie " -"stillschweigend ignoriert." +"Dateinamenserweiterung haben und die nur alphanumerische Zeichen, " +"Bindestriche (-), Unterstriche (_) und Punkte (.) enthalten. Andernfalls " +"wird APT einen Hinweis ausgeben, dass es eine Datei ignoriert hat, falls die " +"Datei nicht auf ein Muster in der Konfigurationsliste <literal>Dir::Ignore-" +"Files-Silently</literal> passt – in diesem Fall wird sie stillschweigend " +"ignoriert." #. type: Content of: <refentry><refsect1><orderedlist><listitem><para> #: apt.conf.5.xml:59 @@ -6483,20 +6561,9 @@ msgstr "" msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";" +# FIXME s/> Note/>. Note/ #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:442 -#, fuzzy -#| msgid "" -#| "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" -#| "replaceable></literal> will be checked: If this setting exists the method " -#| "will only be used if this file exists, e.g. for the bzip2 method (the " -#| "inbuilt) setting is <placeholder type=\"literallayout\" id=\"0\"/> Note " -#| "also that list entries specified on the command line will be added at the " -#| "end of the list specified in the configuration files, but before the " -#| "default entries. To prefer a type in this case over the ones specified in " -#| "in the configuration files you can set the option direct - not in list " -#| "style. This will not override the defined list, it will only prefix the " -#| "list with this type." msgid "" "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" "replaceable></literal> will be checked: If this setting exists the method " @@ -6513,14 +6580,15 @@ msgstr "" "replaceable></literal> zur Laufzeit geprüft wird: Falls diese Einstellung " "existiert, wird die Methode nur benutzt, wenn die Datei existiert, z.B. für " "die (integrierte) bzip2-Methode ist die Einstellung <placeholder type=" -"\"literallayout\" id=\"0\"/>. Beachten Sie, dass diese auf der Befehlszeile " +"\"literallayout\" id=\"0\"/>. Beachten Sie auch, dass auf der Befehlszeile " "eingegebenen Einträge an das Ende der Liste angehängt werden, die in den " "Konfigurationsdateien angegeben wurde, aber vor den Vorgabeeinträgen. Um " -"einen Eintrag in diesem Fall vor einem, über die in der Konfigurationsdatei " -"angegebenen, zu bevorzugen, können Sie diese Option direkt setzen – nicht im " -"Listenstil. Dies wird die definierte Liste nicht überschreiben, es wird " -"diesen Typ nur vor die Liste setzen." +"einen Typ in diesem Fall gegenüber einem, der über die Konfigurationsdatei " +"angegebenen wurde, zu bevorzugen, können Sie diese Option direkt setzen – " +"nicht im Listenstil. Dies wird die definierte Liste nicht überschreiben, es " +"wird diesen Typ nur vor die Liste setzen." +# FIXME: s/doesn't provide/don't provide/ #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:449 msgid "" @@ -6528,6 +6596,10 @@ msgid "" "uncompressed files a preference, but note that most archives doesn't provide " "uncompressed files so this is mostly only useable for local mirrors." msgstr "" +"Der besondere Typ <literal>uncompressed</literal> kann benutzt werden, um " +"unkomprimierten Dateien einen Vorrang zu geben, beachten Sie jedoch, dass " +"die meisten Archive keine unkomprimierten Dateien bereitstellen, so dass " +"dies meist nur für lokale Spiegel benutzt werden kann." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> #: apt.conf.5.xml:454 @@ -6963,19 +7035,6 @@ msgstr "Dpkd-Trigger-Benutzung (und zugehöriger Optionen)" #. type: Content of: <refentry><refsect1><refsect2><para> #: apt.conf.5.xml:621 -#, fuzzy -#| msgid "" -#| "APT can call dpkg in a way so it can make aggressive use of triggers over " -#| "multiply calls of dpkg. Without further options dpkg will use triggers " -#| "only in between his own run. Activating these options can therefore " -#| "decrease the time needed to perform the install / upgrade. Note that it " -#| "is intended to activate these options per default in the future, but as " -#| "it changes the way APT calling dpkg drastically it needs a lot more " -#| "testing. <emphasis>These options are therefore currently experimental " -#| "and should not be used in productive environments.</emphasis> Also it " -#| "breaks the progress reporting so all frontends will currently stay around " -#| "half (or more) of the time in the 100% state while it actually configures " -#| "all packages." msgid "" "APT can call dpkg in a way so it can make aggressive use of triggers over " "multiple calls of dpkg. Without further options dpkg will use triggers only " @@ -6988,17 +7047,18 @@ msgid "" "all frontends will currently stay around half (or more) of the time in the " "100% state while it actually configures all packages." msgstr "" -"APT kann Dpkg auf eine Art aufrufen, auf die aggressiv Gebrauch von Triggern " -"über mehrere Dpkg-Aufrufe gemacht wird. Ohne weitere Optionen wird Dpkg " -"Trigger nur während seiner eigenen Ausführung benutzen. Diese Optionen zu " -"benutzen, kann daher die zum Installieren/Upgrade benötigte Zeit verkürzen. " -"Beachten Sie, dass geplant ist, diese Optionen in Zukunft standardmäßig zu " -"aktivieren, aber da es die Art, wie APT Dpkg aufruft, drastisch ändert, " -"benötigt es noch viele weitere Tests. <emphasis>Diese Optionen sind daher " -"aktuell noch experimentell und sollten nicht in produktiven Umgebungen " -"benutzt werden.</emphasis> Außerdem unterbricht es die Fortschrittsanzeige, " -"so dass alle Oberflächen aktuell in der halben (oder mehr) Zeit auf dem " -"Status 100% stehen, während es aktuell alle Pakete konfiguriert." +"APT kann Dpkg auf eine Art aufrufen, in der aggressiv Gebrauch von Triggern " +"über mehrere Dpkg-Aufrufe hinweg gemacht wird. Ohne weitere Optionen wird " +"Dpkg Trigger nur während seiner eigenen Ausführung benutzen. Diese Optionen " +"zu benutzen, kann daher die zum Installieren/Upgrade benötigte Zeit " +"verkürzen. Beachten Sie, dass geplant ist, diese Optionen in Zukunft " +"standardmäßig zu aktivieren, aber da es die Art, wie APT Dpkg aufruft, " +"drastisch ändert, benötigt es noch viele weitere Tests. <emphasis>Diese " +"Optionen sind daher aktuell noch experimentell und sollten nicht in " +"produktiven Umgebungen benutzt werden.</emphasis> Außerdem unterbricht es " +"die Fortschrittsanzeige, so dass alle Oberflächen derzeit die halbe (oder " +"mehr) Zeit auf dem Status 100% stehen, während tatsächlich alle Pakete " +"konfiguriert werden." #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> #: apt.conf.5.xml:636 @@ -7818,14 +7878,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt_preferences.5.xml:70 -#, fuzzy -#| msgid "" -#| "Note that the files in the <filename>/etc/apt/preferences.d</filename> " -#| "directory are parsed in alphanumeric ascending order and need to obey the " -#| "following naming convention: The files have no or \"<literal>pref</" -#| "literal>\" as filename extension and which only contain alphanumeric, " -#| "hyphen (-), underscore (_) and period (.) characters - otherwise they " -#| "will be silently ignored." msgid "" "Note that the files in the <filename>/etc/apt/preferences.d</filename> " "directory are parsed in alphanumeric ascending order and need to obey the " @@ -7836,11 +7888,14 @@ msgid "" "<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this " "case it will be silently ignored." msgstr "" -"Beachten Sie, dass die Dateien im Verzeichnis /etc/apt/preferences.d in " -"alphanumerisch aufsteigender Richtung ausgewertet werden und der folgenden " -"Namenskonvention unterliegen: Die Dateien haben keine oder »pref« als " -"Dateierweiterung und sie enthalten nur alphanumerische Zeichen, Bindestriche " -"(-), Unterstriche (_) oder Punkte (.). Wenn dies nicht der Fall ist, werden " +"Beachten Sie, dass die Dateien im Verzeichnis <filename>/etc/apt/preferences." +"d</filename> in alphanumerisch aufsteigender Reihenfolge ausgewertet werden " +"und der folgenden Namenskonvention unterliegen: Die Dateien haben keine oder " +"<literal>»pref«</literal> als Dateierweiterung und sie enthalten nur " +"alphanumerische Zeichen, Bindestriche (-), Unterstriche (_) oder Punkte (.). " +"Andernfalls wird APT einen Hinweis ausgeben, dass es eine Datei ignoriert " +"hat, falls die Datei nicht auf ein Muster in der Konfigurationsliste " +"<literal>Dir::Ignore-Files-Silently</literal> passt – in diesem Fall wird " "sie stillschweigend ignoriert." #. type: Content of: <refentry><refsect1><refsect2><title> @@ -7895,32 +7950,49 @@ msgstr "Priorität 1" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #: apt_preferences.5.xml:107 +#, fuzzy +#| msgid "" +#| "to the versions coming from archives which in their <filename>Release</" +#| "filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</" +#| "emphasis> as \"ButAutomaticUpgrades: yes\" like the debian " +#| "<literal>experimental</literal> archive." msgid "" "to the versions coming from archives which in their <filename>Release</" -"filename> files are marked as \"NotAutomatic: yes\" like the debian " -"experimental archive." +"filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</" +"emphasis> as \"ButAutomaticUpgrades: yes\" like the debian " +"<literal>experimental</literal> archive." msgstr "" -"zu den Versionen, die von Archiven kommen, deren <filename>Release</" -"filename>-Dateien als »NotAutomatic: yes« markiert sind, wie das Debian-" -"Experimental-Archiv." +"zu den Versionen, die von Archiven kommen, die in deren <filename>Release</" +"filename>-Dateien als »NotAutomatic: yes« markiert sind, aber " +"<emphasis>nicht</emphasis> als »ButAutomaticUpgrades: yes« wie das Archiv " +"<literal>experimental</literal> von Debian." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:112 +#: apt_preferences.5.xml:113 msgid "priority 100" msgstr "Priorität 100" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:113 -msgid "to the version that is already installed (if any)." -msgstr "zu der Version, die bereits installiert ist (wenn vorhanden)." +#: apt_preferences.5.xml:114 +msgid "" +"to the version that is already installed (if any) and to the versions coming " +"from archives which in their <filename>Release</filename> files are marked " +"as \"NotAutomatic: yes\" and \"ButAutomaticUpgrades: yes\" like the debian " +"backports archive since <literal>squeeze-backports</literal>." +msgstr "" +"zu der Version, die bereits installiert ist (wenn dies der Fall ist) und zu " +"Versionen, die von Archiven kommen, die in deren <filename>Release</" +"filename>-Dateien als »NotAutomatic: yes« und »ButAutomaticUpgrades: yes« " +"markiert sind, wie das Debian-Backports-Archiv seit <literal>squeeze-" +"backports</literal>." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:117 +#: apt_preferences.5.xml:121 msgid "priority 500" msgstr "Priorität 500" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:118 +#: apt_preferences.5.xml:122 msgid "" "to the versions that are not installed and do not belong to the target " "release." @@ -7929,12 +8001,12 @@ msgstr "" "gehören." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:122 +#: apt_preferences.5.xml:126 msgid "priority 990" msgstr "Priorität 990" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:123 +#: apt_preferences.5.xml:127 msgid "" "to the versions that are not installed and belong to the target release." msgstr "" @@ -7952,22 +8024,33 @@ msgstr "" "Zuweisung: <placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:128 +#: apt_preferences.5.xml:132 +#, fuzzy +#| msgid "" +#| "If the target release has not been specified then APT simply assigns " +#| "priority 100 to all installed package versions and priority 500 to all " +#| "uninstalled package versions, except versions coming from archives which " +#| "in their <filename>Release</filename> files are marked as \"NotAutomatic: " +#| "yes\" - these versions get the priority 1 or priority 100 if it is " +#| "additionally marked as \"ButAutomaticUpgrades: yes\"." msgid "" "If the target release has not been specified then APT simply assigns " "priority 100 to all installed package versions and priority 500 to all " -"uninstalled package versions, expect versions coming from archives which in " +"uninstalled package versions, except versions coming from archives which in " "their <filename>Release</filename> files are marked as \"NotAutomatic: yes\" " -"- these versions get the priority 1." +"- these versions get the priority 1 or priority 100 if it is additionally " +"marked as \"ButAutomaticUpgrades: yes\"." msgstr "" "Wenn das Ziel-Release nicht angegeben wurde, dann weist APT einfach allen " "installierten Paketversionen eine Priorität von 100 und allen nicht " "installierten Paketversionen eine Priorität von 500 zu, außer wenn Versionen " -"aus Archiven kommen, in deren Release-Dateien »NotAutomatic: yes« markiert " -"ist – diese Versionen erhalten die Prirität 1." +"aus Archiven kommen, die in deren <filename>Release<filename>-Dateien " +"»NotAutomatic: yes« markiert sind – diese Versionen erhalten die Priorität 1 " +"oder die Priorität 100, falls sie zusätzlich als »ButAutomaticUpgrades: yes« " +"markiert sind." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:134 +#: apt_preferences.5.xml:139 msgid "" "APT then applies the following rules, listed in order of precedence, to " "determine which version of a package to install." @@ -7977,7 +8060,7 @@ msgstr "" "ist." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:137 +#: apt_preferences.5.xml:142 msgid "" "Never downgrade unless the priority of an available version exceeds 1000. " "(\"Downgrading\" is installing a less recent version of a package in place " @@ -7993,12 +8076,12 @@ msgstr "" "Downgrading eines Paketes riskant sein kann.)" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:143 +#: apt_preferences.5.xml:148 msgid "Install the highest priority version." msgstr "Die Version mit der höchsten Priorität installieren." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:144 +#: apt_preferences.5.xml:149 msgid "" "If two or more versions have the same priority, install the most recent one " "(that is, the one with the higher version number)." @@ -8007,7 +8090,7 @@ msgstr "" "aktuellste installiert (das ist die mit der höheren Versionsnummer)." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:147 +#: apt_preferences.5.xml:152 msgid "" "If two or more versions have the same priority and version number but either " "the packages differ in some of their metadata or the <literal>--reinstall</" @@ -8019,7 +8102,7 @@ msgstr "" "installierte installiert." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:153 +#: apt_preferences.5.xml:158 msgid "" "In a typical situation, the installed version of a package (priority 100) " "is not as recent as one of the versions available from the sources listed in " @@ -8035,7 +8118,7 @@ msgstr "" "upgrade</command> ausgeführt wird." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:160 +#: apt_preferences.5.xml:165 msgid "" "More rarely, the installed version of a package is <emphasis>more</emphasis> " "recent than any of the other available versions. The package will not be " @@ -8049,7 +8132,7 @@ msgstr "" "upgrade</command> ausgeführt wird." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:165 +#: apt_preferences.5.xml:170 msgid "" "Sometimes the installed version of a package is more recent than the version " "belonging to the target release, but not as recent as a version belonging to " @@ -8069,12 +8152,12 @@ msgstr "" "hat." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:174 +#: apt_preferences.5.xml:179 msgid "The Effect of APT Preferences" msgstr "Die Auswirkungen von APT-Einstellungen" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:176 +#: apt_preferences.5.xml:181 msgid "" "The APT preferences file allows the system administrator to control the " "assignment of priorities. The file consists of one or more multi-line " @@ -8088,7 +8171,7 @@ msgstr "" "allgemeine Gestalt." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:182 +#: apt_preferences.5.xml:187 msgid "" "The specific form assigns a priority (a \"Pin-Priority\") to one or more " "specified packages and specified version or version range. For example, the " @@ -8104,7 +8187,7 @@ msgstr "" "können durch Leerzeichen getrennt werden." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:189 +#: apt_preferences.5.xml:194 #, no-wrap msgid "" "Package: perl\n" @@ -8116,7 +8199,7 @@ msgstr "" "Pin-Priority: 1001\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:195 +#: apt_preferences.5.xml:200 msgid "" "The general form assigns a priority to all of the package versions in a " "given distribution (that is, to all the versions of packages that are listed " @@ -8131,7 +8214,7 @@ msgstr "" "ausgebildeten Domänennamen identifiziert wird, eine Priorität zu." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:201 +#: apt_preferences.5.xml:206 msgid "" "This general-form entry in the APT preferences file applies only to groups " "of packages. For example, the following record assigns a high priority to " @@ -8142,7 +8225,7 @@ msgstr "" "Paketversionen eine hohe Priorität zu, die lokal liegen." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:206 +#: apt_preferences.5.xml:211 #, no-wrap msgid "" "Package: *\n" @@ -8154,7 +8237,7 @@ msgstr "" "Pin-Priority: 999\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:211 +#: apt_preferences.5.xml:216 msgid "" "A note of caution: the keyword used here is \"<literal>origin</literal>\" " "which can be used to match a hostname. The following record will assign a " @@ -8168,7 +8251,7 @@ msgstr "" "de.debian.org« identifiziert wird." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:215 +#: apt_preferences.5.xml:220 #, no-wrap msgid "" "Package: *\n" @@ -8180,7 +8263,7 @@ msgstr "" "Pin-Priority: 999\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:219 +#: apt_preferences.5.xml:224 msgid "" "This should <emphasis>not</emphasis> be confused with the Origin of a " "distribution as specified in a <filename>Release</filename> file. What " @@ -8195,7 +8278,7 @@ msgstr "" "oder »Ximian«." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:224 +#: apt_preferences.5.xml:229 msgid "" "The following record assigns a low priority to all package versions " "belonging to any distribution whose Archive name is \"<literal>unstable</" @@ -8206,7 +8289,7 @@ msgstr "" "Priorität zu." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:228 +#: apt_preferences.5.xml:233 #, no-wrap msgid "" "Package: *\n" @@ -8218,7 +8301,7 @@ msgstr "" "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:233 +#: apt_preferences.5.xml:238 msgid "" "The following record assigns a high priority to all package versions " "belonging to any distribution whose Codename is \"<literal>&testing-codename;" @@ -8229,7 +8312,7 @@ msgstr "" "hohe Priorität zu." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:237 +#: apt_preferences.5.xml:242 #, no-wrap msgid "" "Package: *\n" @@ -8241,7 +8324,7 @@ msgstr "" "Pin-Priority: 900\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:242 +#: apt_preferences.5.xml:247 msgid "" "The following record assigns a high priority to all package versions " "belonging to any release whose Archive name is \"<literal>stable</literal>\" " @@ -8252,7 +8335,7 @@ msgstr "" "Nummer »<literal>3.0</literal>« ist, eine hohe Priorität zu." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:247 +#: apt_preferences.5.xml:252 #, no-wrap msgid "" "Package: *\n" @@ -8264,17 +8347,85 @@ msgstr "" "Pin-Priority: 500\n" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:258 +#: apt_preferences.5.xml:262 +msgid "Regular expressions and glob() syntax" +msgstr "Reguläre Ausdrücke und glob()-Syntax" + +# FIXME: s/expression or/expression) or/ +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:264 +msgid "" +"APT also supports pinning by glob() expressions and regular expressions " +"surrounded by /. For example, the following example assigns the priority 500 " +"to all packages from experimental where the name starts with gnome (as a glob" +"()-like expression or contains the word kde (as a POSIX extended regular " +"expression surrounded by slashes)." +msgstr "" +"APT unterstützt außerdem Pinning mittels glob()-Ausdrücken und regulären " +"Ausdrücken, die von »/« umschlossen sind. Das folgende Beispiel weist " +"beispielsweise allen Paketen aus Experimental die Priorität 500 zu, bei " +"denen der Name mit »gnome« beginnt (wie ein glob()-artiger Ausdruck) oder " +"das Wort »kde« enthält (wie ein erweiterter regulärer POSIX-Ausdruck, der " +"von Schrägstrichen umschlossen wird)." + +#. type: Content of: <refentry><refsect1><refsect2><programlisting> +#: apt_preferences.5.xml:273 +#, no-wrap +msgid "" +"Package: gnome* /kde/\n" +"Pin: release n=experimental\n" +"Pin-Priority: 500\n" +msgstr "" +"Package: gnome* /kde/\n" +"Pin: release n=experimental\n" +"Pin-Priority: 500\n" + +# FIXME: s/Those/Thus/ +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:279 +msgid "" +"The rule for those expressions is that they can occur anywhere where a " +"string can occur. Those, the following pin assigns the priority 990 to all " +"packages from a release starting with karmic." +msgstr "" +"Die Regel für diese Ausdrücke ist, dass sie überall dort auftreten können, " +"wo eine Zeichenkette auftreten kann. Somit weist die folgende Pin allen " +"Paketen von einem Release seit Karmic die Priorität 900 zu." + +#. type: Content of: <refentry><refsect1><refsect2><programlisting> +#: apt_preferences.5.xml:285 +#, no-wrap +msgid "" +"Package: *\n" +"Pin: release n=karmic*\n" +"Pin-Priority: 990\n" +msgstr "" +"Package: *\n" +"Pin: release n=karmic*\n" +"Pin-Priority: 990\n" + +#. type: Content of: <refentry><refsect1><refsect2><literal> +#: apt_preferences.5.xml:290 +msgid "Package" +msgstr "Package" + +#. type: Content of: <refentry><refsect1><refsect2><literal> +#: apt_preferences.5.xml:296 +msgid "*" +msgstr "*" + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt_preferences.5.xml:306 msgid "How APT Interprets Priorities" msgstr "Wie APT Prioritäten interpretiert" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:266 +#: apt_preferences.5.xml:314 msgid "P > 1000" msgstr "P > 1000" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:267 +#: apt_preferences.5.xml:315 msgid "" "causes a version to be installed even if this constitutes a downgrade of the " "package" @@ -8283,12 +8434,12 @@ msgstr "" "des Pakets durchführt" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:271 +#: apt_preferences.5.xml:319 msgid "990 < P <=1000" msgstr "990 < P <=1000" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:272 +#: apt_preferences.5.xml:320 msgid "" "causes a version to be installed even if it does not come from the target " "release, unless the installed version is more recent" @@ -8297,12 +8448,12 @@ msgstr "" "Ziel-Release kommt, außer wenn die installierte Version aktueller ist" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:277 +#: apt_preferences.5.xml:325 msgid "500 < P <=990" msgstr "500 < P <=990" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:278 +#: apt_preferences.5.xml:326 msgid "" "causes a version to be installed unless there is a version available " "belonging to the target release or the installed version is more recent" @@ -8312,12 +8463,12 @@ msgstr "" "neuer ist" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:283 +#: apt_preferences.5.xml:331 msgid "100 < P <=500" msgstr "100 < P <=500" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:284 +#: apt_preferences.5.xml:332 msgid "" "causes a version to be installed unless there is a version available " "belonging to some other distribution or the installed version is more recent" @@ -8327,12 +8478,12 @@ msgstr "" "installierte Version neuer ist" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:289 +#: apt_preferences.5.xml:337 msgid "0 < P <=100" msgstr "0 < P <=100" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:290 +#: apt_preferences.5.xml:338 msgid "" "causes a version to be installed only if there is no installed version of " "the package" @@ -8341,17 +8492,17 @@ msgstr "" "installierte Version des Pakets gibt" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:294 +#: apt_preferences.5.xml:342 msgid "P < 0" msgstr "P < 0" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:295 +#: apt_preferences.5.xml:343 msgid "prevents the version from being installed" msgstr "verhindert das Installieren der Version" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:261 +#: apt_preferences.5.xml:309 msgid "" "Priorities (P) assigned in the APT preferences file must be positive or " "negative integers. They are interpreted as follows (roughly speaking): " @@ -8362,7 +8513,7 @@ msgstr "" "(grob gesagt): <placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:300 +#: apt_preferences.5.xml:348 msgid "" "If any specific-form records match an available package version then the " "first such record determines the priority of the package version. Failing " @@ -8376,7 +8527,7 @@ msgstr "" "erste dieser Datensätze die Priorität der Paketversion fest." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:306 +#: apt_preferences.5.xml:354 msgid "" "For example, suppose the APT preferences file contains the three records " "presented earlier:" @@ -8385,7 +8536,7 @@ msgstr "" "bereits gezeigten Datensätze:" #. type: Content of: <refentry><refsect1><refsect2><programlisting> -#: apt_preferences.5.xml:310 +#: apt_preferences.5.xml:358 #, no-wrap msgid "" "Package: perl\n" @@ -8413,12 +8564,12 @@ msgstr "" "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:323 +#: apt_preferences.5.xml:371 msgid "Then:" msgstr "Dann:" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:325 +#: apt_preferences.5.xml:373 msgid "" "The most recent available version of the <literal>perl</literal> package " "will be installed, so long as that version's version number begins with " @@ -8433,7 +8584,7 @@ msgstr "" "dann wird von <literal>perl</literal> ein Downgrade durchgeführt." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:330 +#: apt_preferences.5.xml:378 msgid "" "A version of any package other than <literal>perl</literal> that is " "available from the local system has priority over other versions, even " @@ -8444,7 +8595,7 @@ msgstr "" "sogar wenn diese Versionen zum Ziel-Release gehören." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:334 +#: apt_preferences.5.xml:382 msgid "" "A version of a package whose origin is not the local system but some other " "site listed in &sources-list; and which belongs to an <literal>unstable</" @@ -8458,12 +8609,12 @@ msgstr "" "Pakets installiert ist." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:344 +#: apt_preferences.5.xml:392 msgid "Determination of Package Version and Distribution Properties" msgstr "Festlegung von Paketversion und Distributions-Eigenschaften" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:346 +#: apt_preferences.5.xml:394 msgid "" "The locations listed in the &sources-list; file should provide " "<filename>Packages</filename> and <filename>Release</filename> files to " @@ -8474,27 +8625,27 @@ msgstr "" "bereitstellen, um die an diesem Ort verfügbaren Pakete zu beschreiben." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:358 +#: apt_preferences.5.xml:406 msgid "the <literal>Package:</literal> line" msgstr "die <literal>Package:</literal>-Zeile" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:359 +#: apt_preferences.5.xml:407 msgid "gives the package name" msgstr "gibt den Paketnamen an" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:362 apt_preferences.5.xml:412 +#: apt_preferences.5.xml:410 apt_preferences.5.xml:460 msgid "the <literal>Version:</literal> line" msgstr "die <literal>Version:</literal>-Zeile" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:363 +#: apt_preferences.5.xml:411 msgid "gives the version number for the named package" msgstr "gibt die Versionsnummer für das genannte Paket an" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:350 +#: apt_preferences.5.xml:398 msgid "" "The <filename>Packages</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable>/" @@ -8515,12 +8666,12 @@ msgstr "" "Prioritäten relevant: <placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:379 +#: apt_preferences.5.xml:427 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line" msgstr "die <literal>Archive:</literal>- oder <literal>Suite:</literal>-Zeile" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:380 +#: apt_preferences.5.xml:428 msgid "" "names the archive to which all the packages in the directory tree belong. " "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies " @@ -8537,18 +8688,18 @@ msgstr "" "die folgende Zeile benötigen:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:390 +#: apt_preferences.5.xml:438 #, no-wrap msgid "Pin: release a=stable\n" msgstr "Pin: release a=stable\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:396 +#: apt_preferences.5.xml:444 msgid "the <literal>Codename:</literal> line" msgstr "die <literal>Codename:</literal>-Zeile" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:397 +#: apt_preferences.5.xml:445 msgid "" "names the codename to which all the packages in the directory tree belong. " "For example, the line \"Codename: &testing-codename;\" specifies that all of " @@ -8565,13 +8716,13 @@ msgstr "" "anzugeben würde die folgende Zeile benötigen:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:406 +#: apt_preferences.5.xml:454 #, no-wrap msgid "Pin: release n=&testing-codename;\n" msgstr "Pin: release n=&testing-codename;\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:413 +#: apt_preferences.5.xml:461 msgid "" "names the release version. For example, the packages in the tree might " "belong to Debian GNU/Linux release version 3.0. Note that there is normally " @@ -8587,7 +8738,7 @@ msgstr "" "eine der folgenden Zeilen benötigen:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:422 +#: apt_preferences.5.xml:470 #, no-wrap msgid "" "Pin: release v=3.0\n" @@ -8599,12 +8750,12 @@ msgstr "" "Pin: release 3.0\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:431 +#: apt_preferences.5.xml:479 msgid "the <literal>Component:</literal> line" msgstr "die <literal>Component:</literal>-Zeile" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:432 +#: apt_preferences.5.xml:480 msgid "" "names the licensing component associated with the packages in the directory " "tree of the <filename>Release</filename> file. For example, the line " @@ -8622,18 +8773,18 @@ msgstr "" "Zeilen benötigen:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:441 +#: apt_preferences.5.xml:489 #, no-wrap msgid "Pin: release c=main\n" msgstr "Pin: release c=main\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:447 +#: apt_preferences.5.xml:495 msgid "the <literal>Origin:</literal> line" msgstr "die <literal>Origin:</literal>-Zeile" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:448 +#: apt_preferences.5.xml:496 msgid "" "names the originator of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@ -8645,18 +8796,18 @@ msgstr "" "in der APT-Einstellungsdatei anzugeben würde die folgende Zeile benötigen:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:454 +#: apt_preferences.5.xml:502 #, no-wrap msgid "Pin: release o=Debian\n" msgstr "Pin: release o=Debian\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:460 +#: apt_preferences.5.xml:508 msgid "the <literal>Label:</literal> line" msgstr "die <literal>Label:</literal>-Zeile" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:461 +#: apt_preferences.5.xml:509 msgid "" "names the label of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@ -8669,13 +8820,13 @@ msgstr "" "die folgende Zeile benötigen:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:467 +#: apt_preferences.5.xml:515 #, no-wrap msgid "Pin: release l=Debian\n" msgstr "Pin: release l=Debian\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:368 +#: apt_preferences.5.xml:416 msgid "" "The <filename>Release</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for " @@ -8698,7 +8849,7 @@ msgstr "" "APT-Prioritäten relevant: <placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:474 +#: apt_preferences.5.xml:522 msgid "" "All of the <filename>Packages</filename> and <filename>Release</filename> " "files retrieved from locations listed in the &sources-list; file are stored " @@ -8724,12 +8875,12 @@ msgstr "" "Distribution heruntergeladen wurde." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:487 +#: apt_preferences.5.xml:535 msgid "Optional Lines in an APT Preferences Record" msgstr "Optionale Zeilen in einem APT-Einstellungsdatensatz" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:489 +#: apt_preferences.5.xml:537 msgid "" "Each record in the APT preferences file can optionally begin with one or " "more lines beginning with the word <literal>Explanation:</literal>. This " @@ -8740,12 +8891,12 @@ msgstr "" "anfangen. Dieses stellt einen Platz für Kommentare bereit." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:498 +#: apt_preferences.5.xml:546 msgid "Tracking Stable" msgstr "Stable verfolgen" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:506 +#: apt_preferences.5.xml:554 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated\n" @@ -8769,7 +8920,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:500 +#: apt_preferences.5.xml:548 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -8784,8 +8935,8 @@ msgstr "" "Distributionen gehören. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:523 apt_preferences.5.xml:569 -#: apt_preferences.5.xml:627 +#: apt_preferences.5.xml:571 apt_preferences.5.xml:617 +#: apt_preferences.5.xml:675 #, no-wrap msgid "" "apt-get install <replaceable>package-name</replaceable>\n" @@ -8797,7 +8948,7 @@ msgstr "" "apt-get dist-upgrade\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:518 +#: apt_preferences.5.xml:566 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@ -8810,13 +8961,13 @@ msgstr "" "\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:535 +#: apt_preferences.5.xml:583 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/testing\n" msgstr "apt-get install <replaceable>Paket</replaceable>/testing\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:529 +#: apt_preferences.5.xml:577 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>testing</literal> distribution; the package " @@ -8830,12 +8981,12 @@ msgstr "" "\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:541 +#: apt_preferences.5.xml:589 msgid "Tracking Testing or Unstable" msgstr "Testing oder Unstable verfolgen" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:550 +#: apt_preferences.5.xml:598 #, no-wrap msgid "" "Package: *\n" @@ -8863,7 +9014,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:543 +#: apt_preferences.5.xml:591 msgid "" "The following APT preferences file will cause APT to assign a high priority " "to package versions from the <literal>testing</literal> distribution, a " @@ -8880,7 +9031,7 @@ msgstr "" "\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:564 +#: apt_preferences.5.xml:612 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@ -8893,13 +9044,13 @@ msgstr "" "\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:584 +#: apt_preferences.5.xml:632 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/unstable\n" msgstr "apt-get install <replaceable>Paket</replaceable>/unstable\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:575 +#: apt_preferences.5.xml:623 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>unstable</literal> distribution. " @@ -8919,12 +9070,12 @@ msgstr "" "\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:591 +#: apt_preferences.5.xml:639 msgid "Tracking the evolution of a codename release" msgstr "Die Entwicklung eines Codename-Releases verfolgen" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:605 +#: apt_preferences.5.xml:653 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated package versions\n" @@ -8959,7 +9110,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:593 +#: apt_preferences.5.xml:641 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -8985,7 +9136,7 @@ msgstr "" "benutzen. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:622 +#: apt_preferences.5.xml:670 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest version(s) in " @@ -8998,13 +9149,13 @@ msgstr "" "literal> durchzuführen. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:642 +#: apt_preferences.5.xml:690 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/sid\n" msgstr "apt-get install <replaceable>Paket</replaceable>/sid\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:633 +#: apt_preferences.5.xml:681 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>sid</literal> distribution. Thereafter, " @@ -9024,12 +9175,12 @@ msgstr "" "\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><variablelist> -#: apt_preferences.5.xml:651 +#: apt_preferences.5.xml:699 msgid "&file-preferences;" msgstr "&file-preferences;" #. type: Content of: <refentry><refsect1><para> -#: apt_preferences.5.xml:657 +#: apt_preferences.5.xml:705 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;" msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;" @@ -9087,14 +9238,6 @@ msgstr "sources.list.d" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:54 -#, fuzzy -#| msgid "" -#| "The <filename>/etc/apt/sources.list.d</filename> directory provides a way " -#| "to add sources.list entries in separate files. The format is the same as " -#| "for the regular <filename>sources.list</filename> file. File names need " -#| "to end with <filename>.list</filename> and may only contain letters (a-z " -#| "and A-Z), digits (0-9), underscore (_), hyphen (-) and period (.) " -#| "characters. Otherwise they will be silently ignored." msgid "" "The <filename>/etc/apt/sources.list.d</filename> directory provides a way to " "add sources.list entries in separate files. The format is the same as for " @@ -9110,8 +9253,10 @@ msgstr "" "Das Format ist das gleiche wie für die normale <filename>sources.list</" "filename>-Datei. Dateinamen müssen mit <filename>.list</filename> enden und " "können nur Buchstaben (a-z und A-Z), Ziffern (0-9), Unterstriche (_), " -"Bindestriche (-) und Punkte (.) enthalten. Ansonsten werden sie " -"stillschweigend ignoriert." +"Bindestriche (-) und Punkte (.) enthalten. Andernfalls wird APT einen " +"Hinweis ausgeben, dass es eine Datei ignoriert hat, falls die Datei nicht " +"auf ein Muster in der Konfigurationsliste <literal>Dir::Ignore-Files-" +"Silently</literal> passt – in diesem Fall wird sie stillschweigend ignoriert." #. type: Content of: <refentry><refsect1><title> #: sources.list.5.xml:65 @@ -9120,17 +9265,6 @@ msgstr "Die Typen deb und deb-src" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:66 -#, fuzzy -#| msgid "" -#| "The <literal>deb</literal> type describes a typical two-level Debian " -#| "archive, <filename>distribution/component</filename>. Typically, " -#| "<literal>distribution</literal> is generally one of <literal>stable</" -#| "literal> <literal>unstable</literal> or <literal>testing</literal> while " -#| "component is one of <literal>main</literal> <literal>contrib</literal> " -#| "<literal>non-free</literal> or <literal>non-us</literal>. The " -#| "<literal>deb-src</literal> type describes a debian distribution's source " -#| "code in the same form as the <literal>deb</literal> type. A <literal>deb-" -#| "src</literal> line is required to fetch source indexes." msgid "" "The <literal>deb</literal> type describes a typical two-level Debian " "archive, <filename>distribution/component</filename>. Typically, " @@ -9145,14 +9279,14 @@ msgid "" msgstr "" "Der <literal>deb</literal>-Typ beschreibt ein typisches zweistufiges Debian-" "Archiv, <filename>Distribution/Komponente</filename>. <literal>Distribution</" -"literal> ist typischerweise entweder <literal>stable</literal>, " -"<literal>unstable</literal> oder <literal>testing</literal>, während " -"Komponente entweder <literal>main</literal>, <literal>contrib</literal>, " -"<literal>non-free</literal> oder <literal>non-us</literal> ist. Der " -"<literal>deb-src</literal>-Typ beschreibt einen Quellcode einer Debian-" -"Distribution in der gleichen Form wie den <literal>deb</literal>-Typ. Eine " -"<literal>deb-src</literal>-Zeile wird benötigt, um Quellindizes " -"herunterzuladen." +"literal> ist typischerweise ein Archivname wie <literal>stable</literal> " +"oder <literal>testing</literal> oder ein Kodename wie <literal>&stable-" +"codename;</literal> oder <literal>&testing-codename;</literal> während " +"Komponente entweder <literal>main</literal>, <literal>contrib</literal> oder " +"<literal>non-free</literal> ist. Der <literal>deb-src</literal>-Typ " +"beschreibt den Quellcode einer Debian-Distribution in der gleichen Form wie " +"den <literal>deb</literal>-Typ. Eine <literal>deb-src</literal>-Zeile wird " +"benötigt, um Quellindizes herunterzuladen." #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:78 @@ -9505,22 +9639,12 @@ msgstr "deb ftp://ftp.debian.org/debian unstable contrib" #. type: Content of: <refentry><refsect1><para><literallayout> #: sources.list.5.xml:230 -#, fuzzy, no-wrap -#| msgid "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/" +#, no-wrap msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/" -msgstr "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/" +msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:223 -#, fuzzy -#| msgid "" -#| "Uses HTTP to access the archive at nonus.debian.org, under the debian-non-" -#| "US directory, and uses only files found under <filename>unstable/binary-" -#| "i386</filename> on i386 machines, <filename>unstable/binary-m68k</" -#| "filename> on m68k, and so forth for other supported architectures. [Note " -#| "this example only illustrates how to use the substitution variable; non-" -#| "us is no longer structured like this] <placeholder type=\"literallayout\" " -#| "id=\"0\"/>" msgid "" "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe " "directory, and uses only files found under <filename>unstable/binary-i386</" @@ -9530,14 +9654,14 @@ msgid "" "archives are not structured like this] <placeholder type=\"literallayout\" " "id=\"0\"/>" msgstr "" -"Benutzt HTTP, um auf das Archiv auf nonus.debian.org unter dem debian-non-US-" +"Benutzt HTTP, um auf das Archiv auf ftp.tlh.debian.org unter dem universe-" "Verzeichnis zuzugreifen und benutzt nur Dateien, die unter " "<filename>unstable/binary-i386</filename> auf i386-Maschinen, " -"<filename>unstable/binary-m68k</filename> auf m68k und so weiter für andere " -"unterstützte Architekturen, gefunden werden. [Beachten Sie, dass dieses " -"Beispiel nur anschaulich macht, wie die Platzhaltervariable benutzt wird. " -"»non-us« ist nicht länger so strukturiert] <placeholder type=\"literallayout" -"\" id=\"0\"/>" +"<filename>unstable/binary-amd64</filename> auf amd64 und so weiter für " +"andere unterstützte Architekturen, gefunden werden. [Beachten Sie, dass " +"dieses Beispiel nur anschaulich macht, wie die Platzhaltervariable benutzt " +"wird. Offizielle Debian-Archive sind nicht so strukturiert.] <placeholder " +"type=\"literallayout\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:235 @@ -11097,6 +11221,43 @@ msgstr " # apt-get -o dir::cache::archives=\"/Platte/\" dist-upgrade" msgid "Which will use the already fetched archives on the disc." msgstr "Es wird die bereits auf die Platte heruntergeladenen Archive benutzen." +#~ msgid "<option>--md5</option>" +#~ msgstr "<option>--md5</option>" + +#~ msgid "" +#~ "Generate MD5 sums. This defaults to on, when turned off the generated " +#~ "index files will not have MD5Sum fields where possible. Configuration " +#~ "Item: <literal>APT::FTPArchive::MD5</literal>" +#~ msgstr "" +#~ "Generiert MD5-Summen. Dies ist standardmäßig an, wenn es ausgeschaltet " +#~ "ist, haben die generierten Indexdateien keine MD5Sum-Felder, sofern dies " +#~ "möglich ist. Konfigurationselement: <literal>APT::FTPArchive::MD5</" +#~ "literal>" + +#~ msgid "unmarkauto" +#~ msgstr "unmarkauto" + +#~ msgid "<option>-h</option>" +#~ msgstr "<option>-h</option>" + +#~ msgid "<option>--help</option>" +#~ msgstr "<option>--help</option>" + +#~ msgid "Show a short usage summary." +#~ msgstr "Eine kurze Zusammenfassung anzeigen." + +#~ msgid "<option>-v</option>" +#~ msgstr "<option>-v</option>" + +#~ msgid "<option>--version</option>" +#~ msgstr "<option>--version</option>" + +#~ msgid "Show the program version." +#~ msgstr "Die Programmversion anzeigen." + +#~ msgid "to the version that is already installed (if any)." +#~ msgstr "zu der Version, die bereits installiert ist (wenn vorhanden)." + #~ msgid "APT package handling utility -- cache manipulator" #~ msgstr "" #~ "APT-Werkzeug zur Handhabung von Paketen -- Zwischenspeichermanipulierer" @@ -11157,8 +11318,12 @@ msgstr "Es wird die bereits auf die Platte heruntergeladenen Archive benutzen." #~ "Benutzt HTTP, um auf das Archiv auf nonus.debian.org unter dem debian-non-" #~ "US-Verzeichnis zuzugreifen." -#~ msgid "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free" -#~ msgstr "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free" +#~ msgid "" +#~ "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-" +#~ "free" +#~ msgstr "" +#~ "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-" +#~ "free" #~ msgid "OPTIONS" #~ msgstr "OPTIONEN" diff --git a/doc/po/es.po b/doc/po/es.po index 63e0e8a6e..635133ed3 100644 --- a/doc/po/es.po +++ b/doc/po/es.po @@ -36,7 +36,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.25\n" -"POT-Creation-Date: 2011-02-14 13:42+0100\n" +"POT-Creation-Date: 2011-06-08 16:54+0300\n" "PO-Revision-Date: 2010-08-25 03:25+0200\n" "Last-Translator: Omar Campagne <ocampagne@gmail.com>\n" "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n" @@ -810,7 +810,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50 #: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:114 -#: apt-key.8.xml:38 apt-mark.8.xml:55 apt-secure.8.xml:43 +#: apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43 #: apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36 #: sources.list.5.xml:36 msgid "Description" @@ -1327,7 +1327,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59 -#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:92 +#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:126 #: apt-sortpkgs.1.xml:57 apt.conf.5.xml:560 apt.conf.5.xml:582 msgid "options" msgstr "Opciones" @@ -1354,7 +1354,7 @@ msgstr "" "configuración: <literal>Dir::Cache::pkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:288 apt-ftparchive.1.xml:568 apt-get.8.xml:393 +#: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393 #: apt-sortpkgs.1.xml:61 msgid "<option>-s</option>" msgstr "<option>-s</option>" @@ -1380,12 +1380,12 @@ msgstr "" "Opción de configuración: <literal>Dir::Cache::srcpkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:296 apt-ftparchive.1.xml:542 apt-get.8.xml:383 +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 msgid "<option>-q</option>" msgstr "<option>-q</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:296 apt-ftparchive.1.xml:542 apt-get.8.xml:383 +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 msgid "<option>--quiet</option>" msgstr "<option>--quiet</option>" @@ -1500,7 +1500,7 @@ msgstr "" "Opción de configuración: <literal>APT::Cache::ShowFull</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:580 +#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583 msgid "<option>-a</option>" msgstr "<option>-a</option>" @@ -1617,14 +1617,14 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist> #: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101 -#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608 apt-get.8.xml:570 -#: apt-sortpkgs.1.xml:67 +#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570 +#: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67 msgid "&apt-commonoptions;" msgstr "&apt-commonoptions;" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:156 apt-mark.8.xml:125 -#: apt.conf.5.xml:1093 apt_preferences.5.xml:649 +#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:172 apt-mark.8.xml:144 +#: apt.conf.5.xml:1093 apt_preferences.5.xml:697 msgid "Files" msgstr "Ficheros" @@ -1635,9 +1635,9 @@ msgstr "&file-sourceslist; &file-statelists;" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106 -#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:624 apt-get.8.xml:585 -#: apt-key.8.xml:177 apt-mark.8.xml:131 apt-secure.8.xml:185 -#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:656 +#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585 +#: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185 +#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704 #: sources.list.5.xml:234 msgid "See Also" msgstr "Véase también" @@ -1649,8 +1649,8 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111 -#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:628 apt-get.8.xml:591 -#: apt-mark.8.xml:135 apt-sortpkgs.1.xml:76 +#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591 +#: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76 msgid "Diagnostics" msgstr "Diagnósticos" @@ -1779,12 +1779,12 @@ msgstr "" "option>. <placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><title> -#: apt-cdrom.8.xml:94 apt-key.8.xml:142 +#: apt-cdrom.8.xml:94 apt-key.8.xml:158 msgid "Options" msgstr "Opciones" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:536 apt-get.8.xml:345 +#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345 msgid "<option>-d</option>" msgstr "<option>-d</option>" @@ -2041,7 +2041,7 @@ msgid "Just show the contents of the configuration space." msgstr "Sólo muestra el contenido del espacio de configuración." #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:625 +#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628 #: apt-sortpkgs.1.xml:73 msgid "&apt-conf;" msgstr "&apt-conf;" @@ -3192,28 +3192,49 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-ftparchive.1.xml:529 -msgid "<option>--md5</option>" -msgstr "<option>--md5</option>" +msgid "" +"<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>" +msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:531 -msgid "" -"Generate MD5 sums. This defaults to on, when turned off the generated index " -"files will not have MD5Sum fields where possible. Configuration Item: " -"<literal>APT::FTPArchive::MD5</literal>" +#, fuzzy +#| msgid "" +#| "Values for the additional metadata fields in the Release file are taken " +#| "from the corresponding variables under <literal>APT::FTPArchive::Release</" +#| "literal>, e.g. <literal>APT::FTPArchive::Release::Origin</literal>. The " +#| "supported fields are: <literal>Origin</literal>, <literal>Label</" +#| "literal>, <literal>Suite</literal>, <literal>Version</literal>, " +#| "<literal>Codename</literal>, <literal>Date</literal>, <literal>Valid-" +#| "Until</literal>, <literal>Architectures</literal>, <literal>Components</" +#| "literal>, <literal>Description</literal>." +msgid "" +"Generate the given checksum. These options default to on, when turned off " +"the generated index files will not have the checksum fields where possible. " +"Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</" +"replaceable></literal> and <literal>APT::FTPArchive::<replaceable>Index</" +"replaceable>::<replaceable>Checksum</replaceable></literal> where " +"<literal>Index</literal> can be <literal>Packages</literal>, " +"<literal>Sources</literal> or <literal>Release</literal> and " +"<literal>Checksum</literal> can be <literal>MD5</literal>, <literal>SHA1</" +"literal> or <literal>SHA256</literal>." msgstr "" -"Genera una suma de control MD5. Está activado de forma predeterminada, " -"cuando se desactiva los ficheros de índices generados no tendrán los campos " -"MD5Sum cuando sea posible. Opción de configuración: <literal>APT::" -"FTPArchive::MD5</literal>" +"Los valores para los campos de metadatos adicionales en el fichero «Release» " +"se toman de las variables correspondientes en <literal>APT::FTPArchive::" +"Release</literal>, por ejemplo <literal>APT::FTPArchive::Release::Origin</" +"literal>. Los campos permitidos son: <literal>Origin</literal>, " +"<literal>Label</literal>, <literal>Suite</literal>, <literal>Version</" +"literal>, <literal>Codename</literal>, <literal>Date</literal>, " +"<literal>Valid-Until</literal>, <literal>Architectures</literal>, " +"<literal>Components</literal> y <literal>Description</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:536 +#: apt-ftparchive.1.xml:539 msgid "<option>--db</option>" msgstr "<option>--db</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:538 +#: apt-ftparchive.1.xml:541 msgid "" "Use a binary caching DB. This has no effect on the generate command. " "Configuration Item: <literal>APT::FTPArchive::DB</literal>." @@ -3222,7 +3243,7 @@ msgstr "" "«generate». Opción de configuración: <literal>APT::FTPArchive::DB</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:544 +#: apt-ftparchive.1.xml:547 msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quiet up to a maximum of 2. You can also use " @@ -3236,12 +3257,12 @@ msgstr "" "configuración. Opción de configuración: <literal>quiet</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:550 +#: apt-ftparchive.1.xml:553 msgid "<option>--delink</option>" msgstr "<option>--delink</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:552 +#: apt-ftparchive.1.xml:555 msgid "" "Perform Delinking. If the <literal>External-Links</literal> setting is used " "then this option actually enables delinking of the files. It defaults to on " @@ -3254,12 +3275,12 @@ msgstr "" "Opción de configuración: <literal>APT::FTPArchive::DeLinkAct</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:558 +#: apt-ftparchive.1.xml:561 msgid "<option>--contents</option>" msgstr "<option>--contents</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:560 +#: apt-ftparchive.1.xml:563 msgid "" "Perform contents generation. When this option is set and package indexes are " "being generated with a cache DB then the file listing will also be extracted " @@ -3276,12 +3297,12 @@ msgstr "" "Contents</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:568 +#: apt-ftparchive.1.xml:571 msgid "<option>--source-override</option>" msgstr "<option>--source-override</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:570 +#: apt-ftparchive.1.xml:573 msgid "" "Select the source override file to use with the <literal>sources</literal> " "command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</" @@ -3292,12 +3313,12 @@ msgstr "" "FTPArchive::SourceOverride</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:574 +#: apt-ftparchive.1.xml:577 msgid "<option>--readonly</option>" msgstr "<option>--readonly</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:576 +#: apt-ftparchive.1.xml:579 msgid "" "Make the caching databases read only. Configuration Item: <literal>APT::" "FTPArchive::ReadOnlyDB</literal>." @@ -3306,12 +3327,12 @@ msgstr "" "Opción de configuración: <literal>APT::FTPArchive::ReadOnlyDB</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:580 +#: apt-ftparchive.1.xml:583 msgid "<option>--arch</option>" msgstr "<option>--arch</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:581 +#: apt-ftparchive.1.xml:584 msgid "" "Accept in the <literal>packages</literal> and <literal>contents</literal> " "commands only package files matching <literal>*_arch.deb</literal> or " @@ -3325,12 +3346,12 @@ msgstr "" "FTPArchive::Architecture</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:587 +#: apt-ftparchive.1.xml:590 msgid "<option>APT::FTPArchive::AlwaysStat</option>" msgstr "<option>APT::FTPArchive::AlwaysStat</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:589 +#: apt-ftparchive.1.xml:592 msgid "" "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If " "packages are recompiled and/or republished with the same version again, this " @@ -3354,12 +3375,12 @@ msgstr "" "comprobaciones adicionales son innecesarias." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:599 +#: apt-ftparchive.1.xml:602 msgid "<option>APT::FTPArchive::LongDescription</option>" msgstr "<option>APT::FTPArchive::LongDescription</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:601 +#: apt-ftparchive.1.xml:604 msgid "" "This configuration option defaults to \"<literal>true</literal>\" and should " "only be set to <literal>\"false\"</literal> if the Archive generated with " @@ -3375,19 +3396,19 @@ msgstr "" "con la orden «generate»." #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:613 apt.conf.5.xml:1087 apt_preferences.5.xml:496 +#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:544 #: sources.list.5.xml:198 msgid "Examples" msgstr "Ejemplos" #. type: Content of: <refentry><refsect1><para><programlisting> -#: apt-ftparchive.1.xml:619 +#: apt-ftparchive.1.xml:622 #, no-wrap msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" msgstr "<command>apt-ftparchive</command> packages <replaceable>directorio</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:615 +#: apt-ftparchive.1.xml:618 msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" @@ -3396,7 +3417,7 @@ msgstr "" "paquetes binarios («.deb»): <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:629 +#: apt-ftparchive.1.xml:632 msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@ -4750,8 +4771,24 @@ msgstr "" "Actualiza el registro de claves local con el registro de claves del archivo " "Debian, y elimina del registro las claves del archivo que ya no son válidas." +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:140 +#, fuzzy +#| msgid "update" +msgid "net-update" +msgstr "update" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:144 +msgid "" +"Update the local keyring with the keys of a key server and removes from the " +"keyring the archive keys which are no longer valid. This requires an " +"installed wget and an APT build configured to have a server to fetch from. " +"APT in Debian does not support this command, but Ubuntu's APT does." +msgstr "" + #. type: Content of: <refentry><refsect1><para> -#: apt-key.8.xml:143 +#: apt-key.8.xml:159 msgid "" "Note that options need to be defined before the commands described in the " "previous section." @@ -4760,12 +4797,12 @@ msgstr "" "descritas en el sección anterior." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:145 +#: apt-key.8.xml:161 msgid "--keyring <replaceable>filename</replaceable>" msgstr "--keyring <replaceable>nombre-de-fichero</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:146 +#: apt-key.8.xml:162 msgid "" "With this option it is possible to specify a specific keyring file the " "command should operate on. The default is that a command is executed on the " @@ -4782,53 +4819,57 @@ msgstr "" "esto es, por ejemplo, que las claves nuevas se añaden a este fichero." #. type: Content of: <refentry><refsect1><variablelist> -#: apt-key.8.xml:159 +#: apt-key.8.xml:175 msgid "&file-trustedgpg;" msgstr "&file-trustedgpg;" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:161 +#: apt-key.8.xml:177 msgid "<filename>/etc/apt/trustdb.gpg</filename>" msgstr "<filename>/etc/apt/trustdb.gpg</filename>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:162 +#: apt-key.8.xml:178 msgid "Local trust database of archive keys." 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:165 +#: apt-key.8.xml:181 msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:166 +#: apt-key.8.xml:182 msgid "Keyring of Debian archive trusted keys." msgstr "Registro de las claves de confianza del archivo de Debian." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:169 +#: apt-key.8.xml:185 msgid "" "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" msgstr "" "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:170 +#: apt-key.8.xml:186 msgid "Keyring of Debian archive removed trusted keys." msgstr "Registro de las claves de confianza eliminadas del archivo de Debian." #. type: Content of: <refentry><refsect1><para> -#: apt-key.8.xml:179 +#: apt-key.8.xml:195 msgid "&apt-get;, &apt-secure;" msgstr "&apt-get;, &apt-secure;" #. The last update date #. type: Content of: <refentry><refentryinfo> #: apt-mark.8.xml:16 +#, fuzzy +#| msgid "" +#| "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 " +#| "August 2009</date>" msgid "" -"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 " -"August 2009</date>" +"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>21 " +"April 2011</date>" msgstr "" "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 de " "Agosto de 2009</date>" @@ -4845,13 +4886,22 @@ msgstr "Marca o desmarca un paquete como instalado automáticamente" #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> #: apt-mark.8.xml:39 +#, fuzzy +#| msgid "" +#| " <command>apt-mark</command> <arg><option>-hv</option></arg> " +#| "<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> <group " +#| "choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg " +#| "choice=\"plain\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </" +#| "group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>package</" +#| "replaceable></arg> </arg> <arg choice=\"plain\">showauto</arg> </group>" msgid "" " <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-" "f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain" "\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain" -"\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </group> <arg " +"\">auto</arg> <arg choice=\"plain\">manual</arg> <arg choice=\"plain" +"\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </group> <arg " "choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </" -"arg> <arg choice=\"plain\">showauto</arg> </group>" +"arg> </group>" msgstr "" " <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-" "f=<replaceable>nombre-de-fichero</replaceable></option></arg> <group choice=" @@ -4861,7 +4911,7 @@ msgstr "" "arg> <arg choice=\"plain\">showauto</arg> </group>" #. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:56 +#: apt-mark.8.xml:57 msgid "" "<command>apt-mark</command> will change whether a package has been marked as " "being automatically installed." @@ -4870,7 +4920,7 @@ msgstr "" "o no." #. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:60 +#: apt-mark.8.xml:61 msgid "" "When you request that a package is installed, and as a result other packages " "are installed to satisfy its dependencies, the dependencies are marked as " @@ -4886,14 +4936,21 @@ msgstr "" "eliminará." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:68 -msgid "markauto" +#: apt-mark.8.xml:69 +#, fuzzy +#| msgid "markauto" +msgid "auto" msgstr "markauto" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:69 +#: apt-mark.8.xml:70 +#, fuzzy +#| msgid "" +#| "<literal>markauto</literal> is used to mark a package as being " +#| "automatically installed, which will cause the package to be removed when " +#| "no more manually installed packages depend on this package." msgid "" -"<literal>markauto</literal> is used to mark a package as being automatically " +"<literal>auto</literal> is used to mark a package as being automatically " "installed, which will cause the package to be removed when no more manually " "installed packages depend on this package." msgstr "" @@ -4902,14 +4959,19 @@ msgstr "" "paquete instalado manualmente dependa de este paquete." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:76 -msgid "unmarkauto" -msgstr "unmarkauto" +#: apt-mark.8.xml:77 +msgid "manual" +msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:77 +#: apt-mark.8.xml:78 +#, fuzzy +#| msgid "" +#| "<literal>unmarkauto</literal> is used to mark a package as being manually " +#| "installed, which will prevent the package from being automatically " +#| "removed if no other packages depend on it." msgid "" -"<literal>unmarkauto</literal> is used to mark a package as being manually " +"<literal>manual</literal> is used to mark a package as being manually " "installed, which will prevent the package from being automatically removed " "if no other packages depend on it." msgstr "" @@ -4918,21 +4980,95 @@ msgstr "" "ningún otro depende de él." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:84 +#: apt-mark.8.xml:85 +msgid "hold" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:86 +msgid "" +"<literal>hold</literal> is used to mark a package as hold back, which will " +"prevent the package from being automatically installed, upgraded or " +"removed. The command is only a wrapper around <command>dpkg --set-" +"selections</command> and the state is therefore maintained by &dpkg; and not " +"effected by the <option>--filename</option> option." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:95 +msgid "unhold" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:96 +#, fuzzy +#| msgid "" +#| "<literal>showauto</literal> is used to print a list of automatically " +#| "installed packages with each package on a new line." +msgid "" +"<literal>unhold</literal> is used to cancel a previously set hold on a " +"package to allow all actions again." +msgstr "" +"<literal>showauto</literal> se usa para mostrar una lista de paquetes " +"instalados automáticamente, un paquete por línea." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:101 msgid "showauto" msgstr "showauto" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:85 +#: apt-mark.8.xml:102 +#, fuzzy +#| msgid "" +#| "<literal>showauto</literal> is used to print a list of automatically " +#| "installed packages with each package on a new line." msgid "" "<literal>showauto</literal> is used to print a list of automatically " -"installed packages with each package on a new line." +"installed packages with each package on a new line. All automatically " +"installed packages will be listed if no package is given. If packages are " +"given only those which are automatically installed will be shown." msgstr "" "<literal>showauto</literal> se usa para mostrar una lista de paquetes " "instalados automáticamente, un paquete por línea." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:96 +#: apt-mark.8.xml:109 +#, fuzzy +#| msgid "showauto" +msgid "showmanual" +msgstr "showauto" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:110 +msgid "" +"<literal>showmanual</literal> can be used in the same way as " +"<literal>showauto</literal> except that it will print a list of manually " +"installed packages instead." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:116 +#, fuzzy +#| msgid "showauto" +msgid "showhold" +msgstr "showauto" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:117 +#, fuzzy +#| msgid "" +#| "<literal>showauto</literal> is used to print a list of automatically " +#| "installed packages with each package on a new line." +msgid "" +"<literal>showhold</literal> is used to print a list of packages on hold in " +"the same way as for the other show commands." +msgstr "" +"<literal>showauto</literal> se usa para mostrar una lista de paquetes " +"instalados automáticamente, un paquete por línea." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:130 msgid "" "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>" msgstr "" @@ -4940,7 +5076,7 @@ msgstr "" "filename></option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:97 +#: apt-mark.8.xml:131 msgid "" "<option>--file=<filename><replaceable>FILENAME</replaceable></filename></" "option>" @@ -4949,7 +5085,7 @@ msgstr "" "filename></option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:100 +#: apt-mark.8.xml:134 msgid "" "Read/Write package stats from <filename><replaceable>FILENAME</replaceable></" "filename> instead of the default location, which is " @@ -4962,48 +5098,18 @@ msgstr "" "en el directorio definido en la opción de configuración: <literal>Dir::" "State</literal>." -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:106 -msgid "<option>-h</option>" -msgstr "<option>-h</option>" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:107 -msgid "<option>--help</option>" -msgstr "<option>--help</option>" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:108 -msgid "Show a short usage summary." -msgstr "Muestra un breve resumen de uso." - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:114 -msgid "<option>-v</option>" -msgstr "<option>-v</option>" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:115 -msgid "<option>--version</option>" -msgstr "<option>--version</option>" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:116 -msgid "Show the program version." -msgstr "Muestra la versión del programa." - #. type: Content of: <refentry><refsect1><variablelist> -#: apt-mark.8.xml:127 +#: apt-mark.8.xml:146 msgid " &file-extended_states;" msgstr " &file-extended_states;" #. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:132 +#: apt-mark.8.xml:151 msgid "&apt-get;,&aptitude;,&apt-conf;" msgstr "&apt-get;,&aptitude;,&apt-conf;" #. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:136 +#: apt-mark.8.xml:155 msgid "" "<command>apt-mark</command> returns zero on normal operation, non-zero on " "error." @@ -7892,32 +7998,50 @@ msgstr "priority 1" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #: apt_preferences.5.xml:107 +#, fuzzy +#| msgid "" +#| "to the versions coming from archives which in their <filename>Release</" +#| "filename> files are marked as \"NotAutomatic: yes\" like the debian " +#| "experimental archive." msgid "" "to the versions coming from archives which in their <filename>Release</" -"filename> files are marked as \"NotAutomatic: yes\" like the debian " -"experimental archive." +"filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</" +"emphasis> as \"ButAutomaticUpgrades: yes\" like the debian " +"<literal>experimental</literal> archive." msgstr "" "para las versiones procedentes de archivos que en sus ficheros " "<filename>Release</filename> están marcados como «NotAutomatic:yes», como en " "el archivo «experimental» de Debian." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:112 +#: apt_preferences.5.xml:113 msgid "priority 100" msgstr "prioridad 100" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:113 -msgid "to the version that is already installed (if any)." -msgstr "a la versión instalada (de existir)." +#: apt_preferences.5.xml:114 +#, fuzzy +#| msgid "" +#| "to the versions coming from archives which in their <filename>Release</" +#| "filename> files are marked as \"NotAutomatic: yes\" like the debian " +#| "experimental archive." +msgid "" +"to the version that is already installed (if any) and to the versions coming " +"from archives which in their <filename>Release</filename> files are marked " +"as \"NotAutomatic: yes\" and \"ButAutomaticUpgrades: yes\" like the debian " +"backports archive since <literal>squeeze-backports</literal>." +msgstr "" +"para las versiones procedentes de archivos que en sus ficheros " +"<filename>Release</filename> están marcados como «NotAutomatic:yes», como en " +"el archivo «experimental» de Debian." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:117 +#: apt_preferences.5.xml:121 msgid "priority 500" msgstr "prioridad 500" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:118 +#: apt_preferences.5.xml:122 msgid "" "to the versions that are not installed and do not belong to the target " "release." @@ -7926,12 +8050,12 @@ msgstr "" "objetivo." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:122 +#: apt_preferences.5.xml:126 msgid "priority 990" msgstr "prioridad 990" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:123 +#: apt_preferences.5.xml:127 msgid "" "to the versions that are not installed and belong to the target release." msgstr "" @@ -7950,13 +8074,21 @@ msgstr "" "Asignar: <placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:128 +#: apt_preferences.5.xml:132 +#, fuzzy +#| msgid "" +#| "If the target release has not been specified then APT simply assigns " +#| "priority 100 to all installed package versions and priority 500 to all " +#| "uninstalled package versions, expect versions coming from archives which " +#| "in their <filename>Release</filename> files are marked as \"NotAutomatic: " +#| "yes\" - these versions get the priority 1." msgid "" "If the target release has not been specified then APT simply assigns " "priority 100 to all installed package versions and priority 500 to all " -"uninstalled package versions, expect versions coming from archives which in " +"uninstalled package versions, except versions coming from archives which in " "their <filename>Release</filename> files are marked as \"NotAutomatic: yes\" " -"- these versions get the priority 1." +"- these versions get the priority 1 or priority 100 if it is additionally " +"marked as \"ButAutomaticUpgrades: yes\"." msgstr "" "Si no se especifica ninguna distribución objetivo APT asigna prioridad 100 a " "todas las versiones de los paquetes instalados y 500 a las versiones no " @@ -7965,7 +8097,7 @@ msgstr "" "- estas versiones reciben la prioridad 1." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:134 +#: apt_preferences.5.xml:139 msgid "" "APT then applies the following rules, listed in order of precedence, to " "determine which version of a package to install." @@ -7974,7 +8106,7 @@ msgstr "" "determinar qué versión del paquete debe instalar." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:137 +#: apt_preferences.5.xml:142 msgid "" "Never downgrade unless the priority of an available version exceeds 1000. " "(\"Downgrading\" is installing a less recent version of a package in place " @@ -7991,12 +8123,12 @@ msgstr "" "ser peligroso)." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:143 +#: apt_preferences.5.xml:148 msgid "Install the highest priority version." msgstr "Instala la versión de mayor prioridad." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:144 +#: apt_preferences.5.xml:149 msgid "" "If two or more versions have the same priority, install the most recent one " "(that is, the one with the higher version number)." @@ -8005,7 +8137,7 @@ msgstr "" "(esto es, la que tiene un número de versión mayor)." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:147 +#: apt_preferences.5.xml:152 msgid "" "If two or more versions have the same priority and version number but either " "the packages differ in some of their metadata or the <literal>--reinstall</" @@ -8016,7 +8148,7 @@ msgstr "" "<literal>--reinstall</literal>, se instalará la que no está instalada." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:153 +#: apt_preferences.5.xml:158 msgid "" "In a typical situation, the installed version of a package (priority 100) " "is not as recent as one of the versions available from the sources listed in " @@ -8031,7 +8163,7 @@ msgstr "" "command> o <command>apt-get upgrade</command>." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:160 +#: apt_preferences.5.xml:165 msgid "" "More rarely, the installed version of a package is <emphasis>more</emphasis> " "recent than any of the other available versions. The package will not be " @@ -8045,7 +8177,7 @@ msgstr "" "upgrade</command>." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:165 +#: apt_preferences.5.xml:170 msgid "" "Sometimes the installed version of a package is more recent than the version " "belonging to the target release, but not as recent as a version belonging to " @@ -8064,12 +8196,12 @@ msgstr "" "versión instalada." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:174 +#: apt_preferences.5.xml:179 msgid "The Effect of APT Preferences" msgstr "El efecto de las preferencias sobre APT" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:176 +#: apt_preferences.5.xml:181 msgid "" "The APT preferences file allows the system administrator to control the " "assignment of priorities. The file consists of one or more multi-line " @@ -8082,7 +8214,7 @@ msgstr "" "registros pueden tener una de estos dos formatos: el específico o el general." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:182 +#: apt_preferences.5.xml:187 msgid "" "The specific form assigns a priority (a \"Pin-Priority\") to one or more " "specified packages and specified version or version range. For example, the " @@ -8098,7 +8230,7 @@ msgstr "" "separados por espacios." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:189 +#: apt_preferences.5.xml:194 #, no-wrap msgid "" "Package: perl\n" @@ -8110,7 +8242,7 @@ msgstr "" "Pin-Priority: 1001\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:195 +#: apt_preferences.5.xml:200 msgid "" "The general form assigns a priority to all of the package versions in a " "given distribution (that is, to all the versions of packages that are listed " @@ -8125,7 +8257,7 @@ msgstr "" "identificado por su nombre de dominio." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:201 +#: apt_preferences.5.xml:206 msgid "" "This general-form entry in the APT preferences file applies only to groups " "of packages. For example, the following record assigns a high priority to " @@ -8136,7 +8268,7 @@ msgstr "" "prioridad alta a todas las versiones disponibles desde un sitio local." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:206 +#: apt_preferences.5.xml:211 #, no-wrap msgid "" "Package: *\n" @@ -8148,7 +8280,7 @@ msgstr "" "Pin-Priority: 999\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:211 +#: apt_preferences.5.xml:216 msgid "" "A note of caution: the keyword used here is \"<literal>origin</literal>\" " "which can be used to match a hostname. The following record will assign a " @@ -8162,7 +8294,7 @@ msgstr "" "debian.org»." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:215 +#: apt_preferences.5.xml:220 #, no-wrap msgid "" "Package: *\n" @@ -8174,7 +8306,7 @@ msgstr "" "Pin-Priority: 999\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:219 +#: apt_preferences.5.xml:224 msgid "" "This should <emphasis>not</emphasis> be confused with the Origin of a " "distribution as specified in a <filename>Release</filename> file. What " @@ -8189,7 +8321,7 @@ msgstr "" "sino el autor o el nombre del proveedor, tales como «Debian» o «Ximian»." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:224 +#: apt_preferences.5.xml:229 msgid "" "The following record assigns a low priority to all package versions " "belonging to any distribution whose Archive name is \"<literal>unstable</" @@ -8200,7 +8332,7 @@ msgstr "" "archivo de paquetes «<literal>unstable</literal>» (inestable)." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:228 +#: apt_preferences.5.xml:233 #, no-wrap msgid "" "Package: *\n" @@ -8212,7 +8344,7 @@ msgstr "" "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:233 +#: apt_preferences.5.xml:238 msgid "" "The following record assigns a high priority to all package versions " "belonging to any distribution whose Codename is \"<literal>&testing-codename;" @@ -8223,7 +8355,7 @@ msgstr "" "«<literal>&testing-codename;</literal>»." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:237 +#: apt_preferences.5.xml:242 #, no-wrap msgid "" "Package: *\n" @@ -8235,7 +8367,7 @@ msgstr "" "Pin-Priority: 900\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:242 +#: apt_preferences.5.xml:247 msgid "" "The following record assigns a high priority to all package versions " "belonging to any release whose Archive name is \"<literal>stable</literal>\" " @@ -8247,7 +8379,7 @@ msgstr "" "«<literal>3.0</literal>»." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:247 +#: apt_preferences.5.xml:252 #, no-wrap msgid "" "Package: *\n" @@ -8259,17 +8391,84 @@ msgstr "" "Pin-Priority: 500\n" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:258 +#: apt_preferences.5.xml:262 +msgid "Regular expressions and glob() syntax" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:264 +msgid "" +"APT also supports pinning by glob() expressions and regular expressions " +"surrounded by /. For example, the following example assigns the priority 500 " +"to all packages from experimental where the name starts with gnome (as a glob" +"()-like expression or contains the word kde (as a POSIX extended regular " +"expression surrounded by slashes)." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><programlisting> +#: apt_preferences.5.xml:273 +#, fuzzy, no-wrap +#| msgid "" +#| "Package: *\n" +#| "Pin: release a=unstable\n" +#| "Pin-Priority: 50\n" +msgid "" +"Package: gnome* /kde/\n" +"Pin: release n=experimental\n" +"Pin-Priority: 500\n" +msgstr "" +"Package: *\n" +"Pin: release a=unstable\n" +"Pin-Priority: 50\n" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:279 +msgid "" +"The rule for those expressions is that they can occur anywhere where a " +"string can occur. Those, the following pin assigns the priority 990 to all " +"packages from a release starting with karmic." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><programlisting> +#: apt_preferences.5.xml:285 +#, fuzzy, no-wrap +#| msgid "" +#| "Package: *\n" +#| "Pin: release a=unstable\n" +#| "Pin-Priority: 50\n" +msgid "" +"Package: *\n" +"Pin: release n=karmic*\n" +"Pin-Priority: 990\n" +msgstr "" +"Package: *\n" +"Pin: release a=unstable\n" +"Pin-Priority: 50\n" + +#. type: Content of: <refentry><refsect1><refsect2><literal> +#: apt_preferences.5.xml:290 +#, fuzzy +#| msgid "Packages" +msgid "Package" +msgstr "Packages" + +#. type: Content of: <refentry><refsect1><refsect2><literal> +#: apt_preferences.5.xml:296 +msgid "*" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt_preferences.5.xml:306 msgid "How APT Interprets Priorities" msgstr "¿Cómo interpreta APT las prioridades?" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:266 +#: apt_preferences.5.xml:314 msgid "P > 1000" msgstr "P > 1000" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:267 +#: apt_preferences.5.xml:315 msgid "" "causes a version to be installed even if this constitutes a downgrade of the " "package" @@ -8278,12 +8477,12 @@ msgstr "" "el sistema." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:271 +#: apt_preferences.5.xml:319 msgid "990 < P <=1000" msgstr "990 < P <=1000" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:272 +#: apt_preferences.5.xml:320 msgid "" "causes a version to be installed even if it does not come from the target " "release, unless the installed version is more recent" @@ -8292,12 +8491,12 @@ msgstr "" "que la versión instalada sea más reciente." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:277 +#: apt_preferences.5.xml:325 msgid "500 < P <=990" msgstr "500 < P <=990" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:278 +#: apt_preferences.5.xml:326 msgid "" "causes a version to be installed unless there is a version available " "belonging to the target release or the installed version is more recent" @@ -8307,12 +8506,12 @@ msgstr "" "más reciente." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:283 +#: apt_preferences.5.xml:331 msgid "100 < P <=500" msgstr "100 < P <=500" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:284 +#: apt_preferences.5.xml:332 msgid "" "causes a version to be installed unless there is a version available " "belonging to some other distribution or the installed version is more recent" @@ -8321,12 +8520,12 @@ msgstr "" "perteneciente a otra distribución, o si la versión instalada es más reciente." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:289 +#: apt_preferences.5.xml:337 msgid "0 < P <=100" msgstr "0 < P <=100" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:290 +#: apt_preferences.5.xml:338 msgid "" "causes a version to be installed only if there is no installed version of " "the package" @@ -8334,17 +8533,17 @@ msgstr "" "La versión sólo se instala si no hay ninguna versión del paquete instalada." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:294 +#: apt_preferences.5.xml:342 msgid "P < 0" msgstr "P < 0" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:295 +#: apt_preferences.5.xml:343 msgid "prevents the version from being installed" msgstr "Evita la instalación de la versión." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:261 +#: apt_preferences.5.xml:309 msgid "" "Priorities (P) assigned in the APT preferences file must be positive or " "negative integers. They are interpreted as follows (roughly speaking): " @@ -8355,7 +8554,7 @@ msgstr "" "siguiente modo: <placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:300 +#: apt_preferences.5.xml:348 msgid "" "If any specific-form records match an available package version then the " "first such record determines the priority of the package version. Failing " @@ -8369,7 +8568,7 @@ msgstr "" "versión del paquete." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:306 +#: apt_preferences.5.xml:354 msgid "" "For example, suppose the APT preferences file contains the three records " "presented earlier:" @@ -8378,7 +8577,7 @@ msgstr "" "registros antes mencionados:" #. type: Content of: <refentry><refsect1><refsect2><programlisting> -#: apt_preferences.5.xml:310 +#: apt_preferences.5.xml:358 #, no-wrap msgid "" "Package: perl\n" @@ -8406,12 +8605,12 @@ msgstr "" "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:323 +#: apt_preferences.5.xml:371 msgid "Then:" msgstr "Por ello:" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:325 +#: apt_preferences.5.xml:373 msgid "" "The most recent available version of the <literal>perl</literal> package " "will be installed, so long as that version's version number begins with " @@ -8426,7 +8625,7 @@ msgstr "" "la versión 5.8*, desactualizando el paquete." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:330 +#: apt_preferences.5.xml:378 msgid "" "A version of any package other than <literal>perl</literal> that is " "available from the local system has priority over other versions, even " @@ -8437,7 +8636,7 @@ msgstr "" "versiones, incluso sobre los pertenecientes a la distribución objetivo." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:334 +#: apt_preferences.5.xml:382 msgid "" "A version of a package whose origin is not the local system but some other " "site listed in &sources-list; and which belongs to an <literal>unstable</" @@ -8450,12 +8649,12 @@ msgstr "" "hay ninguna versión del paquete ya instalado." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:344 +#: apt_preferences.5.xml:392 msgid "Determination of Package Version and Distribution Properties" msgstr "Determinar la versión del paquete y las propiedades de la distribución" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:346 +#: apt_preferences.5.xml:394 msgid "" "The locations listed in the &sources-list; file should provide " "<filename>Packages</filename> and <filename>Release</filename> files to " @@ -8466,27 +8665,27 @@ msgstr "" "describen los paquetes disponibles en cada uno de los sitios." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:358 +#: apt_preferences.5.xml:406 msgid "the <literal>Package:</literal> line" msgstr "La línea <literal>Package:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:359 +#: apt_preferences.5.xml:407 msgid "gives the package name" msgstr "indica el nombre del paquete." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:362 apt_preferences.5.xml:412 +#: apt_preferences.5.xml:410 apt_preferences.5.xml:460 msgid "the <literal>Version:</literal> line" msgstr "La línea <literal>Version:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:363 +#: apt_preferences.5.xml:411 msgid "gives the version number for the named package" msgstr "indica el número de versión del paquete." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:350 +#: apt_preferences.5.xml:398 msgid "" "The <filename>Packages</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable>/" @@ -8507,12 +8706,12 @@ msgstr "" "de APT: <placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:379 +#: apt_preferences.5.xml:427 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line" msgstr "Las líneas <literal>Archive:</literal> o <literal>Suite:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:380 +#: apt_preferences.5.xml:428 msgid "" "names the archive to which all the packages in the directory tree belong. " "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies " @@ -8530,18 +8729,18 @@ msgstr "" "línea en el fichero de preferencias de APT:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:390 +#: apt_preferences.5.xml:438 #, no-wrap msgid "Pin: release a=stable\n" msgstr "Pin: release a=stable\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:396 +#: apt_preferences.5.xml:444 msgid "the <literal>Codename:</literal> line" msgstr "La línea <literal>Codename:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:397 +#: apt_preferences.5.xml:445 msgid "" "names the codename to which all the packages in the directory tree belong. " "For example, the line \"Codename: &testing-codename;\" specifies that all of " @@ -8560,13 +8759,13 @@ msgstr "" "de APT:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:406 +#: apt_preferences.5.xml:454 #, no-wrap msgid "Pin: release n=&testing-codename;\n" msgstr "Pin: release n=&testing-codename;\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:413 +#: apt_preferences.5.xml:461 msgid "" "names the release version. For example, the packages in the tree might " "belong to Debian GNU/Linux release version 3.0. Note that there is normally " @@ -8582,7 +8781,7 @@ msgstr "" "siguientes línea en el fichero de preferencias de APT:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:422 +#: apt_preferences.5.xml:470 #, no-wrap msgid "" "Pin: release v=3.0\n" @@ -8594,12 +8793,12 @@ msgstr "" "Pin: release 3.0\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:431 +#: apt_preferences.5.xml:479 msgid "the <literal>Component:</literal> line" msgstr "La línea <literal>Component:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:432 +#: apt_preferences.5.xml:480 msgid "" "names the licensing component associated with the packages in the directory " "tree of the <filename>Release</filename> file. For example, the line " @@ -8618,18 +8817,18 @@ msgstr "" "de APT:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:441 +#: apt_preferences.5.xml:489 #, no-wrap msgid "Pin: release c=main\n" msgstr "Pin: release c=main\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:447 +#: apt_preferences.5.xml:495 msgid "the <literal>Origin:</literal> line" msgstr "La línea <literal>Origin:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:448 +#: apt_preferences.5.xml:496 msgid "" "names the originator of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@ -8642,18 +8841,18 @@ msgstr "" "mediante la siguiente línea:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:454 +#: apt_preferences.5.xml:502 #, no-wrap msgid "Pin: release o=Debian\n" msgstr "Pin: release o=Debian\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:460 +#: apt_preferences.5.xml:508 msgid "the <literal>Label:</literal> line" msgstr "La línea <literal>Label:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:461 +#: apt_preferences.5.xml:509 msgid "" "names the label of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@ -8666,13 +8865,13 @@ msgstr "" "siguiente línea:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:467 +#: apt_preferences.5.xml:515 #, no-wrap msgid "Pin: release l=Debian\n" msgstr "Pin: release l=Debian\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:368 +#: apt_preferences.5.xml:416 msgid "" "The <filename>Release</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for " @@ -8695,7 +8894,7 @@ msgstr "" "\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:474 +#: apt_preferences.5.xml:522 msgid "" "All of the <filename>Packages</filename> and <filename>Release</filename> " "files retrieved from locations listed in the &sources-list; file are stored " @@ -8720,12 +8919,12 @@ msgstr "" "la distribución «<literal>unstable</literal>» (inestable)." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:487 +#: apt_preferences.5.xml:535 msgid "Optional Lines in an APT Preferences Record" msgstr "Líneas opcionales en el registro de preferencias de APT" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:489 +#: apt_preferences.5.xml:537 msgid "" "Each record in the APT preferences file can optionally begin with one or " "more lines beginning with the word <literal>Explanation:</literal>. This " @@ -8736,12 +8935,12 @@ msgstr "" "Útil para comentarios." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:498 +#: apt_preferences.5.xml:546 msgid "Tracking Stable" msgstr "Seguir la distribución «stable» (estable)" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:506 +#: apt_preferences.5.xml:554 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated\n" @@ -8765,7 +8964,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:500 +#: apt_preferences.5.xml:548 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -8780,8 +8979,8 @@ msgstr "" "<literal>Debian</literal>. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:523 apt_preferences.5.xml:569 -#: apt_preferences.5.xml:627 +#: apt_preferences.5.xml:571 apt_preferences.5.xml:617 +#: apt_preferences.5.xml:675 #, no-wrap msgid "" "apt-get install <replaceable>package-name</replaceable>\n" @@ -8793,7 +8992,7 @@ msgstr "" "apt-get dist-upgrade\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:518 +#: apt_preferences.5.xml:566 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@ -8807,13 +9006,13 @@ msgstr "" "\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:535 +#: apt_preferences.5.xml:583 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/testing\n" msgstr "apt-get install <replaceable>paquete</replaceable>/testing\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:529 +#: apt_preferences.5.xml:577 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>testing</literal> distribution; the package " @@ -8826,12 +9025,12 @@ msgstr "" "\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:541 +#: apt_preferences.5.xml:589 msgid "Tracking Testing or Unstable" msgstr "Seguir la distribución «testing» (en pruebas) o «unstable» (inestable)" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:550 +#: apt_preferences.5.xml:598 #, no-wrap msgid "" "Package: *\n" @@ -8859,7 +9058,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:543 +#: apt_preferences.5.xml:591 msgid "" "The following APT preferences file will cause APT to assign a high priority " "to package versions from the <literal>testing</literal> distribution, a " @@ -8876,7 +9075,7 @@ msgstr "" ">" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:564 +#: apt_preferences.5.xml:612 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@ -8889,13 +9088,13 @@ msgstr "" "<placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:584 +#: apt_preferences.5.xml:632 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/unstable\n" msgstr "apt-get install <replaceable>paquete</replaceable>/unstable\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:575 +#: apt_preferences.5.xml:623 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>unstable</literal> distribution. " @@ -8914,12 +9113,12 @@ msgstr "" "instalada. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:591 +#: apt_preferences.5.xml:639 msgid "Tracking the evolution of a codename release" msgstr "Seguir la evolución de una publicación por el nombre" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:605 +#: apt_preferences.5.xml:653 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated package versions\n" @@ -8953,7 +9152,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:593 +#: apt_preferences.5.xml:641 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -8980,7 +9179,7 @@ msgstr "" "\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:622 +#: apt_preferences.5.xml:670 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest version(s) in " @@ -8994,13 +9193,13 @@ msgstr "" "id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:642 +#: apt_preferences.5.xml:690 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/sid\n" msgstr "apt-get install <replaceable>paquete</replaceable>/sid\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:633 +#: apt_preferences.5.xml:681 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>sid</literal> distribution. Thereafter, " @@ -9019,12 +9218,12 @@ msgstr "" "instalada. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><variablelist> -#: apt_preferences.5.xml:651 +#: apt_preferences.5.xml:699 msgid "&file-preferences;" msgstr "&file-preferences;" #. type: Content of: <refentry><refsect1><para> -#: apt_preferences.5.xml:657 +#: apt_preferences.5.xml:705 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;" msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;" @@ -11048,6 +11247,43 @@ msgstr " # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade" msgid "Which will use the already fetched archives on the disc." msgstr "Ésto usará los archivos del disco previamente obtenidos." +#~ msgid "<option>--md5</option>" +#~ msgstr "<option>--md5</option>" + +#~ msgid "" +#~ "Generate MD5 sums. This defaults to on, when turned off the generated " +#~ "index files will not have MD5Sum fields where possible. Configuration " +#~ "Item: <literal>APT::FTPArchive::MD5</literal>" +#~ msgstr "" +#~ "Genera una suma de control MD5. Está activado de forma predeterminada, " +#~ "cuando se desactiva los ficheros de índices generados no tendrán los " +#~ "campos MD5Sum cuando sea posible. Opción de configuración: <literal>APT::" +#~ "FTPArchive::MD5</literal>" + +#~ msgid "unmarkauto" +#~ msgstr "unmarkauto" + +#~ msgid "<option>-h</option>" +#~ msgstr "<option>-h</option>" + +#~ msgid "<option>--help</option>" +#~ msgstr "<option>--help</option>" + +#~ msgid "Show a short usage summary." +#~ msgstr "Muestra un breve resumen de uso." + +#~ msgid "<option>-v</option>" +#~ msgstr "<option>-v</option>" + +#~ msgid "<option>--version</option>" +#~ msgstr "<option>--version</option>" + +#~ msgid "Show the program version." +#~ msgstr "Muestra la versión del programa." + +#~ msgid "to the version that is already installed (if any)." +#~ msgstr "a la versión instalada (de existir)." + #~ msgid "APT package handling utility -- cache manipulator" #~ msgstr "" #~ "Herramienta para la gestión de paquetes APT -- manipulador de la caché" @@ -11107,8 +11343,12 @@ msgstr "Ésto usará los archivos del disco previamente obtenidos." #~ "Usa HTTP para acceder al archivo de Debian en «nonus.debian.org», bajo el " #~ "directorio debian-non-US." -#~ msgid "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free" -#~ msgstr "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free" +#~ msgid "" +#~ "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-" +#~ "free" +#~ msgstr "" +#~ "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-" +#~ "free" #~ msgid "OPTIONS" #~ msgstr "OPCIONES" diff --git a/doc/po/fr.po b/doc/po/fr.po index 33a118036..71cc73b45 100644 --- a/doc/po/fr.po +++ b/doc/po/fr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2011-02-14 13:42+0100\n" +"POT-Creation-Date: 2011-06-08 16:54+0300\n" "PO-Revision-Date: 2011-02-17 07:50+0100\n" "Last-Translator: Christian Perrier <bubulle@debian.org>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" @@ -731,7 +731,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50 #: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:114 -#: apt-key.8.xml:38 apt-mark.8.xml:55 apt-secure.8.xml:43 +#: apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43 #: apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36 #: sources.list.5.xml:36 msgid "Description" @@ -1250,7 +1250,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59 -#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:92 +#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:126 #: apt-sortpkgs.1.xml:57 apt.conf.5.xml:560 apt.conf.5.xml:582 msgid "options" msgstr "options" @@ -1277,7 +1277,7 @@ msgstr "" "<literal>Dir::Cache::pkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:288 apt-ftparchive.1.xml:568 apt-get.8.xml:393 +#: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393 #: apt-sortpkgs.1.xml:61 msgid "<option>-s</option>" msgstr "<option>-s</option>" @@ -1304,12 +1304,12 @@ msgstr "" "<literal>Dir::Cache::srcpkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:296 apt-ftparchive.1.xml:542 apt-get.8.xml:383 +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 msgid "<option>-q</option>" msgstr "<option>-q</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:296 apt-ftparchive.1.xml:542 apt-get.8.xml:383 +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 msgid "<option>--quiet</option>" msgstr "<option>--quiet</option>" @@ -1425,7 +1425,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:580 +#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583 msgid "<option>-a</option>" msgstr "<option>-a</option>" @@ -1545,14 +1545,14 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist> #: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101 -#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608 apt-get.8.xml:570 -#: apt-sortpkgs.1.xml:67 +#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570 +#: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67 msgid "&apt-commonoptions;" msgstr "&apt-commonoptions;" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:156 apt-mark.8.xml:125 -#: apt.conf.5.xml:1093 apt_preferences.5.xml:649 +#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:172 apt-mark.8.xml:144 +#: apt.conf.5.xml:1093 apt_preferences.5.xml:697 msgid "Files" msgstr "Fichiers" @@ -1563,9 +1563,9 @@ msgstr "&file-sourceslist; &file-statelists;" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106 -#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:624 apt-get.8.xml:585 -#: apt-key.8.xml:177 apt-mark.8.xml:131 apt-secure.8.xml:185 -#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:656 +#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585 +#: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185 +#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704 #: sources.list.5.xml:234 msgid "See Also" msgstr "Voir aussi" @@ -1577,8 +1577,8 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;." #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111 -#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:628 apt-get.8.xml:591 -#: apt-mark.8.xml:135 apt-sortpkgs.1.xml:76 +#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591 +#: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76 msgid "Diagnostics" msgstr "Diagnostics" @@ -1707,12 +1707,12 @@ msgstr "" "\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><title> -#: apt-cdrom.8.xml:94 apt-key.8.xml:142 +#: apt-cdrom.8.xml:94 apt-key.8.xml:158 msgid "Options" msgstr "Options" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:536 apt-get.8.xml:345 +#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345 msgid "<option>-d</option>" msgstr "<option>-d</option>" @@ -1969,7 +1969,7 @@ msgid "Just show the contents of the configuration space." msgstr "Affiche seulement le contenu de l'espace de configuration." #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:625 +#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628 #: apt-sortpkgs.1.xml:73 msgid "&apt-conf;" msgstr "&apt-conf;" @@ -3120,28 +3120,49 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-ftparchive.1.xml:529 -msgid "<option>--md5</option>" -msgstr "<option>--md5</option>" +msgid "" +"<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>" +msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:531 -msgid "" -"Generate MD5 sums. This defaults to on, when turned off the generated index " -"files will not have MD5Sum fields where possible. Configuration Item: " -"<literal>APT::FTPArchive::MD5</literal>" +#, fuzzy +#| msgid "" +#| "Values for the additional metadata fields in the Release file are taken " +#| "from the corresponding variables under <literal>APT::FTPArchive::Release</" +#| "literal>, e.g. <literal>APT::FTPArchive::Release::Origin</literal>. The " +#| "supported fields are: <literal>Origin</literal>, <literal>Label</" +#| "literal>, <literal>Suite</literal>, <literal>Version</literal>, " +#| "<literal>Codename</literal>, <literal>Date</literal>, <literal>Valid-" +#| "Until</literal>, <literal>Architectures</literal>, <literal>Components</" +#| "literal>, <literal>Description</literal>." +msgid "" +"Generate the given checksum. These options default to on, when turned off " +"the generated index files will not have the checksum fields where possible. " +"Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</" +"replaceable></literal> and <literal>APT::FTPArchive::<replaceable>Index</" +"replaceable>::<replaceable>Checksum</replaceable></literal> where " +"<literal>Index</literal> can be <literal>Packages</literal>, " +"<literal>Sources</literal> or <literal>Release</literal> and " +"<literal>Checksum</literal> can be <literal>MD5</literal>, <literal>SHA1</" +"literal> or <literal>SHA256</literal>." msgstr "" -"Créer la somme de contrôle MD5. Cette option est activée par défaut. Quand " -"elle est désactivée, les fichiers d'index n'ont pas les champs MD5Sum là où " -"c'est possible. Élément de configuration : <literal>APT::FTPArchive::MD5</" -"literal>." +"La valeur des autres champs de métadonnées du fichier Release sont tirées de " +"la valeur correspondante dans <literal>APT::FTPArchive::Release</literal>, " +"p. ex. <literal>APT::FTPArchive::Release::Origin</literal>. Les champs " +"reconnus sont : <literal>Origin</literal>, <literal>Label</literal>, " +"<literal>Suite</literal>, <literal>Version</literal>, <literal>Codename</" +"literal>, <literal>Date</literal>, <literal>Valid-Until</literal>, " +"<literal>Architectures</literal>, <literal>Components</literal>, " +"<literal>Description</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:536 +#: apt-ftparchive.1.xml:539 msgid "<option>--db</option>" msgstr "<option>--db</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:538 +#: apt-ftparchive.1.xml:541 msgid "" "Use a binary caching DB. This has no effect on the generate command. " "Configuration Item: <literal>APT::FTPArchive::DB</literal>." @@ -3151,7 +3172,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:544 +#: apt-ftparchive.1.xml:547 msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quiet up to a maximum of 2. You can also use " @@ -3166,12 +3187,12 @@ msgstr "" "configuration : <literal>quiet</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:550 +#: apt-ftparchive.1.xml:553 msgid "<option>--delink</option>" msgstr "<option>--delink</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:552 +#: apt-ftparchive.1.xml:555 msgid "" "Perform Delinking. If the <literal>External-Links</literal> setting is used " "then this option actually enables delinking of the files. It defaults to on " @@ -3185,12 +3206,12 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:558 +#: apt-ftparchive.1.xml:561 msgid "<option>--contents</option>" msgstr "<option>--contents</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:560 +#: apt-ftparchive.1.xml:563 msgid "" "Perform contents generation. When this option is set and package indexes are " "being generated with a cache DB then the file listing will also be extracted " @@ -3206,12 +3227,12 @@ msgstr "" "de configuration : <literal>APT::FTPArchive::Contents</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:568 +#: apt-ftparchive.1.xml:571 msgid "<option>--source-override</option>" msgstr "<option>--source-override</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:570 +#: apt-ftparchive.1.xml:573 msgid "" "Select the source override file to use with the <literal>sources</literal> " "command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</" @@ -3222,12 +3243,12 @@ msgstr "" "FTPArchive::SourceOverride</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:574 +#: apt-ftparchive.1.xml:577 msgid "<option>--readonly</option>" msgstr "<option>--readonly</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:576 +#: apt-ftparchive.1.xml:579 msgid "" "Make the caching databases read only. Configuration Item: <literal>APT::" "FTPArchive::ReadOnlyDB</literal>." @@ -3236,12 +3257,12 @@ msgstr "" "configuration : <literal>APT::FTPArchive::ReadOnlyDB</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:580 +#: apt-ftparchive.1.xml:583 msgid "<option>--arch</option>" msgstr "<option>--arch</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:581 +#: apt-ftparchive.1.xml:584 msgid "" "Accept in the <literal>packages</literal> and <literal>contents</literal> " "commands only package files matching <literal>*_arch.deb</literal> or " @@ -3255,12 +3276,12 @@ msgstr "" "<literal>APT::FTPArchive::Architecture</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:587 +#: apt-ftparchive.1.xml:590 msgid "<option>APT::FTPArchive::AlwaysStat</option>" msgstr "<option>APT::FTPArchive::AlwaysStat</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:589 +#: apt-ftparchive.1.xml:592 msgid "" "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If " "packages are recompiled and/or republished with the same version again, this " @@ -3283,12 +3304,12 @@ msgstr "" "survenir et l'ensemble de ces contrôles devient inutile." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:599 +#: apt-ftparchive.1.xml:602 msgid "<option>APT::FTPArchive::LongDescription</option>" msgstr "<option>APT::FTPArchive::LongDescription</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:601 +#: apt-ftparchive.1.xml:604 msgid "" "This configuration option defaults to \"<literal>true</literal>\" and should " "only be set to <literal>\"false\"</literal> if the Archive generated with " @@ -3304,19 +3325,19 @@ msgstr "" "generate." #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:613 apt.conf.5.xml:1087 apt_preferences.5.xml:496 +#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:544 #: sources.list.5.xml:198 msgid "Examples" msgstr "Exemples" #. type: Content of: <refentry><refsect1><para><programlisting> -#: apt-ftparchive.1.xml:619 +#: apt-ftparchive.1.xml:622 #, no-wrap msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" msgstr "<command>apt-ftparchive</command> packages <replaceable>répertoire</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:615 +#: apt-ftparchive.1.xml:618 msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" @@ -3325,7 +3346,7 @@ msgstr "" "des paquets binaires (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:629 +#: apt-ftparchive.1.xml:632 msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@ -4688,8 +4709,24 @@ msgstr "" "Mettre à jour le trousseau de clés local avec le trousseau de clés de " "l'archive Debian et supprimer les clés qui y sont périmées." +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:140 +#, fuzzy +#| msgid "update" +msgid "net-update" +msgstr "update" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:144 +msgid "" +"Update the local keyring with the keys of a key server and removes from the " +"keyring the archive keys which are no longer valid. This requires an " +"installed wget and an APT build configured to have a server to fetch from. " +"APT in Debian does not support this command, but Ubuntu's APT does." +msgstr "" + #. type: Content of: <refentry><refsect1><para> -#: apt-key.8.xml:143 +#: apt-key.8.xml:159 msgid "" "Note that options need to be defined before the commands described in the " "previous section." @@ -4698,12 +4735,12 @@ msgstr "" "décrites dans la section suivante." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:145 +#: apt-key.8.xml:161 msgid "--keyring <replaceable>filename</replaceable>" msgstr "--keyring <replaceable>fichier</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:146 +#: apt-key.8.xml:162 msgid "" "With this option it is possible to specify a specific keyring file the " "command should operate on. The default is that a command is executed on the " @@ -4720,53 +4757,57 @@ msgstr "" "les nouvelles clés y seront ajoutées." #. type: Content of: <refentry><refsect1><variablelist> -#: apt-key.8.xml:159 +#: apt-key.8.xml:175 msgid "&file-trustedgpg;" msgstr "&file-trustedgpg;" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:161 +#: apt-key.8.xml:177 msgid "<filename>/etc/apt/trustdb.gpg</filename>" msgstr "<filename>/etc/apt/trustdb.gpg</filename>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:162 +#: apt-key.8.xml:178 msgid "Local trust database of archive keys." 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:165 +#: apt-key.8.xml:181 msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:166 +#: apt-key.8.xml:182 msgid "Keyring of Debian archive trusted keys." msgstr "Trousseau des clés fiables de l'archive Debian." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:169 +#: apt-key.8.xml:185 msgid "" "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" msgstr "" "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:170 +#: apt-key.8.xml:186 msgid "Keyring of Debian archive removed trusted keys." msgstr "Trousseau des clés fiables supprimées de l'archive Debian." #. type: Content of: <refentry><refsect1><para> -#: apt-key.8.xml:179 +#: apt-key.8.xml:195 msgid "&apt-get;, &apt-secure;" msgstr "&apt-get;, &apt-secure;" #. The last update date #. type: Content of: <refentry><refentryinfo> #: apt-mark.8.xml:16 +#, fuzzy +#| msgid "" +#| "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 " +#| "August 2009</date>" msgid "" -"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 " -"August 2009</date>" +"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>21 " +"April 2011</date>" msgstr "" "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 " "août 2009</date>" @@ -4783,13 +4824,22 @@ msgstr "Indiquer si un paquet a été installé automatiquement ou non" #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> #: apt-mark.8.xml:39 +#, fuzzy +#| msgid "" +#| " <command>apt-mark</command> <arg><option>-hv</option></arg> " +#| "<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> <group " +#| "choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg " +#| "choice=\"plain\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </" +#| "group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>package</" +#| "replaceable></arg> </arg> <arg choice=\"plain\">showauto</arg> </group>" msgid "" " <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-" "f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain" "\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain" -"\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </group> <arg " +"\">auto</arg> <arg choice=\"plain\">manual</arg> <arg choice=\"plain" +"\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </group> <arg " "choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </" -"arg> <arg choice=\"plain\">showauto</arg> </group>" +"arg> </group>" msgstr "" " <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-" "f=<replaceable>FICHIER</replaceable></option></arg> <group choice=\"plain\"> " @@ -4799,7 +4849,7 @@ msgstr "" "arg> <arg choice=\"plain\">showauto</arg> </group>" #. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:56 +#: apt-mark.8.xml:57 msgid "" "<command>apt-mark</command> will change whether a package has been marked as " "being automatically installed." @@ -4808,7 +4858,7 @@ msgstr "" "a été automatiquement installé ou pas." #. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:60 +#: apt-mark.8.xml:61 msgid "" "When you request that a package is installed, and as a result other packages " "are installed to satisfy its dependencies, the dependencies are marked as " @@ -4824,14 +4874,21 @@ msgstr "" "command>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:68 -msgid "markauto" +#: apt-mark.8.xml:69 +#, fuzzy +#| msgid "markauto" +msgid "auto" msgstr "markauto" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:69 +#: apt-mark.8.xml:70 +#, fuzzy +#| msgid "" +#| "<literal>markauto</literal> is used to mark a package as being " +#| "automatically installed, which will cause the package to be removed when " +#| "no more manually installed packages depend on this package." msgid "" -"<literal>markauto</literal> is used to mark a package as being automatically " +"<literal>auto</literal> is used to mark a package as being automatically " "installed, which will cause the package to be removed when no more manually " "installed packages depend on this package." msgstr "" @@ -4840,14 +4897,19 @@ msgstr "" "que plus aucun paquet installé manuellement ne dépend de lui." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:76 -msgid "unmarkauto" -msgstr "unmarkauto" +#: apt-mark.8.xml:77 +msgid "manual" +msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:77 +#: apt-mark.8.xml:78 +#, fuzzy +#| msgid "" +#| "<literal>unmarkauto</literal> is used to mark a package as being manually " +#| "installed, which will prevent the package from being automatically " +#| "removed if no other packages depend on it." msgid "" -"<literal>unmarkauto</literal> is used to mark a package as being manually " +"<literal>manual</literal> is used to mark a package as being manually " "installed, which will prevent the package from being automatically removed " "if no other packages depend on it." msgstr "" @@ -4856,28 +4918,102 @@ msgstr "" "aucun autre paquet n'en dépend." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:84 +#: apt-mark.8.xml:85 +msgid "hold" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:86 +msgid "" +"<literal>hold</literal> is used to mark a package as hold back, which will " +"prevent the package from being automatically installed, upgraded or " +"removed. The command is only a wrapper around <command>dpkg --set-" +"selections</command> and the state is therefore maintained by &dpkg; and not " +"effected by the <option>--filename</option> option." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:95 +msgid "unhold" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:96 +#, fuzzy +#| msgid "" +#| "<literal>showauto</literal> is used to print a list of automatically " +#| "installed packages with each package on a new line." +msgid "" +"<literal>unhold</literal> is used to cancel a previously set hold on a " +"package to allow all actions again." +msgstr "" +"<literal>showauto</literal>, affiche les paquets installés automatiquement, " +"un paquet par ligne." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:101 msgid "showauto" msgstr "showauto" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:85 +#: apt-mark.8.xml:102 +#, fuzzy +#| msgid "" +#| "<literal>showauto</literal> is used to print a list of automatically " +#| "installed packages with each package on a new line." msgid "" "<literal>showauto</literal> is used to print a list of automatically " -"installed packages with each package on a new line." +"installed packages with each package on a new line. All automatically " +"installed packages will be listed if no package is given. If packages are " +"given only those which are automatically installed will be shown." msgstr "" "<literal>showauto</literal>, affiche les paquets installés automatiquement, " "un paquet par ligne." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:96 +#: apt-mark.8.xml:109 +#, fuzzy +#| msgid "showauto" +msgid "showmanual" +msgstr "showauto" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:110 +msgid "" +"<literal>showmanual</literal> can be used in the same way as " +"<literal>showauto</literal> except that it will print a list of manually " +"installed packages instead." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:116 +#, fuzzy +#| msgid "showauto" +msgid "showhold" +msgstr "showauto" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:117 +#, fuzzy +#| msgid "" +#| "<literal>showauto</literal> is used to print a list of automatically " +#| "installed packages with each package on a new line." +msgid "" +"<literal>showhold</literal> is used to print a list of packages on hold in " +"the same way as for the other show commands." +msgstr "" +"<literal>showauto</literal>, affiche les paquets installés automatiquement, " +"un paquet par ligne." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:130 msgid "" "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>" msgstr "" "<option>-f=<filename><replaceable>FICHIER</replaceable></filename></option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:97 +#: apt-mark.8.xml:131 msgid "" "<option>--file=<filename><replaceable>FILENAME</replaceable></filename></" "option>" @@ -4886,7 +5022,7 @@ msgstr "" "option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:100 +#: apt-mark.8.xml:134 msgid "" "Read/Write package stats from <filename><replaceable>FILENAME</replaceable></" "filename> instead of the default location, which is " @@ -4898,48 +5034,18 @@ msgstr "" "par défaut (<filename>extended_status</filename> dans le répertoire défini " "par l'élément de configuration <literal>Dir::State</literal>)." -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:106 -msgid "<option>-h</option>" -msgstr "<option>-h</option>" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:107 -msgid "<option>--help</option>" -msgstr "<option>--help</option>" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:108 -msgid "Show a short usage summary." -msgstr "Affiche un résumé de l'aide" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:114 -msgid "<option>-v</option>" -msgstr "<option>-v</option>" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:115 -msgid "<option>--version</option>" -msgstr "<option>--version</option>" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:116 -msgid "Show the program version." -msgstr "Affiche la version du programme." - #. type: Content of: <refentry><refsect1><variablelist> -#: apt-mark.8.xml:127 +#: apt-mark.8.xml:146 msgid " &file-extended_states;" msgstr " &file-extended_states;" #. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:132 +#: apt-mark.8.xml:151 msgid "&apt-get;,&aptitude;,&apt-conf;" msgstr "&apt-get;,&aptitude;,&apt-conf;" #. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:136 +#: apt-mark.8.xml:155 msgid "" "<command>apt-mark</command> returns zero on normal operation, non-zero on " "error." @@ -7818,32 +7924,50 @@ msgstr "priorité 1" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #: apt_preferences.5.xml:107 +#, fuzzy +#| msgid "" +#| "to the versions coming from archives which in their <filename>Release</" +#| "filename> files are marked as \"NotAutomatic: yes\" like the debian " +#| "experimental archive." msgid "" "to the versions coming from archives which in their <filename>Release</" -"filename> files are marked as \"NotAutomatic: yes\" like the debian " -"experimental archive." +"filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</" +"emphasis> as \"ButAutomaticUpgrades: yes\" like the debian " +"<literal>experimental</literal> archive." msgstr "" "pour les versions issues d'archives dont le fichier <filename>Release</" "filename> comporte la mention « NotAutomatic: yes » comme, par exemple, " "l'archive « experimental » de Debian." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:112 +#: apt_preferences.5.xml:113 msgid "priority 100" msgstr "une priorité égale à 100" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:113 -msgid "to the version that is already installed (if any)." -msgstr "est affectée à la version déjà installée (si elle existe)." +#: apt_preferences.5.xml:114 +#, fuzzy +#| msgid "" +#| "to the versions coming from archives which in their <filename>Release</" +#| "filename> files are marked as \"NotAutomatic: yes\" like the debian " +#| "experimental archive." +msgid "" +"to the version that is already installed (if any) and to the versions coming " +"from archives which in their <filename>Release</filename> files are marked " +"as \"NotAutomatic: yes\" and \"ButAutomaticUpgrades: yes\" like the debian " +"backports archive since <literal>squeeze-backports</literal>." +msgstr "" +"pour les versions issues d'archives dont le fichier <filename>Release</" +"filename> comporte la mention « NotAutomatic: yes » comme, par exemple, " +"l'archive « experimental » de Debian." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:117 +#: apt_preferences.5.xml:121 msgid "priority 500" msgstr "une priorité égale à 500" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:118 +#: apt_preferences.5.xml:122 msgid "" "to the versions that are not installed and do not belong to the target " "release." @@ -7852,12 +7976,12 @@ msgstr "" "pas à la distribution par défaut." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:122 +#: apt_preferences.5.xml:126 msgid "priority 990" msgstr "une priorité égale à 990" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:123 +#: apt_preferences.5.xml:127 msgid "" "to the versions that are not installed and belong to the target release." msgstr "" @@ -7876,13 +8000,21 @@ msgstr "" "type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:128 +#: apt_preferences.5.xml:132 +#, fuzzy +#| msgid "" +#| "If the target release has not been specified then APT simply assigns " +#| "priority 100 to all installed package versions and priority 500 to all " +#| "uninstalled package versions, expect versions coming from archives which " +#| "in their <filename>Release</filename> files are marked as \"NotAutomatic: " +#| "yes\" - these versions get the priority 1." msgid "" "If the target release has not been specified then APT simply assigns " "priority 100 to all installed package versions and priority 500 to all " -"uninstalled package versions, expect versions coming from archives which in " +"uninstalled package versions, except versions coming from archives which in " "their <filename>Release</filename> files are marked as \"NotAutomatic: yes\" " -"- these versions get the priority 1." +"- these versions get the priority 1 or priority 100 if it is additionally " +"marked as \"ButAutomaticUpgrades: yes\"." msgstr "" "Quand aucune distribution par défaut n'a été indiquée, APT affecte " "simplement une priorité égale à 100 à toute version installée d'un paquet et " @@ -7892,7 +8024,7 @@ msgstr "" "priorité égale à 1." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:134 +#: apt_preferences.5.xml:139 msgid "" "APT then applies the following rules, listed in order of precedence, to " "determine which version of a package to install." @@ -7901,7 +8033,7 @@ msgstr "" "qu'il faut installer (par ordre de priorité) :" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:137 +#: apt_preferences.5.xml:142 msgid "" "Never downgrade unless the priority of an available version exceeds 1000. " "(\"Downgrading\" is installing a less recent version of a package in place " @@ -7917,12 +8049,12 @@ msgstr "" "arrière." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:143 +#: apt_preferences.5.xml:148 msgid "Install the highest priority version." msgstr "Installer la version qui possède la priorité la plus haute." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:144 +#: apt_preferences.5.xml:149 msgid "" "If two or more versions have the same priority, install the most recent one " "(that is, the one with the higher version number)." @@ -7931,7 +8063,7 @@ msgstr "" "plus récente (c.-à-d. celle dont le numéro de version est le plus grand)." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:147 +#: apt_preferences.5.xml:152 msgid "" "If two or more versions have the same priority and version number but either " "the packages differ in some of their metadata or the <literal>--reinstall</" @@ -7943,7 +8075,7 @@ msgstr "" "qui n'est pas installée." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:153 +#: apt_preferences.5.xml:158 msgid "" "In a typical situation, the installed version of a package (priority 100) " "is not as recent as one of the versions available from the sources listed in " @@ -7958,7 +8090,7 @@ msgstr "" "replaceable></command> ou <command>apt-get dist-upgrade</command>." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:160 +#: apt_preferences.5.xml:165 msgid "" "More rarely, the installed version of a package is <emphasis>more</emphasis> " "recent than any of the other available versions. The package will not be " @@ -7971,7 +8103,7 @@ msgstr "" "<command>apt-get upgrade</command> ne provoquent pas de retour en arrière." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:165 +#: apt_preferences.5.xml:170 msgid "" "Sometimes the installed version of a package is more recent than the version " "belonging to the target release, but not as recent as a version belonging to " @@ -7990,12 +8122,12 @@ msgstr "" "priorité que celle de la version installée." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:174 +#: apt_preferences.5.xml:179 msgid "The Effect of APT Preferences" msgstr "Conséquences des préférences" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:176 +#: apt_preferences.5.xml:181 msgid "" "The APT preferences file allows the system administrator to control the " "assignment of priorities. The file consists of one or more multi-line " @@ -8008,7 +8140,7 @@ msgstr "" "formes, une forme particulière et une forme générale." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:182 +#: apt_preferences.5.xml:187 msgid "" "The specific form assigns a priority (a \"Pin-Priority\") to one or more " "specified packages and specified version or version range. For example, the " @@ -8023,7 +8155,7 @@ msgstr "" "dont le numéro de version commence par <literal>5.8</literal>." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:189 +#: apt_preferences.5.xml:194 #, no-wrap msgid "" "Package: perl\n" @@ -8035,7 +8167,7 @@ msgstr "" "Pin-Priority: 1001\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:195 +#: apt_preferences.5.xml:200 msgid "" "The general form assigns a priority to all of the package versions in a " "given distribution (that is, to all the versions of packages that are listed " @@ -8050,7 +8182,7 @@ msgstr "" "un nom complètement qualifié." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:201 +#: apt_preferences.5.xml:206 msgid "" "This general-form entry in the APT preferences file applies only to groups " "of packages. For example, the following record assigns a high priority to " @@ -8061,7 +8193,7 @@ msgstr "" "priorité haute à toutes les versions disponibles dans le site local." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:206 +#: apt_preferences.5.xml:211 #, no-wrap msgid "" "Package: *\n" @@ -8073,7 +8205,7 @@ msgstr "" "Pin-Priority: 999\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:211 +#: apt_preferences.5.xml:216 msgid "" "A note of caution: the keyword used here is \"<literal>origin</literal>\" " "which can be used to match a hostname. The following record will assign a " @@ -8086,7 +8218,7 @@ msgstr "" "serveur identifié par l' nom d'hôte « ftp.de.debian.org »." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:215 +#: apt_preferences.5.xml:220 #, no-wrap msgid "" "Package: *\n" @@ -8098,7 +8230,7 @@ msgstr "" "Pin-Priority: 999\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:219 +#: apt_preferences.5.xml:224 msgid "" "This should <emphasis>not</emphasis> be confused with the Origin of a " "distribution as specified in a <filename>Release</filename> file. What " @@ -8113,7 +8245,7 @@ msgstr "" "mais le nom d'un auteur ou d'un distributeur, comme « Debian » ou « Ximian »." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:224 +#: apt_preferences.5.xml:229 msgid "" "The following record assigns a low priority to all package versions " "belonging to any distribution whose Archive name is \"<literal>unstable</" @@ -8124,7 +8256,7 @@ msgstr "" "<literal>unstable</literal>." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:228 +#: apt_preferences.5.xml:233 #, no-wrap msgid "" "Package: *\n" @@ -8136,7 +8268,7 @@ msgstr "" "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:233 +#: apt_preferences.5.xml:238 msgid "" "The following record assigns a high priority to all package versions " "belonging to any distribution whose Codename is \"<literal>&testing-codename;" @@ -8147,7 +8279,7 @@ msgstr "" "<literal>&testing-codename;</literal>." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:237 +#: apt_preferences.5.xml:242 #, no-wrap msgid "" "Package: *\n" @@ -8159,7 +8291,7 @@ msgstr "" "Pin-Priority: 900\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:242 +#: apt_preferences.5.xml:247 msgid "" "The following record assigns a high priority to all package versions " "belonging to any release whose Archive name is \"<literal>stable</literal>\" " @@ -8171,7 +8303,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:247 +#: apt_preferences.5.xml:252 #, no-wrap msgid "" "Package: *\n" @@ -8183,17 +8315,84 @@ msgstr "" "Pin-Priority: 500\n" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:258 +#: apt_preferences.5.xml:262 +msgid "Regular expressions and glob() syntax" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:264 +msgid "" +"APT also supports pinning by glob() expressions and regular expressions " +"surrounded by /. For example, the following example assigns the priority 500 " +"to all packages from experimental where the name starts with gnome (as a glob" +"()-like expression or contains the word kde (as a POSIX extended regular " +"expression surrounded by slashes)." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><programlisting> +#: apt_preferences.5.xml:273 +#, fuzzy, no-wrap +#| msgid "" +#| "Package: *\n" +#| "Pin: release a=unstable\n" +#| "Pin-Priority: 50\n" +msgid "" +"Package: gnome* /kde/\n" +"Pin: release n=experimental\n" +"Pin-Priority: 500\n" +msgstr "" +"Package: *\n" +"Pin: release a=unstable\n" +"Pin-Priority: 50\n" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:279 +msgid "" +"The rule for those expressions is that they can occur anywhere where a " +"string can occur. Those, the following pin assigns the priority 990 to all " +"packages from a release starting with karmic." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><programlisting> +#: apt_preferences.5.xml:285 +#, fuzzy, no-wrap +#| msgid "" +#| "Package: *\n" +#| "Pin: release a=unstable\n" +#| "Pin-Priority: 50\n" +msgid "" +"Package: *\n" +"Pin: release n=karmic*\n" +"Pin-Priority: 990\n" +msgstr "" +"Package: *\n" +"Pin: release a=unstable\n" +"Pin-Priority: 50\n" + +#. type: Content of: <refentry><refsect1><refsect2><literal> +#: apt_preferences.5.xml:290 +#, fuzzy +#| msgid "Packages" +msgid "Package" +msgstr "Packages" + +#. type: Content of: <refentry><refsect1><refsect2><literal> +#: apt_preferences.5.xml:296 +msgid "*" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt_preferences.5.xml:306 msgid "How APT Interprets Priorities" msgstr "Méthode d'interprétation des priorités par APT" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:266 +#: apt_preferences.5.xml:314 msgid "P > 1000" msgstr "P > 1000" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:267 +#: apt_preferences.5.xml:315 msgid "" "causes a version to be installed even if this constitutes a downgrade of the " "package" @@ -8202,12 +8401,12 @@ msgstr "" "retour en arrière." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:271 +#: apt_preferences.5.xml:319 msgid "990 < P <=1000" msgstr "990 < P <=1000" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:272 +#: apt_preferences.5.xml:320 msgid "" "causes a version to be installed even if it does not come from the target " "release, unless the installed version is more recent" @@ -8217,12 +8416,12 @@ msgstr "" "plus récente." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:277 +#: apt_preferences.5.xml:325 msgid "500 < P <=990" msgstr "500 < P <=990" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:278 +#: apt_preferences.5.xml:326 msgid "" "causes a version to be installed unless there is a version available " "belonging to the target release or the installed version is more recent" @@ -8231,12 +8430,12 @@ msgstr "" "distribution par défaut ou si la version installée est plus récente." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:283 +#: apt_preferences.5.xml:331 msgid "100 < P <=500" msgstr "100 < P <=500" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:284 +#: apt_preferences.5.xml:332 msgid "" "causes a version to be installed unless there is a version available " "belonging to some other distribution or the installed version is more recent" @@ -8245,29 +8444,29 @@ msgstr "" "autre distribution ou si la version installée est plus récente." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:289 +#: apt_preferences.5.xml:337 msgid "0 < P <=100" msgstr "0 < P <=100" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:290 +#: apt_preferences.5.xml:338 msgid "" "causes a version to be installed only if there is no installed version of " "the package" msgstr "la version sera installée si aucune version du paquet n'est installée." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:294 +#: apt_preferences.5.xml:342 msgid "P < 0" msgstr "P < 0" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:295 +#: apt_preferences.5.xml:343 msgid "prevents the version from being installed" msgstr "cette priorité empêche l'installation de la version." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:261 +#: apt_preferences.5.xml:309 msgid "" "Priorities (P) assigned in the APT preferences file must be positive or " "negative integers. They are interpreted as follows (roughly speaking): " @@ -8278,7 +8477,7 @@ msgstr "" "<placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:300 +#: apt_preferences.5.xml:348 msgid "" "If any specific-form records match an available package version then the " "first such record determines the priority of the package version. Failing " @@ -8292,7 +8491,7 @@ msgstr "" "trouvée détermine la priorité." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:306 +#: apt_preferences.5.xml:354 msgid "" "For example, suppose the APT preferences file contains the three records " "presented earlier:" @@ -8301,7 +8500,7 @@ msgstr "" "entrées décrites ci-dessous :" #. type: Content of: <refentry><refsect1><refsect2><programlisting> -#: apt_preferences.5.xml:310 +#: apt_preferences.5.xml:358 #, no-wrap msgid "" "Package: perl\n" @@ -8329,12 +8528,12 @@ msgstr "" "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:323 +#: apt_preferences.5.xml:371 msgid "Then:" msgstr "Alors :" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:325 +#: apt_preferences.5.xml:373 msgid "" "The most recent available version of the <literal>perl</literal> package " "will be installed, so long as that version's version number begins with " @@ -8348,7 +8547,7 @@ msgstr "" "installée est une version 5.9*, il y aura un retour en arrière." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:330 +#: apt_preferences.5.xml:378 msgid "" "A version of any package other than <literal>perl</literal> that is " "available from the local system has priority over other versions, even " @@ -8359,7 +8558,7 @@ msgstr "" "appartenant à la distribution par défaut." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:334 +#: apt_preferences.5.xml:382 msgid "" "A version of a package whose origin is not the local system but some other " "site listed in &sources-list; and which belongs to an <literal>unstable</" @@ -8372,13 +8571,13 @@ msgstr "" "paquet n'est déjà installée." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:344 +#: apt_preferences.5.xml:392 msgid "Determination of Package Version and Distribution Properties" msgstr "" "Détermination de la version des paquets et des propriétés des distributions" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:346 +#: apt_preferences.5.xml:394 msgid "" "The locations listed in the &sources-list; file should provide " "<filename>Packages</filename> and <filename>Release</filename> files to " @@ -8389,27 +8588,27 @@ msgstr "" "décrivent les paquets disponibles à cet endroit." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:358 +#: apt_preferences.5.xml:406 msgid "the <literal>Package:</literal> line" msgstr "la ligne <literal>Package:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:359 +#: apt_preferences.5.xml:407 msgid "gives the package name" msgstr "donne le nom du paquet" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:362 apt_preferences.5.xml:412 +#: apt_preferences.5.xml:410 apt_preferences.5.xml:460 msgid "the <literal>Version:</literal> line" msgstr "la ligne <literal>Version:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:363 +#: apt_preferences.5.xml:411 msgid "gives the version number for the named package" msgstr "donne le numéro de version du paquet" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:350 +#: apt_preferences.5.xml:398 msgid "" "The <filename>Packages</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable>/" @@ -8430,12 +8629,12 @@ msgstr "" "\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:379 +#: apt_preferences.5.xml:427 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line" msgstr "La ligne <literal>Archive:</literal> ou <literal>Suite:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:380 +#: apt_preferences.5.xml:428 msgid "" "names the archive to which all the packages in the directory tree belong. " "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies " @@ -8452,18 +8651,18 @@ msgstr "" "préférences demanderait cette ligne :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:390 +#: apt_preferences.5.xml:438 #, no-wrap msgid "Pin: release a=stable\n" msgstr "Pin: release a=stable\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:396 +#: apt_preferences.5.xml:444 msgid "the <literal>Codename:</literal> line" msgstr "la ligne <literal>Codename:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:397 +#: apt_preferences.5.xml:445 msgid "" "names the codename to which all the packages in the directory tree belong. " "For example, the line \"Codename: &testing-codename;\" specifies that all of " @@ -8481,13 +8680,13 @@ msgstr "" "ligne :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:406 +#: apt_preferences.5.xml:454 #, no-wrap msgid "Pin: release n=&testing-codename;\n" msgstr "Pin: release n=&testing-codename;\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:413 +#: apt_preferences.5.xml:461 msgid "" "names the release version. For example, the packages in the tree might " "belong to Debian GNU/Linux release version 3.0. Note that there is normally " @@ -8503,7 +8702,7 @@ msgstr "" "préférences demanderait ces lignes :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:422 +#: apt_preferences.5.xml:470 #, no-wrap msgid "" "Pin: release v=3.0\n" @@ -8515,12 +8714,12 @@ msgstr "" "Pin: release 3.0\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:431 +#: apt_preferences.5.xml:479 msgid "the <literal>Component:</literal> line" msgstr "La ligne <literal>Component:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:432 +#: apt_preferences.5.xml:480 msgid "" "names the licensing component associated with the packages in the directory " "tree of the <filename>Release</filename> file. For example, the line " @@ -8538,18 +8737,18 @@ msgstr "" "fichier des préférences demanderait cette ligne :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:441 +#: apt_preferences.5.xml:489 #, no-wrap msgid "Pin: release c=main\n" msgstr "Pin: release c=main\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:447 +#: apt_preferences.5.xml:495 msgid "the <literal>Origin:</literal> line" msgstr "La ligne <literal>Origin:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:448 +#: apt_preferences.5.xml:496 msgid "" "names the originator of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@ -8562,18 +8761,18 @@ msgstr "" "ligne :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:454 +#: apt_preferences.5.xml:502 #, no-wrap msgid "Pin: release o=Debian\n" msgstr "Pin: release o=Debian\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:460 +#: apt_preferences.5.xml:508 msgid "the <literal>Label:</literal> line" msgstr "La ligne <literal>Label:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:461 +#: apt_preferences.5.xml:509 msgid "" "names the label of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@ -8586,13 +8785,13 @@ msgstr "" "préférences demanderait cette ligne :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:467 +#: apt_preferences.5.xml:515 #, no-wrap msgid "Pin: release l=Debian\n" msgstr "Pin: release l=Debian\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:368 +#: apt_preferences.5.xml:416 msgid "" "The <filename>Release</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for " @@ -8616,7 +8815,7 @@ msgstr "" "\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:474 +#: apt_preferences.5.xml:522 msgid "" "All of the <filename>Packages</filename> and <filename>Release</filename> " "files retrieved from locations listed in the &sources-list; file are stored " @@ -8641,12 +8840,12 @@ msgstr "" "<literal>unstable</literal>." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:487 +#: apt_preferences.5.xml:535 msgid "Optional Lines in an APT Preferences Record" msgstr "Lignes facultatives dans le fichier des préférences" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:489 +#: apt_preferences.5.xml:537 msgid "" "Each record in the APT preferences file can optionally begin with one or " "more lines beginning with the word <literal>Explanation:</literal>. This " @@ -8657,12 +8856,12 @@ msgstr "" "commentaires." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:498 +#: apt_preferences.5.xml:546 msgid "Tracking Stable" msgstr "Méthode pour suivre Stable" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:506 +#: apt_preferences.5.xml:554 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated\n" @@ -8686,7 +8885,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:500 +#: apt_preferences.5.xml:548 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -8701,8 +8900,8 @@ msgstr "" "literal>. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:523 apt_preferences.5.xml:569 -#: apt_preferences.5.xml:627 +#: apt_preferences.5.xml:571 apt_preferences.5.xml:617 +#: apt_preferences.5.xml:675 #, no-wrap msgid "" "apt-get install <replaceable>package-name</replaceable>\n" @@ -8714,7 +8913,7 @@ msgstr "" "apt-get dist-upgrade\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:518 +#: apt_preferences.5.xml:566 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@ -8727,13 +8926,13 @@ msgstr "" "\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:535 +#: apt_preferences.5.xml:583 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/testing\n" msgstr "apt-get install <replaceable>paquet</replaceable>/testing\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:529 +#: apt_preferences.5.xml:577 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>testing</literal> distribution; the package " @@ -8746,12 +8945,12 @@ msgstr "" "de relancer la commande. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:541 +#: apt_preferences.5.xml:589 msgid "Tracking Testing or Unstable" msgstr "Méthode pour suivre Testing ou Unstable" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:550 +#: apt_preferences.5.xml:598 #, no-wrap msgid "" "Package: *\n" @@ -8779,7 +8978,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:543 +#: apt_preferences.5.xml:591 msgid "" "The following APT preferences file will cause APT to assign a high priority " "to package versions from the <literal>testing</literal> distribution, a " @@ -8796,7 +8995,7 @@ msgstr "" "<placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:564 +#: apt_preferences.5.xml:612 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@ -8809,13 +9008,13 @@ msgstr "" "type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:584 +#: apt_preferences.5.xml:632 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/unstable\n" msgstr "apt-get install <replaceable>paquet</replaceable>/unstable\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:575 +#: apt_preferences.5.xml:623 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>unstable</literal> distribution. " @@ -8834,12 +9033,12 @@ msgstr "" "installée. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:591 +#: apt_preferences.5.xml:639 msgid "Tracking the evolution of a codename release" msgstr "Suivre l'évolution d'une version par son nom de code" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:605 +#: apt_preferences.5.xml:653 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated package versions\n" @@ -8873,7 +9072,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:593 +#: apt_preferences.5.xml:641 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -8897,7 +9096,7 @@ msgstr "" "exemples précédents. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:622 +#: apt_preferences.5.xml:670 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest version(s) in " @@ -8910,13 +9109,13 @@ msgstr "" "<placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:642 +#: apt_preferences.5.xml:690 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/sid\n" msgstr "apt-get install <replaceable>paquet</replaceable>/sid\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:633 +#: apt_preferences.5.xml:681 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>sid</literal> distribution. Thereafter, " @@ -8935,12 +9134,12 @@ msgstr "" "<placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><variablelist> -#: apt_preferences.5.xml:651 +#: apt_preferences.5.xml:699 msgid "&file-preferences;" msgstr "&file-preferences;" #. type: Content of: <refentry><refsect1><para> -#: apt_preferences.5.xml:657 +#: apt_preferences.5.xml:705 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;" msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;" @@ -10986,6 +11185,43 @@ msgstr " # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade" msgid "Which will use the already fetched archives on the disc." msgstr "Cette commande utilisera les fichiers récupérés sur le disque." +#~ msgid "<option>--md5</option>" +#~ msgstr "<option>--md5</option>" + +#~ msgid "" +#~ "Generate MD5 sums. This defaults to on, when turned off the generated " +#~ "index files will not have MD5Sum fields where possible. Configuration " +#~ "Item: <literal>APT::FTPArchive::MD5</literal>" +#~ msgstr "" +#~ "Créer la somme de contrôle MD5. Cette option est activée par défaut. " +#~ "Quand elle est désactivée, les fichiers d'index n'ont pas les champs " +#~ "MD5Sum là où c'est possible. Élément de configuration : <literal>APT::" +#~ "FTPArchive::MD5</literal>." + +#~ msgid "unmarkauto" +#~ msgstr "unmarkauto" + +#~ msgid "<option>-h</option>" +#~ msgstr "<option>-h</option>" + +#~ msgid "<option>--help</option>" +#~ msgstr "<option>--help</option>" + +#~ msgid "Show a short usage summary." +#~ msgstr "Affiche un résumé de l'aide" + +#~ msgid "<option>-v</option>" +#~ msgstr "<option>-v</option>" + +#~ msgid "<option>--version</option>" +#~ msgstr "<option>--version</option>" + +#~ msgid "Show the program version." +#~ msgstr "Affiche la version du programme." + +#~ msgid "to the version that is already installed (if any)." +#~ msgstr "est affectée à la version déjà installée (si elle existe)." + #~ msgid "APT package handling utility -- cache manipulator" #~ msgstr "Gestionnaire de paquets APT - manipulation du cache" diff --git a/doc/po/it.po b/doc/po/it.po index 94cc9bb76..f109d98f9 100644 --- a/doc/po/it.po +++ b/doc/po/it.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2011-02-14 13:42+0100\n" +"POT-Creation-Date: 2011-06-08 16:54+0300\n" "PO-Revision-Date: 2003-04-26 23:26+0100\n" "Last-Translator: Traduzione di Eugenia Franzoni <eugenia@linuxcare.com>\n" "Language-Team: <debian-l10n-italian@lists.debian.org>\n" @@ -532,7 +532,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50 #: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:114 -#: apt-key.8.xml:38 apt-mark.8.xml:55 apt-secure.8.xml:43 +#: apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43 #: apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36 #: sources.list.5.xml:36 msgid "Description" @@ -910,7 +910,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59 -#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:92 +#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:126 #: apt-sortpkgs.1.xml:57 apt.conf.5.xml:560 apt.conf.5.xml:582 msgid "options" msgstr "" @@ -934,7 +934,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:288 apt-ftparchive.1.xml:568 apt-get.8.xml:393 +#: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393 #: apt-sortpkgs.1.xml:61 msgid "<option>-s</option>" msgstr "" @@ -955,12 +955,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:296 apt-ftparchive.1.xml:542 apt-get.8.xml:383 +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 msgid "<option>-q</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:296 apt-ftparchive.1.xml:542 apt-get.8.xml:383 +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 msgid "<option>--quiet</option>" msgstr "" @@ -1059,7 +1059,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:580 +#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583 msgid "<option>-a</option>" msgstr "" @@ -1155,14 +1155,14 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist> #: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101 -#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608 apt-get.8.xml:570 -#: apt-sortpkgs.1.xml:67 +#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570 +#: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67 msgid "&apt-commonoptions;" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:156 apt-mark.8.xml:125 -#: apt.conf.5.xml:1093 apt_preferences.5.xml:649 +#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:172 apt-mark.8.xml:144 +#: apt.conf.5.xml:1093 apt_preferences.5.xml:697 msgid "Files" msgstr "" @@ -1173,9 +1173,9 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106 -#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:624 apt-get.8.xml:585 -#: apt-key.8.xml:177 apt-mark.8.xml:131 apt-secure.8.xml:185 -#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:656 +#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585 +#: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185 +#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704 #: sources.list.5.xml:234 msgid "See Also" msgstr "" @@ -1187,8 +1187,8 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111 -#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:628 apt-get.8.xml:591 -#: apt-mark.8.xml:135 apt-sortpkgs.1.xml:76 +#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591 +#: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76 msgid "Diagnostics" msgstr "" @@ -1287,12 +1287,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-cdrom.8.xml:94 apt-key.8.xml:142 +#: apt-cdrom.8.xml:94 apt-key.8.xml:158 msgid "Options" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:536 apt-get.8.xml:345 +#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345 msgid "<option>-d</option>" msgstr "" @@ -1496,7 +1496,7 @@ msgid "Just show the contents of the configuration space." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:625 +#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628 #: apt-sortpkgs.1.xml:73 msgid "&apt-conf;" msgstr "" @@ -2407,31 +2407,38 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-ftparchive.1.xml:529 -msgid "<option>--md5</option>" +msgid "" +"<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:531 msgid "" -"Generate MD5 sums. This defaults to on, when turned off the generated index " -"files will not have MD5Sum fields where possible. Configuration Item: " -"<literal>APT::FTPArchive::MD5</literal>" +"Generate the given checksum. These options default to on, when turned off " +"the generated index files will not have the checksum fields where possible. " +"Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</" +"replaceable></literal> and <literal>APT::FTPArchive::<replaceable>Index</" +"replaceable>::<replaceable>Checksum</replaceable></literal> where " +"<literal>Index</literal> can be <literal>Packages</literal>, " +"<literal>Sources</literal> or <literal>Release</literal> and " +"<literal>Checksum</literal> can be <literal>MD5</literal>, <literal>SHA1</" +"literal> or <literal>SHA256</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:536 +#: apt-ftparchive.1.xml:539 msgid "<option>--db</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:538 +#: apt-ftparchive.1.xml:541 msgid "" "Use a binary caching DB. This has no effect on the generate command. " "Configuration Item: <literal>APT::FTPArchive::DB</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:544 +#: apt-ftparchive.1.xml:547 msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quiet up to a maximum of 2. You can also use " @@ -2440,12 +2447,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:550 +#: apt-ftparchive.1.xml:553 msgid "<option>--delink</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:552 +#: apt-ftparchive.1.xml:555 msgid "" "Perform Delinking. If the <literal>External-Links</literal> setting is used " "then this option actually enables delinking of the files. It defaults to on " @@ -2454,12 +2461,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:558 +#: apt-ftparchive.1.xml:561 msgid "<option>--contents</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:560 +#: apt-ftparchive.1.xml:563 msgid "" "Perform contents generation. When this option is set and package indexes are " "being generated with a cache DB then the file listing will also be extracted " @@ -2469,12 +2476,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:568 +#: apt-ftparchive.1.xml:571 msgid "<option>--source-override</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:570 +#: apt-ftparchive.1.xml:573 msgid "" "Select the source override file to use with the <literal>sources</literal> " "command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</" @@ -2482,24 +2489,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:574 +#: apt-ftparchive.1.xml:577 msgid "<option>--readonly</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:576 +#: apt-ftparchive.1.xml:579 msgid "" "Make the caching databases read only. Configuration Item: <literal>APT::" "FTPArchive::ReadOnlyDB</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:580 +#: apt-ftparchive.1.xml:583 msgid "<option>--arch</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:581 +#: apt-ftparchive.1.xml:584 msgid "" "Accept in the <literal>packages</literal> and <literal>contents</literal> " "commands only package files matching <literal>*_arch.deb</literal> or " @@ -2508,12 +2515,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:587 +#: apt-ftparchive.1.xml:590 msgid "<option>APT::FTPArchive::AlwaysStat</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:589 +#: apt-ftparchive.1.xml:592 msgid "" "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If " "packages are recompiled and/or republished with the same version again, this " @@ -2527,12 +2534,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:599 +#: apt-ftparchive.1.xml:602 msgid "<option>APT::FTPArchive::LongDescription</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:601 +#: apt-ftparchive.1.xml:604 msgid "" "This configuration option defaults to \"<literal>true</literal>\" and should " "only be set to <literal>\"false\"</literal> if the Archive generated with " @@ -2542,26 +2549,26 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:613 apt.conf.5.xml:1087 apt_preferences.5.xml:496 +#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:544 #: sources.list.5.xml:198 msgid "Examples" msgstr "" #. type: Content of: <refentry><refsect1><para><programlisting> -#: apt-ftparchive.1.xml:619 +#: apt-ftparchive.1.xml:622 #, no-wrap msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:615 +#: apt-ftparchive.1.xml:618 msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:629 +#: apt-ftparchive.1.xml:632 msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@ -3579,20 +3586,35 @@ msgid "" "from the keyring the archive keys which are no longer valid." msgstr "" +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:140 +#, fuzzy +msgid "net-update" +msgstr "upgrade" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:144 +msgid "" +"Update the local keyring with the keys of a key server and removes from the " +"keyring the archive keys which are no longer valid. This requires an " +"installed wget and an APT build configured to have a server to fetch from. " +"APT in Debian does not support this command, but Ubuntu's APT does." +msgstr "" + #. type: Content of: <refentry><refsect1><para> -#: apt-key.8.xml:143 +#: apt-key.8.xml:159 msgid "" "Note that options need to be defined before the commands described in the " "previous section." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:145 +#: apt-key.8.xml:161 msgid "--keyring <replaceable>filename</replaceable>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:146 +#: apt-key.8.xml:162 msgid "" "With this option it is possible to specify a specific keyring file the " "command should operate on. The default is that a command is executed on the " @@ -3603,43 +3625,43 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt-key.8.xml:159 +#: apt-key.8.xml:175 msgid "&file-trustedgpg;" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:161 +#: apt-key.8.xml:177 msgid "<filename>/etc/apt/trustdb.gpg</filename>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:162 +#: apt-key.8.xml:178 msgid "Local trust database of archive keys." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:165 +#: apt-key.8.xml:181 msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:166 +#: apt-key.8.xml:182 msgid "Keyring of Debian archive trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:169 +#: apt-key.8.xml:185 msgid "" "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:170 +#: apt-key.8.xml:186 msgid "Keyring of Debian archive removed trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-key.8.xml:179 +#: apt-key.8.xml:195 msgid "&apt-get;, &apt-secure;" msgstr "" @@ -3647,8 +3669,8 @@ msgstr "" #. type: Content of: <refentry><refentryinfo> #: apt-mark.8.xml:16 msgid "" -"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 " -"August 2009</date>" +"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>21 " +"April 2011</date>" msgstr "" #. type: Content of: <refentry><refnamediv><refname> @@ -3667,20 +3689,21 @@ msgid "" " <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-" "f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain" "\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain" -"\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </group> <arg " +"\">auto</arg> <arg choice=\"plain\">manual</arg> <arg choice=\"plain" +"\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </group> <arg " "choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </" -"arg> <arg choice=\"plain\">showauto</arg> </group>" +"arg> </group>" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:56 +#: apt-mark.8.xml:57 msgid "" "<command>apt-mark</command> will change whether a package has been marked as " "being automatically installed." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:60 +#: apt-mark.8.xml:61 msgid "" "When you request that a package is installed, and as a result other packages " "are installed to satisfy its dependencies, the dependencies are marked as " @@ -3690,107 +3713,131 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:68 -msgid "markauto" +#: apt-mark.8.xml:69 +msgid "auto" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:69 +#: apt-mark.8.xml:70 msgid "" -"<literal>markauto</literal> is used to mark a package as being automatically " +"<literal>auto</literal> is used to mark a package as being automatically " "installed, which will cause the package to be removed when no more manually " "installed packages depend on this package." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:76 -msgid "unmarkauto" +#: apt-mark.8.xml:77 +msgid "manual" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:77 +#: apt-mark.8.xml:78 msgid "" -"<literal>unmarkauto</literal> is used to mark a package as being manually " +"<literal>manual</literal> is used to mark a package as being manually " "installed, which will prevent the package from being automatically removed " "if no other packages depend on it." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:84 -msgid "showauto" +#: apt-mark.8.xml:85 +msgid "hold" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:85 +#: apt-mark.8.xml:86 msgid "" -"<literal>showauto</literal> is used to print a list of automatically " -"installed packages with each package on a new line." +"<literal>hold</literal> is used to mark a package as hold back, which will " +"prevent the package from being automatically installed, upgraded or " +"removed. The command is only a wrapper around <command>dpkg --set-" +"selections</command> and the state is therefore maintained by &dpkg; and not " +"effected by the <option>--filename</option> option." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:95 +msgid "unhold" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-mark.8.xml:96 msgid "" -"<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>" +"<literal>unhold</literal> is used to cancel a previously set hold on a " +"package to allow all actions again." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:97 -msgid "" -"<option>--file=<filename><replaceable>FILENAME</replaceable></filename></" -"option>" +#: apt-mark.8.xml:101 +msgid "showauto" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:100 +#: apt-mark.8.xml:102 msgid "" -"Read/Write package stats from <filename><replaceable>FILENAME</replaceable></" -"filename> instead of the default location, which is " -"<filename>extended_status</filename> in the directory defined by the " -"Configuration Item: <literal>Dir::State</literal>." +"<literal>showauto</literal> is used to print a list of automatically " +"installed packages with each package on a new line. All automatically " +"installed packages will be listed if no package is given. If packages are " +"given only those which are automatically installed will be shown." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:106 -msgid "<option>-h</option>" +#: apt-mark.8.xml:109 +msgid "showmanual" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:110 +msgid "" +"<literal>showmanual</literal> can be used in the same way as " +"<literal>showauto</literal> except that it will print a list of manually " +"installed packages instead." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:107 -msgid "<option>--help</option>" +#: apt-mark.8.xml:116 +msgid "showhold" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:108 -msgid "Show a short usage summary." +#: apt-mark.8.xml:117 +msgid "" +"<literal>showhold</literal> is used to print a list of packages on hold in " +"the same way as for the other show commands." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:114 -msgid "<option>-v</option>" +#: apt-mark.8.xml:130 +msgid "" +"<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:115 -msgid "<option>--version</option>" +#: apt-mark.8.xml:131 +msgid "" +"<option>--file=<filename><replaceable>FILENAME</replaceable></filename></" +"option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:116 -msgid "Show the program version." +#: apt-mark.8.xml:134 +msgid "" +"Read/Write package stats from <filename><replaceable>FILENAME</replaceable></" +"filename> instead of the default location, which is " +"<filename>extended_status</filename> in the directory defined by the " +"Configuration Item: <literal>Dir::State</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt-mark.8.xml:127 +#: apt-mark.8.xml:146 msgid " &file-extended_states;" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:132 +#: apt-mark.8.xml:151 msgid "&apt-get;,&aptitude;,&apt-conf;" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:136 +#: apt-mark.8.xml:155 msgid "" "<command>apt-mark</command> returns zero on normal operation, non-zero on " "error." @@ -5833,39 +5880,44 @@ msgstr "" #: apt_preferences.5.xml:107 msgid "" "to the versions coming from archives which in their <filename>Release</" -"filename> files are marked as \"NotAutomatic: yes\" like the debian " -"experimental archive." +"filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</" +"emphasis> as \"ButAutomaticUpgrades: yes\" like the debian " +"<literal>experimental</literal> archive." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:112 +#: apt_preferences.5.xml:113 msgid "priority 100" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:113 -msgid "to the version that is already installed (if any)." +#: apt_preferences.5.xml:114 +msgid "" +"to the version that is already installed (if any) and to the versions coming " +"from archives which in their <filename>Release</filename> files are marked " +"as \"NotAutomatic: yes\" and \"ButAutomaticUpgrades: yes\" like the debian " +"backports archive since <literal>squeeze-backports</literal>." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:117 +#: apt_preferences.5.xml:121 msgid "priority 500" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:118 +#: apt_preferences.5.xml:122 msgid "" "to the versions that are not installed and do not belong to the target " "release." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:122 +#: apt_preferences.5.xml:126 msgid "priority 990" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:123 +#: apt_preferences.5.xml:127 msgid "" "to the versions that are not installed and belong to the target release." msgstr "" @@ -5879,24 +5931,25 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:128 +#: apt_preferences.5.xml:132 msgid "" "If the target release has not been specified then APT simply assigns " "priority 100 to all installed package versions and priority 500 to all " -"uninstalled package versions, expect versions coming from archives which in " +"uninstalled package versions, except versions coming from archives which in " "their <filename>Release</filename> files are marked as \"NotAutomatic: yes\" " -"- these versions get the priority 1." +"- these versions get the priority 1 or priority 100 if it is additionally " +"marked as \"ButAutomaticUpgrades: yes\"." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:134 +#: apt_preferences.5.xml:139 msgid "" "APT then applies the following rules, listed in order of precedence, to " "determine which version of a package to install." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:137 +#: apt_preferences.5.xml:142 msgid "" "Never downgrade unless the priority of an available version exceeds 1000. " "(\"Downgrading\" is installing a less recent version of a package in place " @@ -5906,19 +5959,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:143 +#: apt_preferences.5.xml:148 msgid "Install the highest priority version." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:144 +#: apt_preferences.5.xml:149 msgid "" "If two or more versions have the same priority, install the most recent one " "(that is, the one with the higher version number)." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:147 +#: apt_preferences.5.xml:152 msgid "" "If two or more versions have the same priority and version number but either " "the packages differ in some of their metadata or the <literal>--reinstall</" @@ -5926,7 +5979,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:153 +#: apt_preferences.5.xml:158 msgid "" "In a typical situation, the installed version of a package (priority 100) " "is not as recent as one of the versions available from the sources listed in " @@ -5936,7 +5989,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:160 +#: apt_preferences.5.xml:165 msgid "" "More rarely, the installed version of a package is <emphasis>more</emphasis> " "recent than any of the other available versions. The package will not be " @@ -5945,7 +5998,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:165 +#: apt_preferences.5.xml:170 msgid "" "Sometimes the installed version of a package is more recent than the version " "belonging to the target release, but not as recent as a version belonging to " @@ -5957,12 +6010,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:174 +#: apt_preferences.5.xml:179 msgid "The Effect of APT Preferences" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:176 +#: apt_preferences.5.xml:181 msgid "" "The APT preferences file allows the system administrator to control the " "assignment of priorities. The file consists of one or more multi-line " @@ -5971,7 +6024,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:182 +#: apt_preferences.5.xml:187 msgid "" "The specific form assigns a priority (a \"Pin-Priority\") to one or more " "specified packages and specified version or version range. For example, the " @@ -5981,7 +6034,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:189 +#: apt_preferences.5.xml:194 #, no-wrap msgid "" "Package: perl\n" @@ -5990,7 +6043,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:195 +#: apt_preferences.5.xml:200 msgid "" "The general form assigns a priority to all of the package versions in a " "given distribution (that is, to all the versions of packages that are listed " @@ -6000,7 +6053,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:201 +#: apt_preferences.5.xml:206 msgid "" "This general-form entry in the APT preferences file applies only to groups " "of packages. For example, the following record assigns a high priority to " @@ -6008,7 +6061,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:206 +#: apt_preferences.5.xml:211 #, no-wrap msgid "" "Package: *\n" @@ -6017,7 +6070,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:211 +#: apt_preferences.5.xml:216 msgid "" "A note of caution: the keyword used here is \"<literal>origin</literal>\" " "which can be used to match a hostname. The following record will assign a " @@ -6026,7 +6079,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:215 +#: apt_preferences.5.xml:220 #, no-wrap msgid "" "Package: *\n" @@ -6035,7 +6088,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:219 +#: apt_preferences.5.xml:224 msgid "" "This should <emphasis>not</emphasis> be confused with the Origin of a " "distribution as specified in a <filename>Release</filename> file. What " @@ -6045,7 +6098,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:224 +#: apt_preferences.5.xml:229 msgid "" "The following record assigns a low priority to all package versions " "belonging to any distribution whose Archive name is \"<literal>unstable</" @@ -6053,7 +6106,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:228 +#: apt_preferences.5.xml:233 #, no-wrap msgid "" "Package: *\n" @@ -6062,7 +6115,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:233 +#: apt_preferences.5.xml:238 msgid "" "The following record assigns a high priority to all package versions " "belonging to any distribution whose Codename is \"<literal>&testing-codename;" @@ -6070,7 +6123,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:237 +#: apt_preferences.5.xml:242 #, no-wrap msgid "" "Package: *\n" @@ -6079,7 +6132,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:242 +#: apt_preferences.5.xml:247 msgid "" "The following record assigns a high priority to all package versions " "belonging to any release whose Archive name is \"<literal>stable</literal>\" " @@ -6087,7 +6140,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:247 +#: apt_preferences.5.xml:252 #, no-wrap msgid "" "Package: *\n" @@ -6096,82 +6149,133 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:258 +#: apt_preferences.5.xml:262 +msgid "Regular expressions and glob() syntax" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:264 +msgid "" +"APT also supports pinning by glob() expressions and regular expressions " +"surrounded by /. For example, the following example assigns the priority 500 " +"to all packages from experimental where the name starts with gnome (as a glob" +"()-like expression or contains the word kde (as a POSIX extended regular " +"expression surrounded by slashes)." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><programlisting> +#: apt_preferences.5.xml:273 +#, no-wrap +msgid "" +"Package: gnome* /kde/\n" +"Pin: release n=experimental\n" +"Pin-Priority: 500\n" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:279 +msgid "" +"The rule for those expressions is that they can occur anywhere where a " +"string can occur. Those, the following pin assigns the priority 990 to all " +"packages from a release starting with karmic." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><programlisting> +#: apt_preferences.5.xml:285 +#, no-wrap +msgid "" +"Package: *\n" +"Pin: release n=karmic*\n" +"Pin-Priority: 990\n" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><literal> +#: apt_preferences.5.xml:290 +msgid "Package" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><literal> +#: apt_preferences.5.xml:296 +msgid "*" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt_preferences.5.xml:306 msgid "How APT Interprets Priorities" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:266 +#: apt_preferences.5.xml:314 msgid "P > 1000" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:267 +#: apt_preferences.5.xml:315 msgid "" "causes a version to be installed even if this constitutes a downgrade of the " "package" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:271 +#: apt_preferences.5.xml:319 msgid "990 < P <=1000" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:272 +#: apt_preferences.5.xml:320 msgid "" "causes a version to be installed even if it does not come from the target " "release, unless the installed version is more recent" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:277 +#: apt_preferences.5.xml:325 msgid "500 < P <=990" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:278 +#: apt_preferences.5.xml:326 msgid "" "causes a version to be installed unless there is a version available " "belonging to the target release or the installed version is more recent" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:283 +#: apt_preferences.5.xml:331 msgid "100 < P <=500" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:284 +#: apt_preferences.5.xml:332 msgid "" "causes a version to be installed unless there is a version available " "belonging to some other distribution or the installed version is more recent" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:289 +#: apt_preferences.5.xml:337 msgid "0 < P <=100" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:290 +#: apt_preferences.5.xml:338 msgid "" "causes a version to be installed only if there is no installed version of " "the package" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:294 +#: apt_preferences.5.xml:342 msgid "P < 0" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:295 +#: apt_preferences.5.xml:343 msgid "prevents the version from being installed" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:261 +#: apt_preferences.5.xml:309 msgid "" "Priorities (P) assigned in the APT preferences file must be positive or " "negative integers. They are interpreted as follows (roughly speaking): " @@ -6179,7 +6283,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:300 +#: apt_preferences.5.xml:348 msgid "" "If any specific-form records match an available package version then the " "first such record determines the priority of the package version. Failing " @@ -6188,14 +6292,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:306 +#: apt_preferences.5.xml:354 msgid "" "For example, suppose the APT preferences file contains the three records " "presented earlier:" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><programlisting> -#: apt_preferences.5.xml:310 +#: apt_preferences.5.xml:358 #, no-wrap msgid "" "Package: perl\n" @@ -6212,12 +6316,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:323 +#: apt_preferences.5.xml:371 msgid "Then:" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:325 +#: apt_preferences.5.xml:373 msgid "" "The most recent available version of the <literal>perl</literal> package " "will be installed, so long as that version's version number begins with " @@ -6227,7 +6331,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:330 +#: apt_preferences.5.xml:378 msgid "" "A version of any package other than <literal>perl</literal> that is " "available from the local system has priority over other versions, even " @@ -6235,7 +6339,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:334 +#: apt_preferences.5.xml:382 msgid "" "A version of a package whose origin is not the local system but some other " "site listed in &sources-list; and which belongs to an <literal>unstable</" @@ -6244,12 +6348,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:344 +#: apt_preferences.5.xml:392 msgid "Determination of Package Version and Distribution Properties" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:346 +#: apt_preferences.5.xml:394 msgid "" "The locations listed in the &sources-list; file should provide " "<filename>Packages</filename> and <filename>Release</filename> files to " @@ -6257,27 +6361,27 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:358 +#: apt_preferences.5.xml:406 msgid "the <literal>Package:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:359 +#: apt_preferences.5.xml:407 msgid "gives the package name" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:362 apt_preferences.5.xml:412 +#: apt_preferences.5.xml:410 apt_preferences.5.xml:460 msgid "the <literal>Version:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:363 +#: apt_preferences.5.xml:411 msgid "gives the version number for the named package" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:350 +#: apt_preferences.5.xml:398 msgid "" "The <filename>Packages</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable>/" @@ -6290,12 +6394,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:379 +#: apt_preferences.5.xml:427 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:380 +#: apt_preferences.5.xml:428 msgid "" "names the archive to which all the packages in the directory tree belong. " "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies " @@ -6306,18 +6410,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:390 +#: apt_preferences.5.xml:438 #, no-wrap msgid "Pin: release a=stable\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:396 +#: apt_preferences.5.xml:444 msgid "the <literal>Codename:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:397 +#: apt_preferences.5.xml:445 msgid "" "names the codename to which all the packages in the directory tree belong. " "For example, the line \"Codename: &testing-codename;\" specifies that all of " @@ -6328,13 +6432,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:406 +#: apt_preferences.5.xml:454 #, no-wrap msgid "Pin: release n=&testing-codename;\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:413 +#: apt_preferences.5.xml:461 msgid "" "names the release version. For example, the packages in the tree might " "belong to Debian GNU/Linux release version 3.0. Note that there is normally " @@ -6344,7 +6448,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:422 +#: apt_preferences.5.xml:470 #, no-wrap msgid "" "Pin: release v=3.0\n" @@ -6353,12 +6457,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:431 +#: apt_preferences.5.xml:479 msgid "the <literal>Component:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:432 +#: apt_preferences.5.xml:480 msgid "" "names the licensing component associated with the packages in the directory " "tree of the <filename>Release</filename> file. For example, the line " @@ -6369,18 +6473,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:441 +#: apt_preferences.5.xml:489 #, no-wrap msgid "Pin: release c=main\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:447 +#: apt_preferences.5.xml:495 msgid "the <literal>Origin:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:448 +#: apt_preferences.5.xml:496 msgid "" "names the originator of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@ -6389,18 +6493,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:454 +#: apt_preferences.5.xml:502 #, no-wrap msgid "Pin: release o=Debian\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:460 +#: apt_preferences.5.xml:508 msgid "the <literal>Label:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:461 +#: apt_preferences.5.xml:509 msgid "" "names the label of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@ -6409,13 +6513,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:467 +#: apt_preferences.5.xml:515 #, no-wrap msgid "Pin: release l=Debian\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:368 +#: apt_preferences.5.xml:416 msgid "" "The <filename>Release</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for " @@ -6429,7 +6533,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:474 +#: apt_preferences.5.xml:522 msgid "" "All of the <filename>Packages</filename> and <filename>Release</filename> " "files retrieved from locations listed in the &sources-list; file are stored " @@ -6444,12 +6548,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:487 +#: apt_preferences.5.xml:535 msgid "Optional Lines in an APT Preferences Record" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:489 +#: apt_preferences.5.xml:537 msgid "" "Each record in the APT preferences file can optionally begin with one or " "more lines beginning with the word <literal>Explanation:</literal>. This " @@ -6457,12 +6561,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:498 +#: apt_preferences.5.xml:546 msgid "Tracking Stable" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:506 +#: apt_preferences.5.xml:554 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated\n" @@ -6477,7 +6581,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:500 +#: apt_preferences.5.xml:548 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -6487,8 +6591,8 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:523 apt_preferences.5.xml:569 -#: apt_preferences.5.xml:627 +#: apt_preferences.5.xml:571 apt_preferences.5.xml:617 +#: apt_preferences.5.xml:675 #, no-wrap msgid "" "apt-get install <replaceable>package-name</replaceable>\n" @@ -6497,7 +6601,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:518 +#: apt_preferences.5.xml:566 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@ -6506,13 +6610,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:535 +#: apt_preferences.5.xml:583 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/testing\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:529 +#: apt_preferences.5.xml:577 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>testing</literal> distribution; the package " @@ -6521,12 +6625,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:541 +#: apt_preferences.5.xml:589 msgid "Tracking Testing or Unstable" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:550 +#: apt_preferences.5.xml:598 #, no-wrap msgid "" "Package: *\n" @@ -6543,7 +6647,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:543 +#: apt_preferences.5.xml:591 msgid "" "The following APT preferences file will cause APT to assign a high priority " "to package versions from the <literal>testing</literal> distribution, a " @@ -6554,7 +6658,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:564 +#: apt_preferences.5.xml:612 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@ -6563,13 +6667,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:584 +#: apt_preferences.5.xml:632 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/unstable\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:575 +#: apt_preferences.5.xml:623 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>unstable</literal> distribution. " @@ -6581,12 +6685,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:591 +#: apt_preferences.5.xml:639 msgid "Tracking the evolution of a codename release" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:605 +#: apt_preferences.5.xml:653 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated package versions\n" @@ -6606,7 +6710,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:593 +#: apt_preferences.5.xml:641 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -6621,7 +6725,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:622 +#: apt_preferences.5.xml:670 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest version(s) in " @@ -6630,13 +6734,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:642 +#: apt_preferences.5.xml:690 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/sid\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:633 +#: apt_preferences.5.xml:681 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>sid</literal> distribution. Thereafter, " @@ -6648,12 +6752,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt_preferences.5.xml:651 +#: apt_preferences.5.xml:699 msgid "&file-preferences;" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt_preferences.5.xml:657 +#: apt_preferences.5.xml:705 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;" msgstr "" diff --git a/doc/po/ja.po b/doc/po/ja.po index 3a0db1bbf..839242cc8 100644 --- a/doc/po/ja.po +++ b/doc/po/ja.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.25.3\n" -"POT-Creation-Date: 2011-02-14 13:42+0100\n" +"POT-Creation-Date: 2011-06-08 16:54+0300\n" "PO-Revision-Date: 2010-09-07 07:38+0900\n" "Last-Translator: KURASAWA Nozomu <nabetaro@caldron.jp>\n" "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n" @@ -792,7 +792,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50 #: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:114 -#: apt-key.8.xml:38 apt-mark.8.xml:55 apt-secure.8.xml:43 +#: apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43 #: apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36 #: sources.list.5.xml:36 msgid "Description" @@ -1329,7 +1329,7 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59 -#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:92 +#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:126 #: apt-sortpkgs.1.xml:57 apt.conf.5.xml:560 apt.conf.5.xml:582 msgid "options" msgstr "オプション" @@ -1357,7 +1357,7 @@ msgstr "" "pkgcache</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:288 apt-ftparchive.1.xml:568 apt-get.8.xml:393 +#: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393 #: apt-sortpkgs.1.xml:61 msgid "<option>-s</option>" msgstr "<option>-s</option>" @@ -1384,12 +1384,12 @@ msgstr "" "<literal>Dir::Cache::srcpkgcache</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:296 apt-ftparchive.1.xml:542 apt-get.8.xml:383 +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 msgid "<option>-q</option>" msgstr "<option>-q</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:296 apt-ftparchive.1.xml:542 apt-get.8.xml:383 +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 msgid "<option>--quiet</option>" msgstr "<option>--quiet</option>" @@ -1505,7 +1505,7 @@ msgstr "" "ShowFull</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:580 +#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583 msgid "<option>-a</option>" msgstr "<option>-a</option>" @@ -1627,15 +1627,15 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><variablelist> #: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101 -#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608 apt-get.8.xml:570 -#: apt-sortpkgs.1.xml:67 +#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570 +#: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67 msgid "&apt-commonoptions;" msgstr "&apt-commonoptions;" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:156 apt-mark.8.xml:125 -#: apt.conf.5.xml:1093 apt_preferences.5.xml:649 +#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:172 apt-mark.8.xml:144 +#: apt.conf.5.xml:1093 apt_preferences.5.xml:697 msgid "Files" msgstr "ファイル" @@ -1647,9 +1647,9 @@ msgstr "&file-sourceslist; &file-statelists;" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106 -#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:624 apt-get.8.xml:585 -#: apt-key.8.xml:177 apt-mark.8.xml:131 apt-secure.8.xml:185 -#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:656 +#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585 +#: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185 +#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704 #: sources.list.5.xml:234 msgid "See Also" msgstr "関連項目" @@ -1663,8 +1663,8 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111 -#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:628 apt-get.8.xml:591 -#: apt-mark.8.xml:135 apt-sortpkgs.1.xml:76 +#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591 +#: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76 msgid "Diagnostics" msgstr "診断メッセージ" @@ -1800,12 +1800,12 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: apt-cdrom.8.xml:94 apt-key.8.xml:142 +#: apt-cdrom.8.xml:94 apt-key.8.xml:158 msgid "Options" msgstr "オプション" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:536 apt-get.8.xml:345 +#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345 msgid "<option>-d</option>" msgstr "<option>-d</option>" @@ -2075,7 +2075,7 @@ msgstr "設定箇所の内容を表示するだけです。" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:625 +#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628 #: apt-sortpkgs.1.xml:73 msgid "&apt-conf;" msgstr "&apt-conf;" @@ -3286,29 +3286,49 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-ftparchive.1.xml:529 -msgid "<option>--md5</option>" -msgstr "<option>--md5</option>" +msgid "" +"<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>" +msgstr "" -# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:531 -msgid "" -"Generate MD5 sums. This defaults to on, when turned off the generated index " -"files will not have MD5Sum fields where possible. Configuration Item: " -"<literal>APT::FTPArchive::MD5</literal>" +#, fuzzy +#| msgid "" +#| "Values for the additional metadata fields in the Release file are taken " +#| "from the corresponding variables under <literal>APT::FTPArchive::Release</" +#| "literal>, e.g. <literal>APT::FTPArchive::Release::Origin</literal>. The " +#| "supported fields are: <literal>Origin</literal>, <literal>Label</" +#| "literal>, <literal>Suite</literal>, <literal>Version</literal>, " +#| "<literal>Codename</literal>, <literal>Date</literal>, <literal>Valid-" +#| "Until</literal>, <literal>Architectures</literal>, <literal>Components</" +#| "literal>, <literal>Description</literal>." +msgid "" +"Generate the given checksum. These options default to on, when turned off " +"the generated index files will not have the checksum fields where possible. " +"Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</" +"replaceable></literal> and <literal>APT::FTPArchive::<replaceable>Index</" +"replaceable>::<replaceable>Checksum</replaceable></literal> where " +"<literal>Index</literal> can be <literal>Packages</literal>, " +"<literal>Sources</literal> or <literal>Release</literal> and " +"<literal>Checksum</literal> can be <literal>MD5</literal>, <literal>SHA1</" +"literal> or <literal>SHA256</literal>." msgstr "" -"MD5 sum を生成します。デフォルトで on になっており、off にすると生成したイン" -"デックスファイルに MD5Sum フィールドがありません。設定項目 - <literal>APT::" -"FTPArchive::MD5</literal>" +"Release ファイルの追加メタデータフィールドの値は、<literal>APT::FTPArchive::" +"Release</literal> 以下の相当する値 (例: <literal>APT::FTPArchive::Release::" +"Origin</literal>) をとります。サポートするフィールドは、<literal>Origin</" +"literal>, <literal>Label</literal>, <literal>Suite</literal>, " +"<literal>Version</literal>, <literal>Codename</literal>, <literal>Date</" +"literal>, <literal>Valid-Until</literal>, <literal>Architectures</literal>, " +"<literal>Components</literal>, <literal>Description</literal> です。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:536 +#: apt-ftparchive.1.xml:539 msgid "<option>--db</option>" msgstr "<option>--db</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:538 +#: apt-ftparchive.1.xml:541 msgid "" "Use a binary caching DB. This has no effect on the generate command. " "Configuration Item: <literal>APT::FTPArchive::DB</literal>." @@ -3318,7 +3338,7 @@ msgstr "" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:544 +#: apt-ftparchive.1.xml:547 msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quiet up to a maximum of 2. You can also use " @@ -3331,13 +3351,13 @@ msgstr "" "<literal>quiet</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:550 +#: apt-ftparchive.1.xml:553 msgid "<option>--delink</option>" msgstr "<option>--delink</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:552 +#: apt-ftparchive.1.xml:555 msgid "" "Perform Delinking. If the <literal>External-Links</literal> setting is used " "then this option actually enables delinking of the files. It defaults to on " @@ -3350,13 +3370,13 @@ msgstr "" "<literal>APT::FTPArchive::DeLinkAct</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:558 +#: apt-ftparchive.1.xml:561 msgid "<option>--contents</option>" msgstr "<option>--contents</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:560 +#: apt-ftparchive.1.xml:563 msgid "" "Perform contents generation. When this option is set and package indexes are " "being generated with a cache DB then the file listing will also be extracted " @@ -3371,13 +3391,13 @@ msgstr "" "<literal>APT::FTPArchive::Contents</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:568 +#: apt-ftparchive.1.xml:571 msgid "<option>--source-override</option>" msgstr "<option>--source-override</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:570 +#: apt-ftparchive.1.xml:573 msgid "" "Select the source override file to use with the <literal>sources</literal> " "command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</" @@ -3387,13 +3407,13 @@ msgstr "" "選択します。設定項目 - <literal>APT::FTPArchive::SourceOverride</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:574 +#: apt-ftparchive.1.xml:577 msgid "<option>--readonly</option>" msgstr "<option>--readonly</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:576 +#: apt-ftparchive.1.xml:579 msgid "" "Make the caching databases read only. Configuration Item: <literal>APT::" "FTPArchive::ReadOnlyDB</literal>." @@ -3402,13 +3422,13 @@ msgstr "" "FTPArchive::ReadOnlyDB</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:580 +#: apt-ftparchive.1.xml:583 msgid "<option>--arch</option>" msgstr "<option>--arch</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:581 +#: apt-ftparchive.1.xml:584 #, fuzzy msgid "" "Accept in the <literal>packages</literal> and <literal>contents</literal> " @@ -3422,12 +3442,12 @@ msgstr "" "literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:587 +#: apt-ftparchive.1.xml:590 msgid "<option>APT::FTPArchive::AlwaysStat</option>" msgstr "<option>--version</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:589 +#: apt-ftparchive.1.xml:592 msgid "" "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If " "packages are recompiled and/or republished with the same version again, this " @@ -3441,12 +3461,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:599 +#: apt-ftparchive.1.xml:602 msgid "<option>APT::FTPArchive::LongDescription</option>" msgstr "<option>APT::FTPArchive::LongDescription</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:601 +#: apt-ftparchive.1.xml:604 #, fuzzy msgid "" "This configuration option defaults to \"<literal>true</literal>\" and should " @@ -3462,14 +3482,14 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:613 apt.conf.5.xml:1087 apt_preferences.5.xml:496 +#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:544 #: sources.list.5.xml:198 msgid "Examples" msgstr "サンプル" # type: Content of: <refentry><refsect1><para><programlisting> #. type: Content of: <refentry><refsect1><para><programlisting> -#: apt-ftparchive.1.xml:619 +#: apt-ftparchive.1.xml:622 #, no-wrap msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" msgstr "" @@ -3478,7 +3498,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:615 +#: apt-ftparchive.1.xml:618 msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" @@ -3488,7 +3508,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:629 +#: apt-ftparchive.1.xml:632 msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@ -4864,8 +4884,24 @@ msgstr "" "Debian アーカイブキーで、ローカルキーリングを更新し、もう有効でないキーをキー" "リングから削除します。" +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:140 +#, fuzzy +#| msgid "update" +msgid "net-update" +msgstr "update" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:144 +msgid "" +"Update the local keyring with the keys of a key server and removes from the " +"keyring the archive keys which are no longer valid. This requires an " +"installed wget and an APT build configured to have a server to fetch from. " +"APT in Debian does not support this command, but Ubuntu's APT does." +msgstr "" + #. type: Content of: <refentry><refsect1><para> -#: apt-key.8.xml:143 +#: apt-key.8.xml:159 msgid "" "Note that options need to be defined before the commands described in the " "previous section." @@ -4875,12 +4911,12 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:145 +#: apt-key.8.xml:161 msgid "--keyring <replaceable>filename</replaceable>" msgstr "--keyring <replaceable>filename</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:146 +#: apt-key.8.xml:162 msgid "" "With this option it is possible to specify a specific keyring file the " "command should operate on. The default is that a command is executed on the " @@ -4896,35 +4932,35 @@ msgstr "" "加されます。" #. type: Content of: <refentry><refsect1><variablelist> -#: apt-key.8.xml:159 +#: apt-key.8.xml:175 msgid "&file-trustedgpg;" msgstr "&file-trustedgpg;" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:161 +#: apt-key.8.xml:177 msgid "<filename>/etc/apt/trustdb.gpg</filename>" msgstr "<filename>/etc/apt/trustdb.gpg</filename>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:162 +#: apt-key.8.xml:178 msgid "Local trust database of archive keys." msgstr "アーカイブキーのローカル信頼データベースです。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:165 +#: apt-key.8.xml:181 msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:166 +#: apt-key.8.xml:182 msgid "Keyring of Debian archive trusted keys." msgstr "Debian アーカイブ信頼キーのキーリングです。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:169 +#: apt-key.8.xml:185 msgid "" "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" msgstr "" @@ -4932,22 +4968,26 @@ msgstr "" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:170 +#: apt-key.8.xml:186 msgid "Keyring of Debian archive removed trusted keys." msgstr "削除された Debian アーカイブ信頼キーのキーリングです。" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt-key.8.xml:179 +#: apt-key.8.xml:195 msgid "&apt-get;, &apt-secure;" msgstr "&apt-get;, &apt-secure;" #. The last update date #. type: Content of: <refentry><refentryinfo> #: apt-mark.8.xml:16 +#, fuzzy +#| msgid "" +#| "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 " +#| "August 2009</date>" msgid "" -"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 " -"August 2009</date>" +"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>21 " +"April 2011</date>" msgstr "" "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 " "August 2009</date>" @@ -4967,13 +5007,22 @@ msgstr "パッケージが自動的にインストールされたかどうかの # type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> #: apt-mark.8.xml:39 +#, fuzzy +#| msgid "" +#| " <command>apt-mark</command> <arg><option>-hv</option></arg> " +#| "<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> <group " +#| "choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg " +#| "choice=\"plain\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </" +#| "group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>package</" +#| "replaceable></arg> </arg> <arg choice=\"plain\">showauto</arg> </group>" msgid "" " <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-" "f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain" "\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain" -"\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </group> <arg " +"\">auto</arg> <arg choice=\"plain\">manual</arg> <arg choice=\"plain" +"\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </group> <arg " "choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </" -"arg> <arg choice=\"plain\">showauto</arg> </group>" +"arg> </group>" msgstr "" " <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-" "f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain" @@ -4984,7 +5033,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:56 +#: apt-mark.8.xml:57 msgid "" "<command>apt-mark</command> will change whether a package has been marked as " "being automatically installed." @@ -4994,7 +5043,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:60 +#: apt-mark.8.xml:61 msgid "" "When you request that a package is installed, and as a result other packages " "are installed to satisfy its dependencies, the dependencies are marked as " @@ -5009,15 +5058,22 @@ msgstr "" "command> や <command>aptitude</command> により削除されます。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:68 -msgid "markauto" +#: apt-mark.8.xml:69 +#, fuzzy +#| msgid "markauto" +msgid "auto" msgstr "markauto" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:69 +#: apt-mark.8.xml:70 +#, fuzzy +#| msgid "" +#| "<literal>markauto</literal> is used to mark a package as being " +#| "automatically installed, which will cause the package to be removed when " +#| "no more manually installed packages depend on this package." msgid "" -"<literal>markauto</literal> is used to mark a package as being automatically " +"<literal>auto</literal> is used to mark a package as being automatically " "installed, which will cause the package to be removed when no more manually " "installed packages depend on this package." msgstr "" @@ -5026,15 +5082,20 @@ msgstr "" "なくなると、このパッケージを削除します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:76 -msgid "unmarkauto" -msgstr "unmarkauto" +#: apt-mark.8.xml:77 +msgid "manual" +msgstr "" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:77 +#: apt-mark.8.xml:78 +#, fuzzy +#| msgid "" +#| "<literal>unmarkauto</literal> is used to mark a package as being manually " +#| "installed, which will prevent the package from being automatically " +#| "removed if no other packages depend on it." msgid "" -"<literal>unmarkauto</literal> is used to mark a package as being manually " +"<literal>manual</literal> is used to mark a package as being manually " "installed, which will prevent the package from being automatically removed " "if no other packages depend on it." msgstr "" @@ -5043,29 +5104,105 @@ msgstr "" "ケージを自動的に削除するのを防ぎます。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:84 +#: apt-mark.8.xml:85 +msgid "hold" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:86 +msgid "" +"<literal>hold</literal> is used to mark a package as hold back, which will " +"prevent the package from being automatically installed, upgraded or " +"removed. The command is only a wrapper around <command>dpkg --set-" +"selections</command> and the state is therefore maintained by &dpkg; and not " +"effected by the <option>--filename</option> option." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:95 +msgid "unhold" +msgstr "" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:96 +#, fuzzy +#| msgid "" +#| "<literal>showauto</literal> is used to print a list of automatically " +#| "installed packages with each package on a new line." +msgid "" +"<literal>unhold</literal> is used to cancel a previously set hold on a " +"package to allow all actions again." +msgstr "" +"<literal>showauto</literal> は、自動的にインストールされたパッケージを、パッ" +"ケージごとに改行して表示します。" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:101 msgid "showauto" msgstr "showauto" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:85 +#: apt-mark.8.xml:102 +#, fuzzy +#| msgid "" +#| "<literal>showauto</literal> is used to print a list of automatically " +#| "installed packages with each package on a new line." msgid "" "<literal>showauto</literal> is used to print a list of automatically " -"installed packages with each package on a new line." +"installed packages with each package on a new line. All automatically " +"installed packages will be listed if no package is given. If packages are " +"given only those which are automatically installed will be shown." msgstr "" "<literal>showauto</literal> は、自動的にインストールされたパッケージを、パッ" "ケージごとに改行して表示します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:96 +#: apt-mark.8.xml:109 +#, fuzzy +#| msgid "showauto" +msgid "showmanual" +msgstr "showauto" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:110 +msgid "" +"<literal>showmanual</literal> can be used in the same way as " +"<literal>showauto</literal> except that it will print a list of manually " +"installed packages instead." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:116 +#, fuzzy +#| msgid "showauto" +msgid "showhold" +msgstr "showauto" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:117 +#, fuzzy +#| msgid "" +#| "<literal>showauto</literal> is used to print a list of automatically " +#| "installed packages with each package on a new line." +msgid "" +"<literal>showhold</literal> is used to print a list of packages on hold in " +"the same way as for the other show commands." +msgstr "" +"<literal>showauto</literal> は、自動的にインストールされたパッケージを、パッ" +"ケージごとに改行して表示します。" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:130 msgid "" "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>" msgstr "" "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:97 +#: apt-mark.8.xml:131 msgid "" "<option>--file=<filename><replaceable>FILENAME</replaceable></filename></" "option>" @@ -5075,7 +5212,7 @@ msgstr "" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:100 +#: apt-mark.8.xml:134 msgid "" "Read/Write package stats from <filename><replaceable>FILENAME</replaceable></" "filename> instead of the default location, which is " @@ -5086,52 +5223,20 @@ msgstr "" "トリの <filename>extended_status</filename>) に代えて、<filename>FILENAME</" "filename> からパッケージの統計を読み書きします。" -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:106 -msgid "<option>-h</option>" -msgstr "<option>-h</option>" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:107 -msgid "<option>--help</option>" -msgstr "<option>--help</option>" - -# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:108 -msgid "Show a short usage summary." -msgstr "短い使用方法を表示します。" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:114 -msgid "<option>-v</option>" -msgstr "<option>-v</option>" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:115 -msgid "<option>--version</option>" -msgstr "<option>--version</option>" - -# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:116 -msgid "Show the program version." -msgstr "プログラムのバージョン情報を表示します" - #. type: Content of: <refentry><refsect1><variablelist> -#: apt-mark.8.xml:127 +#: apt-mark.8.xml:146 msgid " &file-extended_states;" msgstr " &file-extended_states;" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:132 +#: apt-mark.8.xml:151 msgid "&apt-get;,&aptitude;,&apt-conf;" msgstr "&apt-get;,&aptitude;,&apt-conf;" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:136 +#: apt-mark.8.xml:155 msgid "" "<command>apt-mark</command> returns zero on normal operation, non-zero on " "error." @@ -7854,31 +7959,35 @@ msgstr "priority 1" #: apt_preferences.5.xml:107 msgid "" "to the versions coming from archives which in their <filename>Release</" -"filename> files are marked as \"NotAutomatic: yes\" like the debian " -"experimental archive." +"filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</" +"emphasis> as \"ButAutomaticUpgrades: yes\" like the debian " +"<literal>experimental</literal> archive." msgstr "" # type: <tag></tag> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:112 +#: apt_preferences.5.xml:113 msgid "priority 100" msgstr "priority 100" -# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:113 -msgid "to the version that is already installed (if any)." -msgstr "(あるならば) 既にインストールされているバージョン。" +#: apt_preferences.5.xml:114 +msgid "" +"to the version that is already installed (if any) and to the versions coming " +"from archives which in their <filename>Release</filename> files are marked " +"as \"NotAutomatic: yes\" and \"ButAutomaticUpgrades: yes\" like the debian " +"backports archive since <literal>squeeze-backports</literal>." +msgstr "" # type: <tag></tag> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:117 +#: apt_preferences.5.xml:121 msgid "priority 500" msgstr "priority 500" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:118 +#: apt_preferences.5.xml:122 msgid "" "to the versions that are not installed and do not belong to the target " "release." @@ -7886,13 +7995,13 @@ msgstr "インストールされておらず、ターゲットリリースに含 # type: <tag></tag> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:122 +#: apt_preferences.5.xml:126 msgid "priority 990" msgstr "priority 990" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:123 +#: apt_preferences.5.xml:127 msgid "" "to the versions that are not installed and belong to the target release." msgstr "インストールされておらず、ターゲットリリースに含まれるバージョン。" @@ -7911,14 +8020,15 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:128 +#: apt_preferences.5.xml:132 #, fuzzy msgid "" "If the target release has not been specified then APT simply assigns " "priority 100 to all installed package versions and priority 500 to all " -"uninstalled package versions, expect versions coming from archives which in " +"uninstalled package versions, except versions coming from archives which in " "their <filename>Release</filename> files are marked as \"NotAutomatic: yes\" " -"- these versions get the priority 1." +"- these versions get the priority 1 or priority 100 if it is additionally " +"marked as \"ButAutomaticUpgrades: yes\"." msgstr "" "ターゲットリリースが指定されていなければ、APT は単純にインストールしている" "パッケージのバージョンには 100 を、インストールしていないパッケージのバージョ" @@ -7926,7 +8036,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:134 +#: apt_preferences.5.xml:139 msgid "" "APT then applies the following rules, listed in order of precedence, to " "determine which version of a package to install." @@ -7936,7 +8046,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:137 +#: apt_preferences.5.xml:142 msgid "" "Never downgrade unless the priority of an available version exceeds 1000. " "(\"Downgrading\" is installing a less recent version of a package in place " @@ -7952,13 +8062,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:143 +#: apt_preferences.5.xml:148 msgid "Install the highest priority version." msgstr "最も高い優先度のバージョンをインストールします。" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:144 +#: apt_preferences.5.xml:149 msgid "" "If two or more versions have the same priority, install the most recent one " "(that is, the one with the higher version number)." @@ -7968,7 +8078,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:147 +#: apt_preferences.5.xml:152 msgid "" "If two or more versions have the same priority and version number but either " "the packages differ in some of their metadata or the <literal>--reinstall</" @@ -7980,7 +8090,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:153 +#: apt_preferences.5.xml:158 msgid "" "In a typical situation, the installed version of a package (priority 100) " "is not as recent as one of the versions available from the sources listed in " @@ -7996,7 +8106,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:160 +#: apt_preferences.5.xml:165 msgid "" "More rarely, the installed version of a package is <emphasis>more</emphasis> " "recent than any of the other available versions. The package will not be " @@ -8010,7 +8120,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:165 +#: apt_preferences.5.xml:170 msgid "" "Sometimes the installed version of a package is more recent than the version " "belonging to the target release, but not as recent as a version belonging to " @@ -8030,13 +8140,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:174 +#: apt_preferences.5.xml:179 msgid "The Effect of APT Preferences" msgstr "APT 設定の効果" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:176 +#: apt_preferences.5.xml:181 msgid "" "The APT preferences file allows the system administrator to control the " "assignment of priorities. The file consists of one or more multi-line " @@ -8049,7 +8159,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:182 +#: apt_preferences.5.xml:187 msgid "" "The specific form assigns a priority (a \"Pin-Priority\") to one or more " "specified packages and specified version or version range. For example, the " @@ -8064,7 +8174,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:189 +#: apt_preferences.5.xml:194 #, no-wrap msgid "" "Package: perl\n" @@ -8078,7 +8188,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:195 +#: apt_preferences.5.xml:200 msgid "" "The general form assigns a priority to all of the package versions in a " "given distribution (that is, to all the versions of packages that are listed " @@ -8093,7 +8203,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:201 +#: apt_preferences.5.xml:206 msgid "" "This general-form entry in the APT preferences file applies only to groups " "of packages. For example, the following record assigns a high priority to " @@ -8105,7 +8215,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:206 +#: apt_preferences.5.xml:211 #, no-wrap msgid "" "Package: *\n" @@ -8118,7 +8228,7 @@ msgstr "" "\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:211 +#: apt_preferences.5.xml:216 msgid "" "A note of caution: the keyword used here is \"<literal>origin</literal>\" " "which can be used to match a hostname. The following record will assign a " @@ -8128,7 +8238,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:215 +#: apt_preferences.5.xml:220 #, no-wrap msgid "" "Package: *\n" @@ -8141,7 +8251,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:219 +#: apt_preferences.5.xml:224 #, fuzzy msgid "" "This should <emphasis>not</emphasis> be confused with the Origin of a " @@ -8158,7 +8268,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:224 +#: apt_preferences.5.xml:229 msgid "" "The following record assigns a low priority to all package versions " "belonging to any distribution whose Archive name is \"<literal>unstable</" @@ -8169,7 +8279,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:228 +#: apt_preferences.5.xml:233 #, no-wrap msgid "" "Package: *\n" @@ -8183,7 +8293,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:233 +#: apt_preferences.5.xml:238 #, fuzzy msgid "" "The following record assigns a high priority to all package versions " @@ -8195,7 +8305,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:237 +#: apt_preferences.5.xml:242 #, no-wrap msgid "" "Package: *\n" @@ -8208,7 +8318,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:242 +#: apt_preferences.5.xml:247 msgid "" "The following record assigns a high priority to all package versions " "belonging to any release whose Archive name is \"<literal>stable</literal>\" " @@ -8220,7 +8330,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:247 +#: apt_preferences.5.xml:252 #, no-wrap msgid "" "Package: *\n" @@ -8232,20 +8342,92 @@ msgstr "" "Pin-Priority: 500\n" "\n" +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt_preferences.5.xml:262 +msgid "Regular expressions and glob() syntax" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:264 +msgid "" +"APT also supports pinning by glob() expressions and regular expressions " +"surrounded by /. For example, the following example assigns the priority 500 " +"to all packages from experimental where the name starts with gnome (as a glob" +"()-like expression or contains the word kde (as a POSIX extended regular " +"expression surrounded by slashes)." +msgstr "" + +# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> +#. type: Content of: <refentry><refsect1><refsect2><programlisting> +#: apt_preferences.5.xml:273 +#, fuzzy, no-wrap +#| msgid "" +#| "Package: *\n" +#| "Pin: release a=unstable\n" +#| "Pin-Priority: 50\n" +msgid "" +"Package: gnome* /kde/\n" +"Pin: release n=experimental\n" +"Pin-Priority: 500\n" +msgstr "" +"Package: *\n" +"Pin: release a=unstable\n" +"Pin-Priority: 50\n" +"\n" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:279 +msgid "" +"The rule for those expressions is that they can occur anywhere where a " +"string can occur. Those, the following pin assigns the priority 990 to all " +"packages from a release starting with karmic." +msgstr "" + +# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> +#. type: Content of: <refentry><refsect1><refsect2><programlisting> +#: apt_preferences.5.xml:285 +#, fuzzy, no-wrap +#| msgid "" +#| "Package: *\n" +#| "Pin: release a=unstable\n" +#| "Pin-Priority: 50\n" +msgid "" +"Package: *\n" +"Pin: release n=karmic*\n" +"Pin-Priority: 990\n" +msgstr "" +"Package: *\n" +"Pin: release a=unstable\n" +"Pin-Priority: 50\n" +"\n" + +# type: <tag></tag> +#. type: Content of: <refentry><refsect1><refsect2><literal> +#: apt_preferences.5.xml:290 +#, fuzzy +#| msgid "Packages" +msgid "Package" +msgstr "Packages" + +#. type: Content of: <refentry><refsect1><refsect2><literal> +#: apt_preferences.5.xml:296 +msgid "*" +msgstr "" + # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:258 +#: apt_preferences.5.xml:306 msgid "How APT Interprets Priorities" msgstr "APT が優先度に割り込む方法" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:266 +#: apt_preferences.5.xml:314 msgid "P > 1000" msgstr "P > 1000" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:267 +#: apt_preferences.5.xml:315 msgid "" "causes a version to be installed even if this constitutes a downgrade of the " "package" @@ -8253,13 +8435,13 @@ msgstr "" "パッケージがダウングレードしても、このバージョンのパッケージをインストール" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:271 +#: apt_preferences.5.xml:319 msgid "990 < P <=1000" msgstr "990 < P <=1000" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:272 +#: apt_preferences.5.xml:320 msgid "" "causes a version to be installed even if it does not come from the target " "release, unless the installed version is more recent" @@ -8268,13 +8450,13 @@ msgstr "" "含まれなくても、このバージョンのパッケージをインストール" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:277 +#: apt_preferences.5.xml:325 msgid "500 < P <=990" msgstr "500 < P <=990" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:278 +#: apt_preferences.5.xml:326 msgid "" "causes a version to be installed unless there is a version available " "belonging to the target release or the installed version is more recent" @@ -8283,13 +8465,13 @@ msgstr "" "ジョンの方が新しいのでなければ、このバージョンのパッケージをインストール" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:283 +#: apt_preferences.5.xml:331 msgid "100 < P <=500" msgstr "100 < P <=500" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:284 +#: apt_preferences.5.xml:332 msgid "" "causes a version to be installed unless there is a version available " "belonging to some other distribution or the installed version is more recent" @@ -8299,13 +8481,13 @@ msgstr "" "ル" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:289 +#: apt_preferences.5.xml:337 msgid "0 < P <=100" msgstr "0 < P <=100" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:290 +#: apt_preferences.5.xml:338 msgid "" "causes a version to be installed only if there is no installed version of " "the package" @@ -8314,19 +8496,19 @@ msgstr "" "ンストール" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:294 +#: apt_preferences.5.xml:342 msgid "P < 0" msgstr "P < 0" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:295 +#: apt_preferences.5.xml:343 msgid "prevents the version from being installed" msgstr "このバージョンのインストール禁止" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:261 +#: apt_preferences.5.xml:309 msgid "" "Priorities (P) assigned in the APT preferences file must be positive or " "negative integers. They are interpreted as follows (roughly speaking): " @@ -8338,7 +8520,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:300 +#: apt_preferences.5.xml:348 msgid "" "If any specific-form records match an available package version then the " "first such record determines the priority of the package version. Failing " @@ -8352,7 +8534,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:306 +#: apt_preferences.5.xml:354 msgid "" "For example, suppose the APT preferences file contains the three records " "presented earlier:" @@ -8362,7 +8544,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><programlisting> #. type: Content of: <refentry><refsect1><refsect2><programlisting> -#: apt_preferences.5.xml:310 +#: apt_preferences.5.xml:358 #, no-wrap msgid "" "Package: perl\n" @@ -8392,13 +8574,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:323 +#: apt_preferences.5.xml:371 msgid "Then:" msgstr "すると、以下のように動作します。" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:325 +#: apt_preferences.5.xml:373 msgid "" "The most recent available version of the <literal>perl</literal> package " "will be installed, so long as that version's version number begins with " @@ -8413,7 +8595,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:330 +#: apt_preferences.5.xml:378 msgid "" "A version of any package other than <literal>perl</literal> that is " "available from the local system has priority over other versions, even " @@ -8425,7 +8607,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:334 +#: apt_preferences.5.xml:382 msgid "" "A version of a package whose origin is not the local system but some other " "site listed in &sources-list; and which belongs to an <literal>unstable</" @@ -8439,13 +8621,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:344 +#: apt_preferences.5.xml:392 msgid "Determination of Package Version and Distribution Properties" msgstr "パッケージのバージョンとディストリビューションプロパティの決定" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:346 +#: apt_preferences.5.xml:394 msgid "" "The locations listed in the &sources-list; file should provide " "<filename>Packages</filename> and <filename>Release</filename> files to " @@ -8456,30 +8638,30 @@ msgstr "" "filename> ファイルを提供します。" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:358 +#: apt_preferences.5.xml:406 msgid "the <literal>Package:</literal> line" msgstr "<literal>Package:</literal> 行" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:359 +#: apt_preferences.5.xml:407 msgid "gives the package name" msgstr "パッケージ名" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:362 apt_preferences.5.xml:412 +#: apt_preferences.5.xml:410 apt_preferences.5.xml:460 msgid "the <literal>Version:</literal> line" msgstr "<literal>Version:</literal> 行" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:363 +#: apt_preferences.5.xml:411 msgid "gives the version number for the named package" msgstr "その名前のパッケージのバージョン番号" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:350 +#: apt_preferences.5.xml:398 msgid "" "The <filename>Packages</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable>/" @@ -8499,13 +8681,13 @@ msgstr "" "type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:379 +#: apt_preferences.5.xml:427 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line" msgstr "<literal>Archive:</literal> 行や <literal>Suite:</literal> 行" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:380 +#: apt_preferences.5.xml:428 msgid "" "names the archive to which all the packages in the directory tree belong. " "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies " @@ -8522,19 +8704,19 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:390 +#: apt_preferences.5.xml:438 #, no-wrap msgid "Pin: release a=stable\n" msgstr "Pin: release a=stable\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:396 +#: apt_preferences.5.xml:444 msgid "the <literal>Codename:</literal> line" msgstr "<literal>Codename:</literal> 行" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:397 +#: apt_preferences.5.xml:445 #, fuzzy msgid "" "names the codename to which all the packages in the directory tree belong. " @@ -8552,14 +8734,14 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:406 +#: apt_preferences.5.xml:454 #, no-wrap msgid "Pin: release n=&testing-codename;\n" msgstr "Pin: release n=&testing-codename;\n" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:413 +#: apt_preferences.5.xml:461 msgid "" "names the release version. For example, the packages in the tree might " "belong to Debian GNU/Linux release version 3.0. Note that there is normally " @@ -8575,7 +8757,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:422 +#: apt_preferences.5.xml:470 #, no-wrap msgid "" "Pin: release v=3.0\n" @@ -8588,13 +8770,13 @@ msgstr "" "\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:431 +#: apt_preferences.5.xml:479 msgid "the <literal>Component:</literal> line" msgstr "<literal>Component:</literal> 行" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:432 +#: apt_preferences.5.xml:480 msgid "" "names the licensing component associated with the packages in the directory " "tree of the <filename>Release</filename> file. For example, the line " @@ -8612,19 +8794,19 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:441 +#: apt_preferences.5.xml:489 #, no-wrap msgid "Pin: release c=main\n" msgstr "Pin: release c=main\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:447 +#: apt_preferences.5.xml:495 msgid "the <literal>Origin:</literal> line" msgstr "<literal>Origin:</literal> 行" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:448 +#: apt_preferences.5.xml:496 msgid "" "names the originator of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@ -8637,7 +8819,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:454 +#: apt_preferences.5.xml:502 #, no-wrap msgid "Pin: release o=Debian\n" msgstr "" @@ -8645,13 +8827,13 @@ msgstr "" "\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:460 +#: apt_preferences.5.xml:508 msgid "the <literal>Label:</literal> line" msgstr "<literal>Label:</literal> 行" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:461 +#: apt_preferences.5.xml:509 msgid "" "names the label of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@ -8664,7 +8846,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:467 +#: apt_preferences.5.xml:515 #, no-wrap msgid "Pin: release l=Debian\n" msgstr "" @@ -8673,7 +8855,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:368 +#: apt_preferences.5.xml:416 #, fuzzy msgid "" "The <filename>Release</filename> file is normally found in the directory " @@ -8697,7 +8879,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:474 +#: apt_preferences.5.xml:522 msgid "" "All of the <filename>Packages</filename> and <filename>Release</filename> " "files retrieved from locations listed in the &sources-list; file are stored " @@ -8723,13 +8905,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:487 +#: apt_preferences.5.xml:535 msgid "Optional Lines in an APT Preferences Record" msgstr "APT 設定レコードのオプション行" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:489 +#: apt_preferences.5.xml:537 msgid "" "Each record in the APT preferences file can optionally begin with one or " "more lines beginning with the word <literal>Explanation:</literal>. This " @@ -8740,13 +8922,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:498 +#: apt_preferences.5.xml:546 msgid "Tracking Stable" msgstr "安定版の追跡" # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:506 +#: apt_preferences.5.xml:554 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated\n" @@ -8772,7 +8954,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:500 +#: apt_preferences.5.xml:548 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -8788,8 +8970,8 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:523 apt_preferences.5.xml:569 -#: apt_preferences.5.xml:627 +#: apt_preferences.5.xml:571 apt_preferences.5.xml:617 +#: apt_preferences.5.xml:675 #, no-wrap msgid "" "apt-get install <replaceable>package-name</replaceable>\n" @@ -8802,7 +8984,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:518 +#: apt_preferences.5.xml:566 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@ -8815,14 +8997,14 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:535 +#: apt_preferences.5.xml:583 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/testing\n" msgstr "apt-get install <replaceable>package</replaceable>/testing\n" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:529 +#: apt_preferences.5.xml:577 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>testing</literal> distribution; the package " @@ -8836,13 +9018,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:541 +#: apt_preferences.5.xml:589 msgid "Tracking Testing or Unstable" msgstr "テスト版や不安定版の追跡" # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:550 +#: apt_preferences.5.xml:598 #, no-wrap msgid "" "Package: *\n" @@ -8871,7 +9053,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:543 +#: apt_preferences.5.xml:591 msgid "" "The following APT preferences file will cause APT to assign a high priority " "to package versions from the <literal>testing</literal> distribution, a " @@ -8889,7 +9071,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:564 +#: apt_preferences.5.xml:612 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@ -8902,14 +9084,14 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:584 +#: apt_preferences.5.xml:632 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/unstable\n" msgstr "apt-get install <replaceable>package</replaceable>/unstable\n" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:575 +#: apt_preferences.5.xml:623 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>unstable</literal> distribution. " @@ -8928,13 +9110,13 @@ msgstr "" "\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:591 +#: apt_preferences.5.xml:639 msgid "Tracking the evolution of a codename release" msgstr "コード名リリースの進化の追跡" # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:605 +#: apt_preferences.5.xml:653 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated package versions\n" @@ -8968,7 +9150,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:593 +#: apt_preferences.5.xml:641 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -8992,7 +9174,7 @@ msgstr "" "id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:622 +#: apt_preferences.5.xml:670 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest version(s) in " @@ -9005,14 +9187,14 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:642 +#: apt_preferences.5.xml:690 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/sid\n" msgstr "apt-get install <replaceable>package</replaceable>/sid\n" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:633 +#: apt_preferences.5.xml:681 #, fuzzy msgid "" "The following command will cause APT to upgrade the specified package to the " @@ -9032,13 +9214,13 @@ msgstr "" # type: Content of: <refentry><refnamediv><refname> #. type: Content of: <refentry><refsect1><variablelist> -#: apt_preferences.5.xml:651 +#: apt_preferences.5.xml:699 msgid "&file-preferences;" msgstr "&file-preferences;" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt_preferences.5.xml:657 +#: apt_preferences.5.xml:705 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;" msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;" @@ -10742,6 +10924,46 @@ msgstr " # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade" msgid "Which will use the already fetched archives on the disc." msgstr "これで、disc にある取得済みのアーカイブを使用するようになります。" +#~ msgid "<option>--md5</option>" +#~ msgstr "<option>--md5</option>" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#~ msgid "" +#~ "Generate MD5 sums. This defaults to on, when turned off the generated " +#~ "index files will not have MD5Sum fields where possible. Configuration " +#~ "Item: <literal>APT::FTPArchive::MD5</literal>" +#~ msgstr "" +#~ "MD5 sum を生成します。デフォルトで on になっており、off にすると生成したイ" +#~ "ンデックスファイルに MD5Sum フィールドがありません。設定項目 - " +#~ "<literal>APT::FTPArchive::MD5</literal>" + +#~ msgid "unmarkauto" +#~ msgstr "unmarkauto" + +#~ msgid "<option>-h</option>" +#~ msgstr "<option>-h</option>" + +#~ msgid "<option>--help</option>" +#~ msgstr "<option>--help</option>" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#~ msgid "Show a short usage summary." +#~ msgstr "短い使用方法を表示します。" + +#~ msgid "<option>-v</option>" +#~ msgstr "<option>-v</option>" + +#~ msgid "<option>--version</option>" +#~ msgstr "<option>--version</option>" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#~ msgid "Show the program version." +#~ msgstr "プログラムのバージョン情報を表示します" + +# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#~ msgid "to the version that is already installed (if any)." +#~ msgstr "(あるならば) 既にインストールされているバージョン。" + # type: Content of: <refentry><refnamediv><refpurpose> #~ msgid "APT package handling utility -- cache manipulator" #~ msgstr "APT パッケージ操作ユーティリティ -- キャッシュ操作ツール" @@ -10803,8 +11025,12 @@ msgstr "これで、disc にある取得済みのアーカイブを使用する #~ "nonus.debian.org のアーカイブに HTTP アクセスし、debian-non-US ディレクト" #~ "リ以下を使用します。" -#~ msgid "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free" -#~ msgstr "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free" +#~ msgid "" +#~ "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-" +#~ "free" +#~ msgstr "" +#~ "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-" +#~ "free" # type: SH #~ msgid "OPTIONS" diff --git a/doc/po/pl.po b/doc/po/pl.po index 7c98ac229..eae5c89c3 100644 --- a/doc/po/pl.po +++ b/doc/po/pl.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.25.3\n" -"POT-Creation-Date: 2011-02-14 13:42+0100\n" +"POT-Creation-Date: 2011-06-08 16:54+0300\n" "PO-Revision-Date: 2010-03-18 22:00+0100\n" "Last-Translator: Robert Luberda <robert@debian.org>\n" "Language-Team: <debian-l10n-polish@lists.debian.org>\n" @@ -788,7 +788,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50 #: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:114 -#: apt-key.8.xml:38 apt-mark.8.xml:55 apt-secure.8.xml:43 +#: apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43 #: apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36 #: sources.list.5.xml:36 msgid "Description" @@ -1335,7 +1335,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59 -#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:92 +#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:126 #: apt-sortpkgs.1.xml:57 apt.conf.5.xml:560 apt.conf.5.xml:582 msgid "options" msgstr "opcje" @@ -1363,7 +1363,7 @@ msgstr "" "<literal>Dir::Cache::pkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:288 apt-ftparchive.1.xml:568 apt-get.8.xml:393 +#: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393 #: apt-sortpkgs.1.xml:61 msgid "<option>-s</option>" msgstr "<option>-s</option>" @@ -1391,12 +1391,12 @@ msgstr "" "Cache::srcpkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:296 apt-ftparchive.1.xml:542 apt-get.8.xml:383 +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 msgid "<option>-q</option>" msgstr "<option>-q</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:296 apt-ftparchive.1.xml:542 apt-get.8.xml:383 +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 msgid "<option>--quiet</option>" msgstr "<option>--quiet</option>" @@ -1534,7 +1534,7 @@ msgstr "" "konfiguracyjnym: <literal>APT::Cache::ShowFull</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:580 +#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583 msgid "<option>-a</option>" msgstr "<option>-a</option>" @@ -1660,14 +1660,14 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist> #: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101 -#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608 apt-get.8.xml:570 -#: apt-sortpkgs.1.xml:67 +#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570 +#: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67 msgid "&apt-commonoptions;" msgstr "&apt-commonoptions;" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:156 apt-mark.8.xml:125 -#: apt.conf.5.xml:1093 apt_preferences.5.xml:649 +#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:172 apt-mark.8.xml:144 +#: apt.conf.5.xml:1093 apt_preferences.5.xml:697 msgid "Files" msgstr "Pliki" @@ -1678,9 +1678,9 @@ msgstr "&file-sourceslist; &file-statelists;" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106 -#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:624 apt-get.8.xml:585 -#: apt-key.8.xml:177 apt-mark.8.xml:131 apt-secure.8.xml:185 -#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:656 +#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585 +#: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185 +#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704 #: sources.list.5.xml:234 msgid "See Also" msgstr "Zobacz także" @@ -1693,8 +1693,8 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111 -#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:628 apt-get.8.xml:591 -#: apt-mark.8.xml:135 apt-sortpkgs.1.xml:76 +#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591 +#: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76 msgid "Diagnostics" msgstr "Diagnostyka" @@ -1837,12 +1837,12 @@ msgstr "" "\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><title> -#: apt-cdrom.8.xml:94 apt-key.8.xml:142 +#: apt-cdrom.8.xml:94 apt-key.8.xml:158 msgid "Options" msgstr "Opcje" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:536 apt-get.8.xml:345 +#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345 msgid "<option>-d</option>" msgstr "<option>-d</option>" @@ -2105,7 +2105,7 @@ msgid "Just show the contents of the configuration space." msgstr "Wyświetla zawartość przestrzeni konfiguracji." #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:625 +#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628 #: apt-sortpkgs.1.xml:73 msgid "&apt-conf;" msgstr "&apt-conf;" @@ -3094,25 +3094,32 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-ftparchive.1.xml:529 -msgid "<option>--md5</option>" -msgstr "<option>--md5</option>" +msgid "" +"<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>" +msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:531 msgid "" -"Generate MD5 sums. This defaults to on, when turned off the generated index " -"files will not have MD5Sum fields where possible. Configuration Item: " -"<literal>APT::FTPArchive::MD5</literal>" +"Generate the given checksum. These options default to on, when turned off " +"the generated index files will not have the checksum fields where possible. " +"Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</" +"replaceable></literal> and <literal>APT::FTPArchive::<replaceable>Index</" +"replaceable>::<replaceable>Checksum</replaceable></literal> where " +"<literal>Index</literal> can be <literal>Packages</literal>, " +"<literal>Sources</literal> or <literal>Release</literal> and " +"<literal>Checksum</literal> can be <literal>MD5</literal>, <literal>SHA1</" +"literal> or <literal>SHA256</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:536 +#: apt-ftparchive.1.xml:539 msgid "<option>--db</option>" msgstr "<option>--db</option>" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:538 +#: apt-ftparchive.1.xml:541 #, fuzzy msgid "" "Use a binary caching DB. This has no effect on the generate command. " @@ -3123,7 +3130,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:544 +#: apt-ftparchive.1.xml:547 msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quiet up to a maximum of 2. You can also use " @@ -3137,13 +3144,13 @@ msgstr "" "pliku konfiguracyjnym: <literal>quiet</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:550 +#: apt-ftparchive.1.xml:553 msgid "<option>--delink</option>" msgstr "<option>--delink</option>" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:552 +#: apt-ftparchive.1.xml:555 #, fuzzy msgid "" "Perform Delinking. If the <literal>External-Links</literal> setting is used " @@ -3157,12 +3164,12 @@ msgstr "" "<literal>APT::Cache::Generate</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:558 +#: apt-ftparchive.1.xml:561 msgid "<option>--contents</option>" msgstr "<option>--contents</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:560 +#: apt-ftparchive.1.xml:563 msgid "" "Perform contents generation. When this option is set and package indexes are " "being generated with a cache DB then the file listing will also be extracted " @@ -3172,13 +3179,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:568 +#: apt-ftparchive.1.xml:571 msgid "<option>--source-override</option>" msgstr "<option>--source-override</option>" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:570 +#: apt-ftparchive.1.xml:573 #, fuzzy msgid "" "Select the source override file to use with the <literal>sources</literal> " @@ -3190,13 +3197,13 @@ msgstr "" "konfiguracyjnym: <literal>APT::Cache::Installed</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:574 +#: apt-ftparchive.1.xml:577 msgid "<option>--readonly</option>" msgstr "<option>--readonly</option>" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:576 +#: apt-ftparchive.1.xml:579 #, fuzzy msgid "" "Make the caching databases read only. Configuration Item: <literal>APT::" @@ -3206,14 +3213,14 @@ msgstr "" "pliku konfiguracyjnym: <literal>APT::Cache::NamesOnly</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:580 +#: apt-ftparchive.1.xml:583 #, fuzzy #| msgid "<option>-a</option>" msgid "<option>--arch</option>" msgstr "<option>-a</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:581 +#: apt-ftparchive.1.xml:584 #, fuzzy #| msgid "" #| "If the command is either <literal>install</literal> or <literal>remove</" @@ -3233,13 +3240,13 @@ msgstr "" "AutomaticRemove</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:587 +#: apt-ftparchive.1.xml:590 #, fuzzy msgid "<option>APT::FTPArchive::AlwaysStat</option>" msgstr "<option>--version</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:589 +#: apt-ftparchive.1.xml:592 msgid "" "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If " "packages are recompiled and/or republished with the same version again, this " @@ -3253,13 +3260,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:599 +#: apt-ftparchive.1.xml:602 #, fuzzy msgid "<option>APT::FTPArchive::LongDescription</option>" msgstr "<option>--version</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:601 +#: apt-ftparchive.1.xml:604 msgid "" "This configuration option defaults to \"<literal>true</literal>\" and should " "only be set to <literal>\"false\"</literal> if the Archive generated with " @@ -3269,19 +3276,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:613 apt.conf.5.xml:1087 apt_preferences.5.xml:496 +#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:544 #: sources.list.5.xml:198 msgid "Examples" msgstr "Przykłady" #. type: Content of: <refentry><refsect1><para><programlisting> -#: apt-ftparchive.1.xml:619 +#: apt-ftparchive.1.xml:622 #, no-wrap msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" msgstr "<command>apt-ftparchive</command> packages <replaceable>katalog</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:615 +#: apt-ftparchive.1.xml:618 msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" @@ -3289,7 +3296,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:629 +#: apt-ftparchive.1.xml:632 msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@ -4746,8 +4753,24 @@ msgstr "" "Aktualizuje lokalną składnicę kluczy używając składnicy kluczy archiwum " "Debiana i usuwa z lokalnej składnicy nieaktualne już klucze archiwów Debiana." +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:140 +#, fuzzy +#| msgid "update" +msgid "net-update" +msgstr "update" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:144 +msgid "" +"Update the local keyring with the keys of a key server and removes from the " +"keyring the archive keys which are no longer valid. This requires an " +"installed wget and an APT build configured to have a server to fetch from. " +"APT in Debian does not support this command, but Ubuntu's APT does." +msgstr "" + #. type: Content of: <refentry><refsect1><para> -#: apt-key.8.xml:143 +#: apt-key.8.xml:159 msgid "" "Note that options need to be defined before the commands described in the " "previous section." @@ -4756,12 +4779,12 @@ msgstr "" "opisanymi w poprzednim rozdziale." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:145 +#: apt-key.8.xml:161 msgid "--keyring <replaceable>filename</replaceable>" msgstr "--keyring <replaceable>nazwa_pliku</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:146 +#: apt-key.8.xml:162 msgid "" "With this option it is possible to specify a specific keyring file the " "command should operate on. The default is that a command is executed on the " @@ -4777,53 +4800,57 @@ msgstr "" "kluczy, co oznacza na przykład to, że nowe klucze będą dodawane właśnie tam." #. type: Content of: <refentry><refsect1><variablelist> -#: apt-key.8.xml:159 +#: apt-key.8.xml:175 msgid "&file-trustedgpg;" msgstr "&file-trustedgpg;" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:161 +#: apt-key.8.xml:177 msgid "<filename>/etc/apt/trustdb.gpg</filename>" msgstr "<filename>/etc/apt/trustdb.gpg</filename>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:162 +#: apt-key.8.xml:178 msgid "Local trust database of archive keys." msgstr "Lokalna składnica zaufanych kluczy archiwum." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:165 +#: apt-key.8.xml:181 msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:166 +#: apt-key.8.xml:182 msgid "Keyring of Debian archive trusted keys." msgstr "Składnica zaufanych kluczy archiwum Debiana." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:169 +#: apt-key.8.xml:185 msgid "" "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" msgstr "" "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:170 +#: apt-key.8.xml:186 msgid "Keyring of Debian archive removed trusted keys." msgstr "Składnica usuniętych zaufanych kluczy archiwum Debiana." #. type: Content of: <refentry><refsect1><para> -#: apt-key.8.xml:179 +#: apt-key.8.xml:195 msgid "&apt-get;, &apt-secure;" msgstr "&apt-get;, &apt-secure;" #. The last update date #. type: Content of: <refentry><refentryinfo> #: apt-mark.8.xml:16 +#, fuzzy +#| msgid "" +#| "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 " +#| "August 2009</date>" msgid "" -"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 " -"August 2009</date>" +"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>21 " +"April 2011</date>" msgstr "" "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; " "<date>9 sierpnia 2009</date>" @@ -4840,13 +4867,22 @@ msgstr "Zaznaczanie/odznaczanie pakietu jako zainstalowanego automatycznie." #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> #: apt-mark.8.xml:39 +#, fuzzy +#| msgid "" +#| " <command>apt-mark</command> <arg><option>-hv</option></arg> " +#| "<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> <group " +#| "choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg " +#| "choice=\"plain\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </" +#| "group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>package</" +#| "replaceable></arg> </arg> <arg choice=\"plain\">showauto</arg> </group>" msgid "" " <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-" "f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain" "\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain" -"\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </group> <arg " +"\">auto</arg> <arg choice=\"plain\">manual</arg> <arg choice=\"plain" +"\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </group> <arg " "choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </" -"arg> <arg choice=\"plain\">showauto</arg> </group>" +"arg> </group>" msgstr "" " <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-" "f=<replaceable>NAZWA_PLIKU</replaceable></option></arg> <group choice=\"plain" @@ -4856,7 +4892,7 @@ msgstr "" "arg> <arg choice=\"plain\">showauto</arg> </group>" #. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:56 +#: apt-mark.8.xml:57 msgid "" "<command>apt-mark</command> will change whether a package has been marked as " "being automatically installed." @@ -4865,7 +4901,7 @@ msgstr "" "zainstalowany automatycznie." #. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:60 +#: apt-mark.8.xml:61 msgid "" "When you request that a package is installed, and as a result other packages " "are installed to satisfy its dependencies, the dependencies are marked as " @@ -4881,14 +4917,21 @@ msgstr "" "get</command> lub <command>aptitude</command>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:68 -msgid "markauto" +#: apt-mark.8.xml:69 +#, fuzzy +#| msgid "markauto" +msgid "auto" msgstr "markauto" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:69 +#: apt-mark.8.xml:70 +#, fuzzy +#| msgid "" +#| "<literal>markauto</literal> is used to mark a package as being " +#| "automatically installed, which will cause the package to be removed when " +#| "no more manually installed packages depend on this package." msgid "" -"<literal>markauto</literal> is used to mark a package as being automatically " +"<literal>auto</literal> is used to mark a package as being automatically " "installed, which will cause the package to be removed when no more manually " "installed packages depend on this package." msgstr "" @@ -4897,14 +4940,19 @@ msgstr "" "żaden inny ręcznie zainstalowany pakiet nie będzie od niego zależał." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:76 -msgid "unmarkauto" -msgstr "unmarkauto" +#: apt-mark.8.xml:77 +msgid "manual" +msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:77 +#: apt-mark.8.xml:78 +#, fuzzy +#| msgid "" +#| "<literal>unmarkauto</literal> is used to mark a package as being manually " +#| "installed, which will prevent the package from being automatically " +#| "removed if no other packages depend on it." msgid "" -"<literal>unmarkauto</literal> is used to mark a package as being manually " +"<literal>manual</literal> is used to mark a package as being manually " "installed, which will prevent the package from being automatically removed " "if no other packages depend on it." msgstr "" @@ -4913,22 +4961,98 @@ msgstr "" "sytuacji gdy żaden inny pakiet nie będzie od niego zależał." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:84 +#: apt-mark.8.xml:85 +msgid "hold" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:86 +msgid "" +"<literal>hold</literal> is used to mark a package as hold back, which will " +"prevent the package from being automatically installed, upgraded or " +"removed. The command is only a wrapper around <command>dpkg --set-" +"selections</command> and the state is therefore maintained by &dpkg; and not " +"effected by the <option>--filename</option> option." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:95 +msgid "unhold" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:96 +#, fuzzy +#| msgid "" +#| "<literal>showauto</literal> is used to print a list of automatically " +#| "installed packages with each package on a new line." +msgid "" +"<literal>unhold</literal> is used to cancel a previously set hold on a " +"package to allow all actions again." +msgstr "" +"<literal>showauto</literal> jest używane do wypisania listy wszystkich " +"pakietów zainstalowanych automatycznie. Każdy pakiet jest wypisywany w " +"osobnej linii." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:101 msgid "showauto" msgstr "showauto" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:85 +#: apt-mark.8.xml:102 +#, fuzzy +#| msgid "" +#| "<literal>showauto</literal> is used to print a list of automatically " +#| "installed packages with each package on a new line." msgid "" "<literal>showauto</literal> is used to print a list of automatically " -"installed packages with each package on a new line." +"installed packages with each package on a new line. All automatically " +"installed packages will be listed if no package is given. If packages are " +"given only those which are automatically installed will be shown." msgstr "" "<literal>showauto</literal> jest używane do wypisania listy wszystkich " "pakietów zainstalowanych automatycznie. Każdy pakiet jest wypisywany w " "osobnej linii." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:96 +#: apt-mark.8.xml:109 +#, fuzzy +#| msgid "showauto" +msgid "showmanual" +msgstr "showauto" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:110 +msgid "" +"<literal>showmanual</literal> can be used in the same way as " +"<literal>showauto</literal> except that it will print a list of manually " +"installed packages instead." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:116 +#, fuzzy +#| msgid "showauto" +msgid "showhold" +msgstr "showauto" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:117 +#, fuzzy +#| msgid "" +#| "<literal>showauto</literal> is used to print a list of automatically " +#| "installed packages with each package on a new line." +msgid "" +"<literal>showhold</literal> is used to print a list of packages on hold in " +"the same way as for the other show commands." +msgstr "" +"<literal>showauto</literal> jest używane do wypisania listy wszystkich " +"pakietów zainstalowanych automatycznie. Każdy pakiet jest wypisywany w " +"osobnej linii." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:130 msgid "" "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>" msgstr "" @@ -4936,7 +5060,7 @@ msgstr "" "option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:97 +#: apt-mark.8.xml:131 msgid "" "<option>--file=<filename><replaceable>FILENAME</replaceable></filename></" "option>" @@ -4945,7 +5069,7 @@ msgstr "" "option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:100 +#: apt-mark.8.xml:134 msgid "" "Read/Write package stats from <filename><replaceable>FILENAME</replaceable></" "filename> instead of the default location, which is " @@ -4957,51 +5081,19 @@ msgstr "" "domyślny plik <filename>extended_status</filename> znajdujący się w katalogu " "określonym w pliku konfiguracyjnym w pozycji<literal>Dir::State</literal>." -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:106 -msgid "<option>-h</option>" -msgstr "<option>-h</option>" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:107 -msgid "<option>--help</option>" -msgstr "<option>--help</option>" - -# -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:108 -msgid "Show a short usage summary." -msgstr "Wyświetla krótkie informacje na temat użytkowania." - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:114 -msgid "<option>-v</option>" -msgstr "<option>-v</option>" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:115 -msgid "<option>--version</option>" -msgstr "<option>--version</option>" - -# -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:116 -msgid "Show the program version." -msgstr "Wyświetla wersję programu." - #. type: Content of: <refentry><refsect1><variablelist> -#: apt-mark.8.xml:127 +#: apt-mark.8.xml:146 msgid " &file-extended_states;" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:132 +#: apt-mark.8.xml:151 msgid "&apt-get;,&aptitude;,&apt-conf;" msgstr "&apt-get;,&aptitude;,&apt-conf;" # #. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:136 +#: apt-mark.8.xml:155 msgid "" "<command>apt-mark</command> returns zero on normal operation, non-zero on " "error." @@ -7100,39 +7192,44 @@ msgstr "priorytet 100" #: apt_preferences.5.xml:107 msgid "" "to the versions coming from archives which in their <filename>Release</" -"filename> files are marked as \"NotAutomatic: yes\" like the debian " -"experimental archive." +"filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</" +"emphasis> as \"ButAutomaticUpgrades: yes\" like the debian " +"<literal>experimental</literal> archive." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:112 +#: apt_preferences.5.xml:113 msgid "priority 100" msgstr "priorytet 100" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:113 -msgid "to the version that is already installed (if any)." +#: apt_preferences.5.xml:114 +msgid "" +"to the version that is already installed (if any) and to the versions coming " +"from archives which in their <filename>Release</filename> files are marked " +"as \"NotAutomatic: yes\" and \"ButAutomaticUpgrades: yes\" like the debian " +"backports archive since <literal>squeeze-backports</literal>." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:117 +#: apt_preferences.5.xml:121 msgid "priority 500" msgstr "priorytet 500" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:118 +#: apt_preferences.5.xml:122 msgid "" "to the versions that are not installed and do not belong to the target " "release." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:122 +#: apt_preferences.5.xml:126 msgid "priority 990" msgstr "priorytet 990" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:123 +#: apt_preferences.5.xml:127 msgid "" "to the versions that are not installed and belong to the target release." msgstr "" @@ -7146,24 +7243,25 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:128 +#: apt_preferences.5.xml:132 msgid "" "If the target release has not been specified then APT simply assigns " "priority 100 to all installed package versions and priority 500 to all " -"uninstalled package versions, expect versions coming from archives which in " +"uninstalled package versions, except versions coming from archives which in " "their <filename>Release</filename> files are marked as \"NotAutomatic: yes\" " -"- these versions get the priority 1." +"- these versions get the priority 1 or priority 100 if it is additionally " +"marked as \"ButAutomaticUpgrades: yes\"." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:134 +#: apt_preferences.5.xml:139 msgid "" "APT then applies the following rules, listed in order of precedence, to " "determine which version of a package to install." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:137 +#: apt_preferences.5.xml:142 msgid "" "Never downgrade unless the priority of an available version exceeds 1000. " "(\"Downgrading\" is installing a less recent version of a package in place " @@ -7173,19 +7271,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:143 +#: apt_preferences.5.xml:148 msgid "Install the highest priority version." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:144 +#: apt_preferences.5.xml:149 msgid "" "If two or more versions have the same priority, install the most recent one " "(that is, the one with the higher version number)." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:147 +#: apt_preferences.5.xml:152 msgid "" "If two or more versions have the same priority and version number but either " "the packages differ in some of their metadata or the <literal>--reinstall</" @@ -7193,7 +7291,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:153 +#: apt_preferences.5.xml:158 msgid "" "In a typical situation, the installed version of a package (priority 100) " "is not as recent as one of the versions available from the sources listed in " @@ -7203,7 +7301,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:160 +#: apt_preferences.5.xml:165 msgid "" "More rarely, the installed version of a package is <emphasis>more</emphasis> " "recent than any of the other available versions. The package will not be " @@ -7212,7 +7310,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:165 +#: apt_preferences.5.xml:170 msgid "" "Sometimes the installed version of a package is more recent than the version " "belonging to the target release, but not as recent as a version belonging to " @@ -7224,12 +7322,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:174 +#: apt_preferences.5.xml:179 msgid "The Effect of APT Preferences" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:176 +#: apt_preferences.5.xml:181 msgid "" "The APT preferences file allows the system administrator to control the " "assignment of priorities. The file consists of one or more multi-line " @@ -7238,7 +7336,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:182 +#: apt_preferences.5.xml:187 msgid "" "The specific form assigns a priority (a \"Pin-Priority\") to one or more " "specified packages and specified version or version range. For example, the " @@ -7248,7 +7346,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:189 +#: apt_preferences.5.xml:194 #, no-wrap msgid "" "Package: perl\n" @@ -7260,7 +7358,7 @@ msgstr "" "Pin-Priority: 1001\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:195 +#: apt_preferences.5.xml:200 msgid "" "The general form assigns a priority to all of the package versions in a " "given distribution (that is, to all the versions of packages that are listed " @@ -7270,7 +7368,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:201 +#: apt_preferences.5.xml:206 msgid "" "This general-form entry in the APT preferences file applies only to groups " "of packages. For example, the following record assigns a high priority to " @@ -7278,7 +7376,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:206 +#: apt_preferences.5.xml:211 #, no-wrap msgid "" "Package: *\n" @@ -7290,7 +7388,7 @@ msgstr "" "Pin-Priority: 999\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:211 +#: apt_preferences.5.xml:216 msgid "" "A note of caution: the keyword used here is \"<literal>origin</literal>\" " "which can be used to match a hostname. The following record will assign a " @@ -7299,7 +7397,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:215 +#: apt_preferences.5.xml:220 #, fuzzy, no-wrap #| msgid "" #| "Package: *\n" @@ -7315,7 +7413,7 @@ msgstr "" "Pin-Priority: 999\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:219 +#: apt_preferences.5.xml:224 msgid "" "This should <emphasis>not</emphasis> be confused with the Origin of a " "distribution as specified in a <filename>Release</filename> file. What " @@ -7325,7 +7423,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:224 +#: apt_preferences.5.xml:229 msgid "" "The following record assigns a low priority to all package versions " "belonging to any distribution whose Archive name is \"<literal>unstable</" @@ -7333,7 +7431,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:228 +#: apt_preferences.5.xml:233 #, no-wrap msgid "" "Package: *\n" @@ -7345,7 +7443,7 @@ msgstr "" "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:233 +#: apt_preferences.5.xml:238 msgid "" "The following record assigns a high priority to all package versions " "belonging to any distribution whose Codename is \"<literal>&testing-codename;" @@ -7353,7 +7451,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:237 +#: apt_preferences.5.xml:242 #, fuzzy, no-wrap #| msgid "" #| "Package: *\n" @@ -7369,7 +7467,7 @@ msgstr "" "Pin-Priority: 900\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:242 +#: apt_preferences.5.xml:247 msgid "" "The following record assigns a high priority to all package versions " "belonging to any release whose Archive name is \"<literal>stable</literal>\" " @@ -7377,7 +7475,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:247 +#: apt_preferences.5.xml:252 #, no-wrap msgid "" "Package: *\n" @@ -7389,17 +7487,82 @@ msgstr "" "Pin-Priority: 500\n" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:258 +#: apt_preferences.5.xml:262 +msgid "Regular expressions and glob() syntax" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:264 +msgid "" +"APT also supports pinning by glob() expressions and regular expressions " +"surrounded by /. For example, the following example assigns the priority 500 " +"to all packages from experimental where the name starts with gnome (as a glob" +"()-like expression or contains the word kde (as a POSIX extended regular " +"expression surrounded by slashes)." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><programlisting> +#: apt_preferences.5.xml:273 +#, fuzzy, no-wrap +#| msgid "" +#| "Package: *\n" +#| "Pin: release a=unstable\n" +#| "Pin-Priority: 50\n" +msgid "" +"Package: gnome* /kde/\n" +"Pin: release n=experimental\n" +"Pin-Priority: 500\n" +msgstr "" +"Package: *\n" +"Pin: release a=unstable\n" +"Pin-Priority: 50\n" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:279 +msgid "" +"The rule for those expressions is that they can occur anywhere where a " +"string can occur. Those, the following pin assigns the priority 990 to all " +"packages from a release starting with karmic." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><programlisting> +#: apt_preferences.5.xml:285 +#, fuzzy, no-wrap +#| msgid "" +#| "Package: *\n" +#| "Pin: release a=unstable\n" +#| "Pin-Priority: 50\n" +msgid "" +"Package: *\n" +"Pin: release n=karmic*\n" +"Pin-Priority: 990\n" +msgstr "" +"Package: *\n" +"Pin: release a=unstable\n" +"Pin-Priority: 50\n" + +#. type: Content of: <refentry><refsect1><refsect2><literal> +#: apt_preferences.5.xml:290 +msgid "Package" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><literal> +#: apt_preferences.5.xml:296 +msgid "*" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt_preferences.5.xml:306 msgid "How APT Interprets Priorities" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:266 +#: apt_preferences.5.xml:314 msgid "P > 1000" msgstr "P > 1000" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:267 +#: apt_preferences.5.xml:315 #, fuzzy msgid "" "causes a version to be installed even if this constitutes a downgrade of the " @@ -7409,12 +7572,12 @@ msgstr "" "pakietu nie jest jeszcze zainstalowana" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:271 +#: apt_preferences.5.xml:319 msgid "990 < P <=1000" msgstr "990 < P <=1000" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:272 +#: apt_preferences.5.xml:320 #, fuzzy msgid "" "causes a version to be installed even if it does not come from the target " @@ -7424,12 +7587,12 @@ msgstr "" "pakietu nie jest jeszcze zainstalowana" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:277 +#: apt_preferences.5.xml:325 msgid "500 < P <=990" msgstr "500 < P <=990" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:278 +#: apt_preferences.5.xml:326 #, fuzzy msgid "" "causes a version to be installed unless there is a version available " @@ -7439,12 +7602,12 @@ msgstr "" "pakietu nie jest jeszcze zainstalowana" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:283 +#: apt_preferences.5.xml:331 msgid "100 < P <=500" msgstr "100 < P <=500" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:284 +#: apt_preferences.5.xml:332 #, fuzzy msgid "" "causes a version to be installed unless there is a version available " @@ -7454,12 +7617,12 @@ msgstr "" "pakietu nie jest jeszcze zainstalowana" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:289 +#: apt_preferences.5.xml:337 msgid "0 < P <=100" msgstr "0 < P <=100" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:290 +#: apt_preferences.5.xml:338 msgid "" "causes a version to be installed only if there is no installed version of " "the package" @@ -7468,17 +7631,17 @@ msgstr "" "pakietu nie jest jeszcze zainstalowana" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:294 +#: apt_preferences.5.xml:342 msgid "P < 0" msgstr "P < 0" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:295 +#: apt_preferences.5.xml:343 msgid "prevents the version from being installed" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:261 +#: apt_preferences.5.xml:309 msgid "" "Priorities (P) assigned in the APT preferences file must be positive or " "negative integers. They are interpreted as follows (roughly speaking): " @@ -7486,7 +7649,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:300 +#: apt_preferences.5.xml:348 msgid "" "If any specific-form records match an available package version then the " "first such record determines the priority of the package version. Failing " @@ -7495,14 +7658,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:306 +#: apt_preferences.5.xml:354 msgid "" "For example, suppose the APT preferences file contains the three records " "presented earlier:" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><programlisting> -#: apt_preferences.5.xml:310 +#: apt_preferences.5.xml:358 #, no-wrap msgid "" "Package: perl\n" @@ -7530,12 +7693,12 @@ msgstr "" "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:323 +#: apt_preferences.5.xml:371 msgid "Then:" msgstr "Wtedy:" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:325 +#: apt_preferences.5.xml:373 msgid "" "The most recent available version of the <literal>perl</literal> package " "will be installed, so long as that version's version number begins with " @@ -7545,7 +7708,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:330 +#: apt_preferences.5.xml:378 msgid "" "A version of any package other than <literal>perl</literal> that is " "available from the local system has priority over other versions, even " @@ -7553,7 +7716,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:334 +#: apt_preferences.5.xml:382 msgid "" "A version of a package whose origin is not the local system but some other " "site listed in &sources-list; and which belongs to an <literal>unstable</" @@ -7562,12 +7725,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:344 +#: apt_preferences.5.xml:392 msgid "Determination of Package Version and Distribution Properties" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:346 +#: apt_preferences.5.xml:394 msgid "" "The locations listed in the &sources-list; file should provide " "<filename>Packages</filename> and <filename>Release</filename> files to " @@ -7575,27 +7738,27 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:358 +#: apt_preferences.5.xml:406 msgid "the <literal>Package:</literal> line" msgstr "linia <literal>Package:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:359 +#: apt_preferences.5.xml:407 msgid "gives the package name" msgstr "podaje nazwę pakietu" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:362 apt_preferences.5.xml:412 +#: apt_preferences.5.xml:410 apt_preferences.5.xml:460 msgid "the <literal>Version:</literal> line" msgstr "linia <literal>Version:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:363 +#: apt_preferences.5.xml:411 msgid "gives the version number for the named package" msgstr "podaje numer wersji danego pakietu" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:350 +#: apt_preferences.5.xml:398 msgid "" "The <filename>Packages</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable>/" @@ -7608,12 +7771,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:379 +#: apt_preferences.5.xml:427 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line" msgstr "linia <literal>Archive:</literal> lub <literal>Suite:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:380 +#: apt_preferences.5.xml:428 msgid "" "names the archive to which all the packages in the directory tree belong. " "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies " @@ -7624,18 +7787,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:390 +#: apt_preferences.5.xml:438 #, no-wrap msgid "Pin: release a=stable\n" msgstr "Pin: release a=stable\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:396 +#: apt_preferences.5.xml:444 msgid "the <literal>Codename:</literal> line" msgstr "linia <literal>Codename:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:397 +#: apt_preferences.5.xml:445 msgid "" "names the codename to which all the packages in the directory tree belong. " "For example, the line \"Codename: &testing-codename;\" specifies that all of " @@ -7646,14 +7809,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:406 +#: apt_preferences.5.xml:454 #, fuzzy, no-wrap #| msgid "Pin: release a=stable\n" msgid "Pin: release n=&testing-codename;\n" msgstr "Pin: release a=stable\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:413 +#: apt_preferences.5.xml:461 msgid "" "names the release version. For example, the packages in the tree might " "belong to Debian GNU/Linux release version 3.0. Note that there is normally " @@ -7663,7 +7826,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:422 +#: apt_preferences.5.xml:470 #, no-wrap msgid "" "Pin: release v=3.0\n" @@ -7675,12 +7838,12 @@ msgstr "" "Pin: release 3.0\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:431 +#: apt_preferences.5.xml:479 msgid "the <literal>Component:</literal> line" msgstr "linia <literal>Component:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:432 +#: apt_preferences.5.xml:480 msgid "" "names the licensing component associated with the packages in the directory " "tree of the <filename>Release</filename> file. For example, the line " @@ -7691,18 +7854,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:441 +#: apt_preferences.5.xml:489 #, no-wrap msgid "Pin: release c=main\n" msgstr "Pin: release c=main\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:447 +#: apt_preferences.5.xml:495 msgid "the <literal>Origin:</literal> line" msgstr "linia <literal>Origin:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:448 +#: apt_preferences.5.xml:496 msgid "" "names the originator of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@ -7711,18 +7874,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:454 +#: apt_preferences.5.xml:502 #, no-wrap msgid "Pin: release o=Debian\n" msgstr "Pin: release o=Debian\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:460 +#: apt_preferences.5.xml:508 msgid "the <literal>Label:</literal> line" msgstr "linia <literal>Label:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:461 +#: apt_preferences.5.xml:509 msgid "" "names the label of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@ -7731,13 +7894,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:467 +#: apt_preferences.5.xml:515 #, no-wrap msgid "Pin: release l=Debian\n" msgstr "Pin: release l=Debian\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:368 +#: apt_preferences.5.xml:416 msgid "" "The <filename>Release</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for " @@ -7751,7 +7914,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:474 +#: apt_preferences.5.xml:522 msgid "" "All of the <filename>Packages</filename> and <filename>Release</filename> " "files retrieved from locations listed in the &sources-list; file are stored " @@ -7766,12 +7929,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:487 +#: apt_preferences.5.xml:535 msgid "Optional Lines in an APT Preferences Record" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:489 +#: apt_preferences.5.xml:537 msgid "" "Each record in the APT preferences file can optionally begin with one or " "more lines beginning with the word <literal>Explanation:</literal>. This " @@ -7779,12 +7942,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:498 +#: apt_preferences.5.xml:546 msgid "Tracking Stable" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:506 +#: apt_preferences.5.xml:554 #, fuzzy, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated\n" @@ -7808,7 +7971,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:500 +#: apt_preferences.5.xml:548 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -7818,8 +7981,8 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:523 apt_preferences.5.xml:569 -#: apt_preferences.5.xml:627 +#: apt_preferences.5.xml:571 apt_preferences.5.xml:617 +#: apt_preferences.5.xml:675 #, no-wrap msgid "" "apt-get install <replaceable>package-name</replaceable>\n" @@ -7831,7 +7994,7 @@ msgstr "" "apt-get dist-upgrade\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:518 +#: apt_preferences.5.xml:566 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@ -7840,13 +8003,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:535 +#: apt_preferences.5.xml:583 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/testing\n" msgstr "apt-get install <replaceable>pakiet</replaceable>/testing\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:529 +#: apt_preferences.5.xml:577 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>testing</literal> distribution; the package " @@ -7855,12 +8018,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:541 +#: apt_preferences.5.xml:589 msgid "Tracking Testing or Unstable" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:550 +#: apt_preferences.5.xml:598 #, no-wrap msgid "" "Package: *\n" @@ -7888,7 +8051,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:543 +#: apt_preferences.5.xml:591 msgid "" "The following APT preferences file will cause APT to assign a high priority " "to package versions from the <literal>testing</literal> distribution, a " @@ -7899,7 +8062,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:564 +#: apt_preferences.5.xml:612 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@ -7908,13 +8071,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:584 +#: apt_preferences.5.xml:632 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/unstable\n" msgstr "apt-get install <replaceable>pakiet</replaceable>/unstable\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:575 +#: apt_preferences.5.xml:623 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>unstable</literal> distribution. " @@ -7926,12 +8089,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:591 +#: apt_preferences.5.xml:639 msgid "Tracking the evolution of a codename release" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:605 +#: apt_preferences.5.xml:653 #, fuzzy, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated package versions\n" @@ -7965,7 +8128,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:593 +#: apt_preferences.5.xml:641 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -7980,7 +8143,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:622 +#: apt_preferences.5.xml:670 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest version(s) in " @@ -7989,13 +8152,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:642 +#: apt_preferences.5.xml:690 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/sid\n" msgstr "apt-get install <replaceable>pakiet</replaceable>/sid\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:633 +#: apt_preferences.5.xml:681 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>sid</literal> distribution. Thereafter, " @@ -8007,12 +8170,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt_preferences.5.xml:651 +#: apt_preferences.5.xml:699 msgid "&file-preferences;" msgstr "&file-preferences;" #. type: Content of: <refentry><refsect1><para> -#: apt_preferences.5.xml:657 +#: apt_preferences.5.xml:705 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;" msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;" @@ -10054,6 +10217,32 @@ msgstr " # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade" msgid "Which will use the already fetched archives on the disc." msgstr "Które użyje pobranych uprzednio archiwów z dysku." +#~ msgid "<option>--md5</option>" +#~ msgstr "<option>--md5</option>" + +#~ msgid "unmarkauto" +#~ msgstr "unmarkauto" + +#~ msgid "<option>-h</option>" +#~ msgstr "<option>-h</option>" + +#~ msgid "<option>--help</option>" +#~ msgstr "<option>--help</option>" + +# +#~ msgid "Show a short usage summary." +#~ msgstr "Wyświetla krótkie informacje na temat użytkowania." + +#~ msgid "<option>-v</option>" +#~ msgstr "<option>-v</option>" + +#~ msgid "<option>--version</option>" +#~ msgstr "<option>--version</option>" + +# +#~ msgid "Show the program version." +#~ msgstr "Wyświetla wersję programu." + # #~ msgid "APT package handling utility -- cache manipulator" #~ msgstr "Narzędzie zarządzania pakietami APT -- manipulator bufora" @@ -10085,8 +10274,12 @@ msgstr "Które użyje pobranych uprzednio archiwów z dysku." #~ "Użycie HTTP do uzyskania dostępu do archiwum na komputerze nonus.debian." #~ "org, w katalogu debian-non-US." -#~ msgid "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free" -#~ msgstr "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free" +#~ msgid "" +#~ "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-" +#~ "free" +#~ msgstr "" +#~ "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-" +#~ "free" #~ msgid "OPTIONS" #~ msgstr "OPCJE" diff --git a/doc/po/pt.po b/doc/po/pt.po index ca1252475..69a19afa1 100644 --- a/doc/po/pt.po +++ b/doc/po/pt.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.8.0~pre1\n" -"POT-Creation-Date: 2011-02-14 13:42+0100\n" +"POT-Creation-Date: 2011-06-08 16:54+0300\n" "PO-Revision-Date: 2010-08-25 23:07+0100\n" "Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n" "Language-Team: Portuguese <traduz@debianpt.org>\n" @@ -763,7 +763,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50 #: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:114 -#: apt-key.8.xml:38 apt-mark.8.xml:55 apt-secure.8.xml:43 +#: apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43 #: apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36 #: sources.list.5.xml:36 msgid "Description" @@ -1279,7 +1279,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59 -#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:92 +#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:126 #: apt-sortpkgs.1.xml:57 apt.conf.5.xml:560 apt.conf.5.xml:582 msgid "options" msgstr "opções" @@ -1306,7 +1306,7 @@ msgstr "" "<literal>Dir::Cache::pkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:288 apt-ftparchive.1.xml:568 apt-get.8.xml:393 +#: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393 #: apt-sortpkgs.1.xml:61 msgid "<option>-s</option>" msgstr "<option>-s</option>" @@ -1332,12 +1332,12 @@ msgstr "" "pacote. Item de Configuração: <literal>Dir::Cache::srcpkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:296 apt-ftparchive.1.xml:542 apt-get.8.xml:383 +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 msgid "<option>-q</option>" msgstr "<option>-q</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:296 apt-ftparchive.1.xml:542 apt-get.8.xml:383 +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 msgid "<option>--quiet</option>" msgstr "<option>--quiet</option>" @@ -1451,7 +1451,7 @@ msgstr "" "<literal>APT::Cache::ShowFull</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:580 +#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583 msgid "<option>-a</option>" msgstr "<option>-a</option>" @@ -1568,14 +1568,14 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist> #: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101 -#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608 apt-get.8.xml:570 -#: apt-sortpkgs.1.xml:67 +#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570 +#: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67 msgid "&apt-commonoptions;" msgstr "&apt-commonoptions;" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:156 apt-mark.8.xml:125 -#: apt.conf.5.xml:1093 apt_preferences.5.xml:649 +#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:172 apt-mark.8.xml:144 +#: apt.conf.5.xml:1093 apt_preferences.5.xml:697 msgid "Files" msgstr "Ficheiros" @@ -1586,9 +1586,9 @@ msgstr "&file-sourceslist; &file-statelists;" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106 -#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:624 apt-get.8.xml:585 -#: apt-key.8.xml:177 apt-mark.8.xml:131 apt-secure.8.xml:185 -#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:656 +#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585 +#: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185 +#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704 #: sources.list.5.xml:234 msgid "See Also" msgstr "Veja também" @@ -1600,8 +1600,8 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111 -#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:628 apt-get.8.xml:591 -#: apt-mark.8.xml:135 apt-sortpkgs.1.xml:76 +#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591 +#: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76 msgid "Diagnostics" msgstr "Diagnóstico" @@ -1730,12 +1730,12 @@ msgstr "" "\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><title> -#: apt-cdrom.8.xml:94 apt-key.8.xml:142 +#: apt-cdrom.8.xml:94 apt-key.8.xml:158 msgid "Options" msgstr "Opções" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:536 apt-get.8.xml:345 +#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345 msgid "<option>-d</option>" msgstr "<option>-d</option>" @@ -1988,7 +1988,7 @@ msgid "Just show the contents of the configuration space." msgstr "Apenas mostra o conteúdo do espaço de configuração." #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:625 +#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628 #: apt-sortpkgs.1.xml:73 msgid "&apt-conf;" msgstr "&apt-conf;" @@ -3131,27 +3131,49 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-ftparchive.1.xml:529 -msgid "<option>--md5</option>" -msgstr "<option>--md5</option>" +msgid "" +"<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>" +msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:531 -msgid "" -"Generate MD5 sums. This defaults to on, when turned off the generated index " -"files will not have MD5Sum fields where possible. Configuration Item: " -"<literal>APT::FTPArchive::MD5</literal>" +#, fuzzy +#| msgid "" +#| "Values for the additional metadata fields in the Release file are taken " +#| "from the corresponding variables under <literal>APT::FTPArchive::Release</" +#| "literal>, e.g. <literal>APT::FTPArchive::Release::Origin</literal>. The " +#| "supported fields are: <literal>Origin</literal>, <literal>Label</" +#| "literal>, <literal>Suite</literal>, <literal>Version</literal>, " +#| "<literal>Codename</literal>, <literal>Date</literal>, <literal>Valid-" +#| "Until</literal>, <literal>Architectures</literal>, <literal>Components</" +#| "literal>, <literal>Description</literal>." +msgid "" +"Generate the given checksum. These options default to on, when turned off " +"the generated index files will not have the checksum fields where possible. " +"Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</" +"replaceable></literal> and <literal>APT::FTPArchive::<replaceable>Index</" +"replaceable>::<replaceable>Checksum</replaceable></literal> where " +"<literal>Index</literal> can be <literal>Packages</literal>, " +"<literal>Sources</literal> or <literal>Release</literal> and " +"<literal>Checksum</literal> can be <literal>MD5</literal>, <literal>SHA1</" +"literal> or <literal>SHA256</literal>." msgstr "" -"Gera sumários MD5. A predefinição é ligado, quando desligado os ficheiros " -"índice gerados não terão campos MD5Sum onde possíveis. Item de Configuração: " -"<literal>APT::FTPArchive::MD5</literal>" +"Valores para os campos de metadados adicionais no ficheiro Release são " +"tomados a partir das variáveis correspondentes sob <literal>APT::FTPArchive::" +"Release</literal>, ex. <literal>APT::FTPArchive::Release::Origin</literal>. " +"Os campos suportados são: <literal>Origin</literal>, <literal>Label</" +"literal>, <literal>Suite</literal>, <literal>Version</literal>, " +"<literal>Codename</literal>, <literal>Date</literal>, " +"<literal>Architectures</literal>, <literal>Components</literal>, " +"<literal>Description</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:536 +#: apt-ftparchive.1.xml:539 msgid "<option>--db</option>" msgstr "<option>--db</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:538 +#: apt-ftparchive.1.xml:541 msgid "" "Use a binary caching DB. This has no effect on the generate command. " "Configuration Item: <literal>APT::FTPArchive::DB</literal>." @@ -3160,7 +3182,7 @@ msgstr "" "generate. Item de configuração: <literal>APT::FTPArchive::DB</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:544 +#: apt-ftparchive.1.xml:547 msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quiet up to a maximum of 2. You can also use " @@ -3174,12 +3196,12 @@ msgstr "" "<literal>quiet</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:550 +#: apt-ftparchive.1.xml:553 msgid "<option>--delink</option>" msgstr "<option>--delink</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:552 +#: apt-ftparchive.1.xml:555 msgid "" "Perform Delinking. If the <literal>External-Links</literal> setting is used " "then this option actually enables delinking of the files. It defaults to on " @@ -3192,12 +3214,12 @@ msgstr "" "option>. Item de Configuração: <literal>APT::FTPArchive::DeLinkAct</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:558 +#: apt-ftparchive.1.xml:561 msgid "<option>--contents</option>" msgstr "<option>--contents</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:560 +#: apt-ftparchive.1.xml:563 msgid "" "Perform contents generation. When this option is set and package indexes are " "being generated with a cache DB then the file listing will also be extracted " @@ -3213,12 +3235,12 @@ msgstr "" "de Configuração: <literal>APT::FTPArchive::Contents</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:568 +#: apt-ftparchive.1.xml:571 msgid "<option>--source-override</option>" msgstr "<option>--source-override</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:570 +#: apt-ftparchive.1.xml:573 msgid "" "Select the source override file to use with the <literal>sources</literal> " "command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</" @@ -3229,12 +3251,12 @@ msgstr "" "SourceOverride</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:574 +#: apt-ftparchive.1.xml:577 msgid "<option>--readonly</option>" msgstr "<option>--readonly</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:576 +#: apt-ftparchive.1.xml:579 msgid "" "Make the caching databases read only. Configuration Item: <literal>APT::" "FTPArchive::ReadOnlyDB</literal>." @@ -3243,12 +3265,12 @@ msgstr "" "<literal>APT::FTPArchive::ReadOnlyDB</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:580 +#: apt-ftparchive.1.xml:583 msgid "<option>--arch</option>" msgstr "<option>--arch</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:581 +#: apt-ftparchive.1.xml:584 msgid "" "Accept in the <literal>packages</literal> and <literal>contents</literal> " "commands only package files matching <literal>*_arch.deb</literal> or " @@ -3262,12 +3284,12 @@ msgstr "" "FTPArchive::Architecture</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:587 +#: apt-ftparchive.1.xml:590 msgid "<option>APT::FTPArchive::AlwaysStat</option>" msgstr "<option>APT::FTPArchive::AlwaysStat</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:589 +#: apt-ftparchive.1.xml:592 msgid "" "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If " "packages are recompiled and/or republished with the same version again, this " @@ -3291,12 +3313,12 @@ msgstr "" "as verificações extras serão desnecessárias." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:599 +#: apt-ftparchive.1.xml:602 msgid "<option>APT::FTPArchive::LongDescription</option>" msgstr "<option>APT::FTPArchive::LongDescription</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:601 +#: apt-ftparchive.1.xml:604 msgid "" "This configuration option defaults to \"<literal>true</literal>\" and should " "only be set to <literal>\"false\"</literal> if the Archive generated with " @@ -3311,19 +3333,19 @@ msgstr "" "<filename>Translation-en</filename> só pode ser criado no comando generate." #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:613 apt.conf.5.xml:1087 apt_preferences.5.xml:496 +#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:544 #: sources.list.5.xml:198 msgid "Examples" msgstr "Examples" #. type: Content of: <refentry><refsect1><para><programlisting> -#: apt-ftparchive.1.xml:619 +#: apt-ftparchive.1.xml:622 #, no-wrap msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" msgstr "<command>apt-ftparchive</command> pacotes <replaceable>directório</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:615 +#: apt-ftparchive.1.xml:618 msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" @@ -3332,7 +3354,7 @@ msgstr "" "pacotes binários (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:629 +#: apt-ftparchive.1.xml:632 msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@ -4672,8 +4694,24 @@ msgstr "" "Actualiza o chaveiro local com o chaveiro das chaves de arquivos Debian e " "remove do chaveiro as chaves de arquivo que já não são válidas." +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:140 +#, fuzzy +#| msgid "update" +msgid "net-update" +msgstr "update" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:144 +msgid "" +"Update the local keyring with the keys of a key server and removes from the " +"keyring the archive keys which are no longer valid. This requires an " +"installed wget and an APT build configured to have a server to fetch from. " +"APT in Debian does not support this command, but Ubuntu's APT does." +msgstr "" + #. type: Content of: <refentry><refsect1><para> -#: apt-key.8.xml:143 +#: apt-key.8.xml:159 msgid "" "Note that options need to be defined before the commands described in the " "previous section." @@ -4682,12 +4720,12 @@ msgstr "" "secção prévia." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:145 +#: apt-key.8.xml:161 msgid "--keyring <replaceable>filename</replaceable>" msgstr "--keyring <replaceable>nome-de-ficheiro</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:146 +#: apt-key.8.xml:162 msgid "" "With this option it is possible to specify a specific keyring file the " "command should operate on. The default is that a command is executed on the " @@ -4704,53 +4742,57 @@ msgstr "" "chaves são adicionadas a este." #. type: Content of: <refentry><refsect1><variablelist> -#: apt-key.8.xml:159 +#: apt-key.8.xml:175 msgid "&file-trustedgpg;" msgstr "&file-trustedgpg;" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:161 +#: apt-key.8.xml:177 msgid "<filename>/etc/apt/trustdb.gpg</filename>" msgstr "<filename>/etc/apt/trustdb.gpg</filename>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:162 +#: apt-key.8.xml:178 msgid "Local trust database of archive keys." msgstr "Base de dados local de confiança de chaves de arquivos." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:165 +#: apt-key.8.xml:181 msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:166 +#: apt-key.8.xml:182 msgid "Keyring of Debian archive trusted keys." msgstr "Chaveiro das chaves de confiança dos arquivos Debian." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:169 +#: apt-key.8.xml:185 msgid "" "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" msgstr "" "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:170 +#: apt-key.8.xml:186 msgid "Keyring of Debian archive removed trusted keys." msgstr "Chaveiro das chaves de confiança removidas dos arquivos Debian." #. type: Content of: <refentry><refsect1><para> -#: apt-key.8.xml:179 +#: apt-key.8.xml:195 msgid "&apt-get;, &apt-secure;" msgstr "&apt-get;, &apt-secure;" #. The last update date #. type: Content of: <refentry><refentryinfo> #: apt-mark.8.xml:16 +#, fuzzy +#| msgid "" +#| "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 " +#| "August 2009</date>" msgid "" -"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 " -"August 2009</date>" +"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>21 " +"April 2011</date>" msgstr "" "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 " "Agosto 2009</date>" @@ -4767,13 +4809,22 @@ msgstr "marca/desmarca um pacote como sendo instalado automaticamente" #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> #: apt-mark.8.xml:39 +#, fuzzy +#| msgid "" +#| " <command>apt-mark</command> <arg><option>-hv</option></arg> " +#| "<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> <group " +#| "choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg " +#| "choice=\"plain\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </" +#| "group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>package</" +#| "replaceable></arg> </arg> <arg choice=\"plain\">showauto</arg> </group>" msgid "" " <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-" "f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain" "\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain" -"\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </group> <arg " +"\">auto</arg> <arg choice=\"plain\">manual</arg> <arg choice=\"plain" +"\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </group> <arg " "choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </" -"arg> <arg choice=\"plain\">showauto</arg> </group>" +"arg> </group>" msgstr "" " <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-" "f=<replaceable>NOME DE FICHEIRO</replaceable></option></arg> <group choice=" @@ -4783,7 +4834,7 @@ msgstr "" "arg> <arg choice=\"plain\">showauto</arg> </group>" #. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:56 +#: apt-mark.8.xml:57 msgid "" "<command>apt-mark</command> will change whether a package has been marked as " "being automatically installed." @@ -4792,7 +4843,7 @@ msgstr "" "sendo instalado automaticamente." #. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:60 +#: apt-mark.8.xml:61 msgid "" "When you request that a package is installed, and as a result other packages " "are installed to satisfy its dependencies, the dependencies are marked as " @@ -4808,14 +4859,21 @@ msgstr "" "command> ou <command>aptitude</command> (exemplos)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:68 -msgid "markauto" +#: apt-mark.8.xml:69 +#, fuzzy +#| msgid "markauto" +msgid "auto" msgstr "markauto" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:69 +#: apt-mark.8.xml:70 +#, fuzzy +#| msgid "" +#| "<literal>markauto</literal> is used to mark a package as being " +#| "automatically installed, which will cause the package to be removed when " +#| "no more manually installed packages depend on this package." msgid "" -"<literal>markauto</literal> is used to mark a package as being automatically " +"<literal>auto</literal> is used to mark a package as being automatically " "installed, which will cause the package to be removed when no more manually " "installed packages depend on this package." msgstr "" @@ -4824,14 +4882,19 @@ msgstr "" "nenhum pacote instalado manualmente depender deste pacote." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:76 -msgid "unmarkauto" -msgstr "unmarkauto" +#: apt-mark.8.xml:77 +msgid "manual" +msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:77 +#: apt-mark.8.xml:78 +#, fuzzy +#| msgid "" +#| "<literal>unmarkauto</literal> is used to mark a package as being manually " +#| "installed, which will prevent the package from being automatically " +#| "removed if no other packages depend on it." msgid "" -"<literal>unmarkauto</literal> is used to mark a package as being manually " +"<literal>manual</literal> is used to mark a package as being manually " "installed, which will prevent the package from being automatically removed " "if no other packages depend on it." msgstr "" @@ -4840,21 +4903,95 @@ msgstr "" "automaticamente se nenhum outro pacote depender dele." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:84 +#: apt-mark.8.xml:85 +msgid "hold" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:86 +msgid "" +"<literal>hold</literal> is used to mark a package as hold back, which will " +"prevent the package from being automatically installed, upgraded or " +"removed. The command is only a wrapper around <command>dpkg --set-" +"selections</command> and the state is therefore maintained by &dpkg; and not " +"effected by the <option>--filename</option> option." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:95 +msgid "unhold" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:96 +#, fuzzy +#| msgid "" +#| "<literal>showauto</literal> is used to print a list of automatically " +#| "installed packages with each package on a new line." +msgid "" +"<literal>unhold</literal> is used to cancel a previously set hold on a " +"package to allow all actions again." +msgstr "" +"<literal>showauto</literal> é usado para escrever uma lista dos pacotes " +"instalados automaticamente com cada pacote numa linha nova." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:101 msgid "showauto" msgstr "showauto" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:85 +#: apt-mark.8.xml:102 +#, fuzzy +#| msgid "" +#| "<literal>showauto</literal> is used to print a list of automatically " +#| "installed packages with each package on a new line." msgid "" "<literal>showauto</literal> is used to print a list of automatically " -"installed packages with each package on a new line." +"installed packages with each package on a new line. All automatically " +"installed packages will be listed if no package is given. If packages are " +"given only those which are automatically installed will be shown." msgstr "" "<literal>showauto</literal> é usado para escrever uma lista dos pacotes " "instalados automaticamente com cada pacote numa linha nova." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:96 +#: apt-mark.8.xml:109 +#, fuzzy +#| msgid "showauto" +msgid "showmanual" +msgstr "showauto" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:110 +msgid "" +"<literal>showmanual</literal> can be used in the same way as " +"<literal>showauto</literal> except that it will print a list of manually " +"installed packages instead." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:116 +#, fuzzy +#| msgid "showauto" +msgid "showhold" +msgstr "showauto" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:117 +#, fuzzy +#| msgid "" +#| "<literal>showauto</literal> is used to print a list of automatically " +#| "installed packages with each package on a new line." +msgid "" +"<literal>showhold</literal> is used to print a list of packages on hold in " +"the same way as for the other show commands." +msgstr "" +"<literal>showauto</literal> é usado para escrever uma lista dos pacotes " +"instalados automaticamente com cada pacote numa linha nova." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:130 msgid "" "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>" msgstr "" @@ -4862,7 +4999,7 @@ msgstr "" "option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:97 +#: apt-mark.8.xml:131 msgid "" "<option>--file=<filename><replaceable>FILENAME</replaceable></filename></" "option>" @@ -4871,7 +5008,7 @@ msgstr "" "filename></option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:100 +#: apt-mark.8.xml:134 msgid "" "Read/Write package stats from <filename><replaceable>FILENAME</replaceable></" "filename> instead of the default location, which is " @@ -4883,48 +5020,18 @@ msgstr "" "localização predefinida, a qual é <filename>extended_status</filename> no " "directório definido pelo Item de Configuração: <literal>Dir::State</literal>." -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:106 -msgid "<option>-h</option>" -msgstr "<option>-h</option>" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:107 -msgid "<option>--help</option>" -msgstr "<option>--help</option>" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:108 -msgid "Show a short usage summary." -msgstr "Mostra um curto sumário de utilização." - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:114 -msgid "<option>-v</option>" -msgstr "<option>-v</option>" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:115 -msgid "<option>--version</option>" -msgstr "<option>--version</option>" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:116 -msgid "Show the program version." -msgstr "Mostra a versão do programa." - #. type: Content of: <refentry><refsect1><variablelist> -#: apt-mark.8.xml:127 +#: apt-mark.8.xml:146 msgid " &file-extended_states;" msgstr " &file-extended_states;" #. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:132 +#: apt-mark.8.xml:151 msgid "&apt-get;,&aptitude;,&apt-conf;" msgstr "&apt-get;,&aptitude;,&apt-conf;" #. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:136 +#: apt-mark.8.xml:155 msgid "" "<command>apt-mark</command> returns zero on normal operation, non-zero on " "error." @@ -7787,32 +7894,50 @@ msgstr "priority 1" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #: apt_preferences.5.xml:107 +#, fuzzy +#| msgid "" +#| "to the versions coming from archives which in their <filename>Release</" +#| "filename> files are marked as \"NotAutomatic: yes\" like the debian " +#| "experimental archive." msgid "" "to the versions coming from archives which in their <filename>Release</" -"filename> files are marked as \"NotAutomatic: yes\" like the debian " -"experimental archive." +"filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</" +"emphasis> as \"ButAutomaticUpgrades: yes\" like the debian " +"<literal>experimental</literal> archive." msgstr "" "para as versões vindas de arquivos cujos ficheiros <filename>Release</" "filename> estejam marcados como \"NotAutomatic: yes\" como o arquivo " "experimental da debian." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:112 +#: apt_preferences.5.xml:113 msgid "priority 100" msgstr "priority 100" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:113 -msgid "to the version that is already installed (if any)." -msgstr "para a versão que já está instalada (se alguma)." +#: apt_preferences.5.xml:114 +#, fuzzy +#| msgid "" +#| "to the versions coming from archives which in their <filename>Release</" +#| "filename> files are marked as \"NotAutomatic: yes\" like the debian " +#| "experimental archive." +msgid "" +"to the version that is already installed (if any) and to the versions coming " +"from archives which in their <filename>Release</filename> files are marked " +"as \"NotAutomatic: yes\" and \"ButAutomaticUpgrades: yes\" like the debian " +"backports archive since <literal>squeeze-backports</literal>." +msgstr "" +"para as versões vindas de arquivos cujos ficheiros <filename>Release</" +"filename> estejam marcados como \"NotAutomatic: yes\" como o arquivo " +"experimental da debian." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:117 +#: apt_preferences.5.xml:121 msgid "priority 500" msgstr "priority 500" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:118 +#: apt_preferences.5.xml:122 msgid "" "to the versions that are not installed and do not belong to the target " "release." @@ -7821,12 +7946,12 @@ msgstr "" "destinado." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:122 +#: apt_preferences.5.xml:126 msgid "priority 990" msgstr "priority 990" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:123 +#: apt_preferences.5.xml:127 msgid "" "to the versions that are not installed and belong to the target release." msgstr "" @@ -7844,13 +7969,21 @@ msgstr "" "<placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:128 +#: apt_preferences.5.xml:132 +#, fuzzy +#| msgid "" +#| "If the target release has not been specified then APT simply assigns " +#| "priority 100 to all installed package versions and priority 500 to all " +#| "uninstalled package versions, expect versions coming from archives which " +#| "in their <filename>Release</filename> files are marked as \"NotAutomatic: " +#| "yes\" - these versions get the priority 1." msgid "" "If the target release has not been specified then APT simply assigns " "priority 100 to all installed package versions and priority 500 to all " -"uninstalled package versions, expect versions coming from archives which in " +"uninstalled package versions, except versions coming from archives which in " "their <filename>Release</filename> files are marked as \"NotAutomatic: yes\" " -"- these versions get the priority 1." +"- these versions get the priority 1 or priority 100 if it is additionally " +"marked as \"ButAutomaticUpgrades: yes\"." msgstr "" "Se o lançamento de destino não foi especificado, então o APT simplesmente " "atribui prioridade 100 a todas as versões de pacotes instalados e prioridade " @@ -7859,7 +7992,7 @@ msgstr "" "marcados como \"NotAutomatic: yes\" - estas versões ficam com prioridade 1." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:134 +#: apt_preferences.5.xml:139 msgid "" "APT then applies the following rules, listed in order of precedence, to " "determine which version of a package to install." @@ -7868,7 +8001,7 @@ msgstr "" "para determinar qual versão de um pacote deve instalar." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:137 +#: apt_preferences.5.xml:142 msgid "" "Never downgrade unless the priority of an available version exceeds 1000. " "(\"Downgrading\" is installing a less recent version of a package in place " @@ -7884,12 +8017,12 @@ msgstr "" "arriscado.)" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:143 +#: apt_preferences.5.xml:148 msgid "Install the highest priority version." msgstr "Instala a versão de prioridade mais alta." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:144 +#: apt_preferences.5.xml:149 msgid "" "If two or more versions have the same priority, install the most recent one " "(that is, the one with the higher version number)." @@ -7898,7 +8031,7 @@ msgstr "" "(isto é, aquela com o número de versão mais alto)." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:147 +#: apt_preferences.5.xml:152 msgid "" "If two or more versions have the same priority and version number but either " "the packages differ in some of their metadata or the <literal>--reinstall</" @@ -7909,7 +8042,7 @@ msgstr "" "reinstall</literal> é fornecida, instala a que foi desinstalada." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:153 +#: apt_preferences.5.xml:158 msgid "" "In a typical situation, the installed version of a package (priority 100) " "is not as recent as one of the versions available from the sources listed in " @@ -7924,7 +8057,7 @@ msgstr "" "replaceable></command> ou <command>apt-get upgrade</command>." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:160 +#: apt_preferences.5.xml:165 msgid "" "More rarely, the installed version of a package is <emphasis>more</emphasis> " "recent than any of the other available versions. The package will not be " @@ -7938,7 +8071,7 @@ msgstr "" "get upgrade</command>." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:165 +#: apt_preferences.5.xml:170 msgid "" "Sometimes the installed version of a package is more recent than the version " "belonging to the target release, but not as recent as a version belonging to " @@ -7957,12 +8090,12 @@ msgstr "" "prioridade mais alta que a versão instalada." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:174 +#: apt_preferences.5.xml:179 msgid "The Effect of APT Preferences" msgstr "O Efeito das Preferências do APT" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:176 +#: apt_preferences.5.xml:181 msgid "" "The APT preferences file allows the system administrator to control the " "assignment of priorities. The file consists of one or more multi-line " @@ -7975,7 +8108,7 @@ msgstr "" "um ou dois formatos, um formato específico e um formato geral." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:182 +#: apt_preferences.5.xml:187 msgid "" "The specific form assigns a priority (a \"Pin-Priority\") to one or more " "specified packages and specified version or version range. For example, the " @@ -7991,7 +8124,7 @@ msgstr "" "espaços." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:189 +#: apt_preferences.5.xml:194 #, no-wrap msgid "" "Package: perl\n" @@ -8003,7 +8136,7 @@ msgstr "" "Pin-Priority: 1001\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:195 +#: apt_preferences.5.xml:200 msgid "" "The general form assigns a priority to all of the package versions in a " "given distribution (that is, to all the versions of packages that are listed " @@ -8018,7 +8151,7 @@ msgstr "" "nome de domínio totalmente qualificado do site." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:201 +#: apt_preferences.5.xml:206 msgid "" "This general-form entry in the APT preferences file applies only to groups " "of packages. For example, the following record assigns a high priority to " @@ -8030,7 +8163,7 @@ msgstr "" "local." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:206 +#: apt_preferences.5.xml:211 #, no-wrap msgid "" "Package: *\n" @@ -8042,7 +8175,7 @@ msgstr "" "Pin-Priority: 999\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:211 +#: apt_preferences.5.xml:216 msgid "" "A note of caution: the keyword used here is \"<literal>origin</literal>\" " "which can be used to match a hostname. The following record will assign a " @@ -8055,7 +8188,7 @@ msgstr "" "servidor identificadas pelo nome de máquina \"ftp.de.debian.org\"" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:215 +#: apt_preferences.5.xml:220 #, no-wrap msgid "" "Package: *\n" @@ -8067,7 +8200,7 @@ msgstr "" "Pin-Priority: 999\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:219 +#: apt_preferences.5.xml:224 msgid "" "This should <emphasis>not</emphasis> be confused with the Origin of a " "distribution as specified in a <filename>Release</filename> file. What " @@ -8082,7 +8215,7 @@ msgstr "" "como \"Debian\" ou \"Ximian\"." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:224 +#: apt_preferences.5.xml:229 msgid "" "The following record assigns a low priority to all package versions " "belonging to any distribution whose Archive name is \"<literal>unstable</" @@ -8093,7 +8226,7 @@ msgstr "" "\"<literal>unstable</literal>\"." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:228 +#: apt_preferences.5.xml:233 #, no-wrap msgid "" "Package: *\n" @@ -8105,7 +8238,7 @@ msgstr "" "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:233 +#: apt_preferences.5.xml:238 msgid "" "The following record assigns a high priority to all package versions " "belonging to any distribution whose Codename is \"<literal>&testing-codename;" @@ -8116,7 +8249,7 @@ msgstr "" "\"<literal>&testing-codename;</literal>\"." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:237 +#: apt_preferences.5.xml:242 #, no-wrap msgid "" "Package: *\n" @@ -8128,7 +8261,7 @@ msgstr "" "Pin-Priority: 900\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:242 +#: apt_preferences.5.xml:247 msgid "" "The following record assigns a high priority to all package versions " "belonging to any release whose Archive name is \"<literal>stable</literal>\" " @@ -8140,7 +8273,7 @@ msgstr "" "\"." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:247 +#: apt_preferences.5.xml:252 #, no-wrap msgid "" "Package: *\n" @@ -8152,17 +8285,84 @@ msgstr "" "Pin-Priority: 500\n" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:258 +#: apt_preferences.5.xml:262 +msgid "Regular expressions and glob() syntax" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:264 +msgid "" +"APT also supports pinning by glob() expressions and regular expressions " +"surrounded by /. For example, the following example assigns the priority 500 " +"to all packages from experimental where the name starts with gnome (as a glob" +"()-like expression or contains the word kde (as a POSIX extended regular " +"expression surrounded by slashes)." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><programlisting> +#: apt_preferences.5.xml:273 +#, fuzzy, no-wrap +#| msgid "" +#| "Package: *\n" +#| "Pin: release a=unstable\n" +#| "Pin-Priority: 50\n" +msgid "" +"Package: gnome* /kde/\n" +"Pin: release n=experimental\n" +"Pin-Priority: 500\n" +msgstr "" +"Package: *\n" +"Pin: release a=unstable\n" +"Pin-Priority: 50\n" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:279 +msgid "" +"The rule for those expressions is that they can occur anywhere where a " +"string can occur. Those, the following pin assigns the priority 990 to all " +"packages from a release starting with karmic." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><programlisting> +#: apt_preferences.5.xml:285 +#, fuzzy, no-wrap +#| msgid "" +#| "Package: *\n" +#| "Pin: release a=unstable\n" +#| "Pin-Priority: 50\n" +msgid "" +"Package: *\n" +"Pin: release n=karmic*\n" +"Pin-Priority: 990\n" +msgstr "" +"Package: *\n" +"Pin: release a=unstable\n" +"Pin-Priority: 50\n" + +#. type: Content of: <refentry><refsect1><refsect2><literal> +#: apt_preferences.5.xml:290 +#, fuzzy +#| msgid "Packages" +msgid "Package" +msgstr "Packages" + +#. type: Content of: <refentry><refsect1><refsect2><literal> +#: apt_preferences.5.xml:296 +msgid "*" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt_preferences.5.xml:306 msgid "How APT Interprets Priorities" msgstr "Como o APT Interpreta as Prioridades" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:266 +#: apt_preferences.5.xml:314 msgid "P > 1000" msgstr "P > 1000" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:267 +#: apt_preferences.5.xml:315 msgid "" "causes a version to be installed even if this constitutes a downgrade of the " "package" @@ -8171,12 +8371,12 @@ msgstr "" "na versão do pacote (downgrade)" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:271 +#: apt_preferences.5.xml:319 msgid "990 < P <=1000" msgstr "990 < P <=1000" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:272 +#: apt_preferences.5.xml:320 msgid "" "causes a version to be installed even if it does not come from the target " "release, unless the installed version is more recent" @@ -8185,12 +8385,12 @@ msgstr "" "destino, a menos que a versão instalada seja mais recente" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:277 +#: apt_preferences.5.xml:325 msgid "500 < P <=990" msgstr "500 < P <=990" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:278 +#: apt_preferences.5.xml:326 msgid "" "causes a version to be installed unless there is a version available " "belonging to the target release or the installed version is more recent" @@ -8200,12 +8400,12 @@ msgstr "" "mais recente" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:283 +#: apt_preferences.5.xml:331 msgid "100 < P <=500" msgstr "100 < P <=500" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:284 +#: apt_preferences.5.xml:332 msgid "" "causes a version to be installed unless there is a version available " "belonging to some other distribution or the installed version is more recent" @@ -8215,12 +8415,12 @@ msgstr "" "recente" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:289 +#: apt_preferences.5.xml:337 msgid "0 < P <=100" msgstr "0 < P <=100" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:290 +#: apt_preferences.5.xml:338 msgid "" "causes a version to be installed only if there is no installed version of " "the package" @@ -8229,17 +8429,17 @@ msgstr "" "instalada do pacote" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:294 +#: apt_preferences.5.xml:342 msgid "P < 0" msgstr "P < 0" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:295 +#: apt_preferences.5.xml:343 msgid "prevents the version from being installed" msgstr "previne a instalação da versão" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:261 +#: apt_preferences.5.xml:309 msgid "" "Priorities (P) assigned in the APT preferences file must be positive or " "negative integers. They are interpreted as follows (roughly speaking): " @@ -8250,7 +8450,7 @@ msgstr "" "(falando grosso): <placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:300 +#: apt_preferences.5.xml:348 msgid "" "If any specific-form records match an available package version then the " "first such record determines the priority of the package version. Failing " @@ -8264,7 +8464,7 @@ msgstr "" "determina a prioridade da versão de pacote." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:306 +#: apt_preferences.5.xml:354 msgid "" "For example, suppose the APT preferences file contains the three records " "presented earlier:" @@ -8273,7 +8473,7 @@ msgstr "" "registos apresentados atrás:" #. type: Content of: <refentry><refsect1><refsect2><programlisting> -#: apt_preferences.5.xml:310 +#: apt_preferences.5.xml:358 #, no-wrap msgid "" "Package: perl\n" @@ -8301,12 +8501,12 @@ msgstr "" "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:323 +#: apt_preferences.5.xml:371 msgid "Then:" msgstr "Então:" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:325 +#: apt_preferences.5.xml:373 msgid "" "The most recent available version of the <literal>perl</literal> package " "will be installed, so long as that version's version number begins with " @@ -8321,7 +8521,7 @@ msgstr "" "downgrade ao <literal>perl</literal>." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:330 +#: apt_preferences.5.xml:378 msgid "" "A version of any package other than <literal>perl</literal> that is " "available from the local system has priority over other versions, even " @@ -8332,7 +8532,7 @@ msgstr "" "versões, mesmo versões que pertencem ao lançamento de destino." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:334 +#: apt_preferences.5.xml:382 msgid "" "A version of a package whose origin is not the local system but some other " "site listed in &sources-list; and which belongs to an <literal>unstable</" @@ -8345,12 +8545,12 @@ msgstr "" "instalação e se nenhuma versão do pacote já estiver instalada." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:344 +#: apt_preferences.5.xml:392 msgid "Determination of Package Version and Distribution Properties" msgstr "Determinação da Versão do Pacote e Propriedades da Distribuição" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:346 +#: apt_preferences.5.xml:394 msgid "" "The locations listed in the &sources-list; file should provide " "<filename>Packages</filename> and <filename>Release</filename> files to " @@ -8361,27 +8561,27 @@ msgstr "" "descrever os pacotes disponíveis nessa localização." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:358 +#: apt_preferences.5.xml:406 msgid "the <literal>Package:</literal> line" msgstr "a linha <literal>Package:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:359 +#: apt_preferences.5.xml:407 msgid "gives the package name" msgstr "fornece o nome do pacote" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:362 apt_preferences.5.xml:412 +#: apt_preferences.5.xml:410 apt_preferences.5.xml:460 msgid "the <literal>Version:</literal> line" msgstr "a linha <literal>Version:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:363 +#: apt_preferences.5.xml:411 msgid "gives the version number for the named package" msgstr "fornece o número de versão do pacote nomeado" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:350 +#: apt_preferences.5.xml:398 msgid "" "The <filename>Packages</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable>/" @@ -8402,12 +8602,12 @@ msgstr "" "definir prioridades do APT: <placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:379 +#: apt_preferences.5.xml:427 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line" msgstr "a linha <literal>Archive:</literal> ou <literal>Suite:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:380 +#: apt_preferences.5.xml:428 msgid "" "names the archive to which all the packages in the directory tree belong. " "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies " @@ -8424,18 +8624,18 @@ msgstr "" "requerer a linha:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:390 +#: apt_preferences.5.xml:438 #, no-wrap msgid "Pin: release a=stable\n" msgstr "Pin: release a=stable\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:396 +#: apt_preferences.5.xml:444 msgid "the <literal>Codename:</literal> line" msgstr "a linha <literal>Codename:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:397 +#: apt_preferences.5.xml:445 msgid "" "names the codename to which all the packages in the directory tree belong. " "For example, the line \"Codename: &testing-codename;\" specifies that all of " @@ -8452,13 +8652,13 @@ msgstr "" "preferências do APT requer a linha:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:406 +#: apt_preferences.5.xml:454 #, no-wrap msgid "Pin: release n=&testing-codename;\n" msgstr "Pin: release n=&testing-codename;\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:413 +#: apt_preferences.5.xml:461 msgid "" "names the release version. For example, the packages in the tree might " "belong to Debian GNU/Linux release version 3.0. Note that there is normally " @@ -8474,7 +8674,7 @@ msgstr "" "seguintes linhas:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:422 +#: apt_preferences.5.xml:470 #, no-wrap msgid "" "Pin: release v=3.0\n" @@ -8486,12 +8686,12 @@ msgstr "" "Pin: release 3.0\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:431 +#: apt_preferences.5.xml:479 msgid "the <literal>Component:</literal> line" msgstr "a linha <literal>Component:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:432 +#: apt_preferences.5.xml:480 msgid "" "names the licensing component associated with the packages in the directory " "tree of the <filename>Release</filename> file. For example, the line " @@ -8509,18 +8709,18 @@ msgstr "" "a linha:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:441 +#: apt_preferences.5.xml:489 #, no-wrap msgid "Pin: release c=main\n" msgstr "Pin: release c=main\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:447 +#: apt_preferences.5.xml:495 msgid "the <literal>Origin:</literal> line" msgstr "a linha <literal>Origin:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:448 +#: apt_preferences.5.xml:496 msgid "" "names the originator of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@ -8533,18 +8733,18 @@ msgstr "" "linha:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:454 +#: apt_preferences.5.xml:502 #, no-wrap msgid "Pin: release o=Debian\n" msgstr "Pin: release o=Debian\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:460 +#: apt_preferences.5.xml:508 msgid "the <literal>Label:</literal> line" msgstr "a linha <literal>Label:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:461 +#: apt_preferences.5.xml:509 msgid "" "names the label of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@ -8557,13 +8757,13 @@ msgstr "" "linha:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:467 +#: apt_preferences.5.xml:515 #, no-wrap msgid "Pin: release l=Debian\n" msgstr "Pin: release l=Debian\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:368 +#: apt_preferences.5.xml:416 msgid "" "The <filename>Release</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for " @@ -8586,7 +8786,7 @@ msgstr "" "APT: <placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:474 +#: apt_preferences.5.xml:522 msgid "" "All of the <filename>Packages</filename> and <filename>Release</filename> " "files retrieved from locations listed in the &sources-list; file are stored " @@ -8611,12 +8811,12 @@ msgstr "" "literal> da distribuição <literal>unstable</literal>." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:487 +#: apt_preferences.5.xml:535 msgid "Optional Lines in an APT Preferences Record" msgstr "Linhas Opcionais num Registo de Preferências do APT" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:489 +#: apt_preferences.5.xml:537 msgid "" "Each record in the APT preferences file can optionally begin with one or " "more lines beginning with the word <literal>Explanation:</literal>. This " @@ -8627,12 +8827,12 @@ msgstr "" "literal>. Isto disponibiliza um espaço para comentários." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:498 +#: apt_preferences.5.xml:546 msgid "Tracking Stable" msgstr "Acompanhando Stable" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:506 +#: apt_preferences.5.xml:554 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated\n" @@ -8656,7 +8856,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:500 +#: apt_preferences.5.xml:548 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -8672,8 +8872,8 @@ msgstr "" "\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:523 apt_preferences.5.xml:569 -#: apt_preferences.5.xml:627 +#: apt_preferences.5.xml:571 apt_preferences.5.xml:617 +#: apt_preferences.5.xml:675 #, no-wrap msgid "" "apt-get install <replaceable>package-name</replaceable>\n" @@ -8685,7 +8885,7 @@ msgstr "" "apt-get dist-upgrade\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:518 +#: apt_preferences.5.xml:566 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@ -8698,13 +8898,13 @@ msgstr "" "\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:535 +#: apt_preferences.5.xml:583 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/testing\n" msgstr "apt-get install <replaceable>pacote</replaceable>/testing\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:529 +#: apt_preferences.5.xml:577 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>testing</literal> distribution; the package " @@ -8717,12 +8917,12 @@ msgstr "" "outra vez. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:541 +#: apt_preferences.5.xml:589 msgid "Tracking Testing or Unstable" msgstr "Acompanhando Testing ou Unstable" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:550 +#: apt_preferences.5.xml:598 #, no-wrap msgid "" "Package: *\n" @@ -8750,7 +8950,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:543 +#: apt_preferences.5.xml:591 msgid "" "The following APT preferences file will cause APT to assign a high priority " "to package versions from the <literal>testing</literal> distribution, a " @@ -8767,7 +8967,7 @@ msgstr "" "<placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:564 +#: apt_preferences.5.xml:612 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@ -8780,13 +8980,13 @@ msgstr "" "\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:584 +#: apt_preferences.5.xml:632 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/unstable\n" msgstr "apt-get install <replaceable>pacote</replaceable>/unstable\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:575 +#: apt_preferences.5.xml:623 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>unstable</literal> distribution. " @@ -8805,12 +9005,12 @@ msgstr "" "versão instalada. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:591 +#: apt_preferences.5.xml:639 msgid "Tracking the evolution of a codename release" msgstr "Acompanhando a evolução de um nome de código de lançamento" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:605 +#: apt_preferences.5.xml:653 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated package versions\n" @@ -8844,7 +9044,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:593 +#: apt_preferences.5.xml:641 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -8870,7 +9070,7 @@ msgstr "" "<placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:622 +#: apt_preferences.5.xml:670 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest version(s) in " @@ -8883,13 +9083,13 @@ msgstr "" "codename;</literal>. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:642 +#: apt_preferences.5.xml:690 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/sid\n" msgstr "apt-get install <replaceable>pacote</replaceable>/sid\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:633 +#: apt_preferences.5.xml:681 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>sid</literal> distribution. Thereafter, " @@ -8908,12 +9108,12 @@ msgstr "" "instalada. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><variablelist> -#: apt_preferences.5.xml:651 +#: apt_preferences.5.xml:699 msgid "&file-preferences;" msgstr "&file-preferences;" #. type: Content of: <refentry><refsect1><para> -#: apt_preferences.5.xml:657 +#: apt_preferences.5.xml:705 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;" msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;" @@ -10930,6 +11130,42 @@ msgstr " # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade" msgid "Which will use the already fetched archives on the disc." msgstr "O qual irá usar os arquivos já obtidos e que estão no disco." +#~ msgid "<option>--md5</option>" +#~ msgstr "<option>--md5</option>" + +#~ msgid "" +#~ "Generate MD5 sums. This defaults to on, when turned off the generated " +#~ "index files will not have MD5Sum fields where possible. Configuration " +#~ "Item: <literal>APT::FTPArchive::MD5</literal>" +#~ msgstr "" +#~ "Gera sumários MD5. A predefinição é ligado, quando desligado os ficheiros " +#~ "índice gerados não terão campos MD5Sum onde possíveis. Item de " +#~ "Configuração: <literal>APT::FTPArchive::MD5</literal>" + +#~ msgid "unmarkauto" +#~ msgstr "unmarkauto" + +#~ msgid "<option>-h</option>" +#~ msgstr "<option>-h</option>" + +#~ msgid "<option>--help</option>" +#~ msgstr "<option>--help</option>" + +#~ msgid "Show a short usage summary." +#~ msgstr "Mostra um curto sumário de utilização." + +#~ msgid "<option>-v</option>" +#~ msgstr "<option>-v</option>" + +#~ msgid "<option>--version</option>" +#~ msgstr "<option>--version</option>" + +#~ msgid "Show the program version." +#~ msgstr "Mostra a versão do programa." + +#~ msgid "to the version that is already installed (if any)." +#~ msgstr "para a versão que já está instalada (se alguma)." + #~ msgid "APT package handling utility -- cache manipulator" #~ msgstr "" #~ "Utilitário de manuseamento de pacotes do APT -- manipulador de cache" @@ -10989,8 +11225,12 @@ msgstr "O qual irá usar os arquivos já obtidos e que estão no disco." #~ "Usa HTTP para aceder ao arquivo em nonus.debian.org, sob o directório " #~ "debian-non-US." -#~ msgid "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free" -#~ msgstr "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free" +#~ msgid "" +#~ "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-" +#~ "free" +#~ msgstr "" +#~ "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-" +#~ "free" #~ msgid "OPTIONS" #~ msgstr "OPÇÕES" diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po index 0b98064b9..43ae0ca42 100644 --- a/doc/po/pt_BR.po +++ b/doc/po/pt_BR.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" -"POT-Creation-Date: 2011-02-14 13:42+0100\n" +"POT-Creation-Date: 2011-06-08 16:54+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" @@ -578,7 +578,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50 #: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:114 -#: apt-key.8.xml:38 apt-mark.8.xml:55 apt-secure.8.xml:43 +#: apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43 #: apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36 #: sources.list.5.xml:36 #, fuzzy @@ -960,7 +960,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59 -#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:92 +#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:126 #: apt-sortpkgs.1.xml:57 apt.conf.5.xml:560 apt.conf.5.xml:582 msgid "options" msgstr "" @@ -984,7 +984,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:288 apt-ftparchive.1.xml:568 apt-get.8.xml:393 +#: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393 #: apt-sortpkgs.1.xml:61 msgid "<option>-s</option>" msgstr "" @@ -1005,12 +1005,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:296 apt-ftparchive.1.xml:542 apt-get.8.xml:383 +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 msgid "<option>-q</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:296 apt-ftparchive.1.xml:542 apt-get.8.xml:383 +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 msgid "<option>--quiet</option>" msgstr "" @@ -1109,7 +1109,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:580 +#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583 msgid "<option>-a</option>" msgstr "" @@ -1205,14 +1205,14 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist> #: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101 -#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608 apt-get.8.xml:570 -#: apt-sortpkgs.1.xml:67 +#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570 +#: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67 msgid "&apt-commonoptions;" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:156 apt-mark.8.xml:125 -#: apt.conf.5.xml:1093 apt_preferences.5.xml:649 +#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:172 apt-mark.8.xml:144 +#: apt.conf.5.xml:1093 apt_preferences.5.xml:697 msgid "Files" msgstr "" @@ -1223,9 +1223,9 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106 -#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:624 apt-get.8.xml:585 -#: apt-key.8.xml:177 apt-mark.8.xml:131 apt-secure.8.xml:185 -#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:656 +#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585 +#: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185 +#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704 #: sources.list.5.xml:234 #, fuzzy msgid "See Also" @@ -1238,8 +1238,8 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111 -#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:628 apt-get.8.xml:591 -#: apt-mark.8.xml:135 apt-sortpkgs.1.xml:76 +#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591 +#: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76 msgid "Diagnostics" msgstr "" @@ -1338,12 +1338,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-cdrom.8.xml:94 apt-key.8.xml:142 +#: apt-cdrom.8.xml:94 apt-key.8.xml:158 msgid "Options" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:536 apt-get.8.xml:345 +#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345 msgid "<option>-d</option>" msgstr "" @@ -1548,7 +1548,7 @@ msgid "Just show the contents of the configuration space." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:625 +#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628 #: apt-sortpkgs.1.xml:73 #, fuzzy msgid "&apt-conf;" @@ -2466,31 +2466,38 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-ftparchive.1.xml:529 -msgid "<option>--md5</option>" +msgid "" +"<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:531 msgid "" -"Generate MD5 sums. This defaults to on, when turned off the generated index " -"files will not have MD5Sum fields where possible. Configuration Item: " -"<literal>APT::FTPArchive::MD5</literal>" +"Generate the given checksum. These options default to on, when turned off " +"the generated index files will not have the checksum fields where possible. " +"Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</" +"replaceable></literal> and <literal>APT::FTPArchive::<replaceable>Index</" +"replaceable>::<replaceable>Checksum</replaceable></literal> where " +"<literal>Index</literal> can be <literal>Packages</literal>, " +"<literal>Sources</literal> or <literal>Release</literal> and " +"<literal>Checksum</literal> can be <literal>MD5</literal>, <literal>SHA1</" +"literal> or <literal>SHA256</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:536 +#: apt-ftparchive.1.xml:539 msgid "<option>--db</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:538 +#: apt-ftparchive.1.xml:541 msgid "" "Use a binary caching DB. This has no effect on the generate command. " "Configuration Item: <literal>APT::FTPArchive::DB</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:544 +#: apt-ftparchive.1.xml:547 msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quiet up to a maximum of 2. You can also use " @@ -2499,12 +2506,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:550 +#: apt-ftparchive.1.xml:553 msgid "<option>--delink</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:552 +#: apt-ftparchive.1.xml:555 msgid "" "Perform Delinking. If the <literal>External-Links</literal> setting is used " "then this option actually enables delinking of the files. It defaults to on " @@ -2513,12 +2520,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:558 +#: apt-ftparchive.1.xml:561 msgid "<option>--contents</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:560 +#: apt-ftparchive.1.xml:563 msgid "" "Perform contents generation. When this option is set and package indexes are " "being generated with a cache DB then the file listing will also be extracted " @@ -2528,12 +2535,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:568 +#: apt-ftparchive.1.xml:571 msgid "<option>--source-override</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:570 +#: apt-ftparchive.1.xml:573 msgid "" "Select the source override file to use with the <literal>sources</literal> " "command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</" @@ -2541,24 +2548,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:574 +#: apt-ftparchive.1.xml:577 msgid "<option>--readonly</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:576 +#: apt-ftparchive.1.xml:579 msgid "" "Make the caching databases read only. Configuration Item: <literal>APT::" "FTPArchive::ReadOnlyDB</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:580 +#: apt-ftparchive.1.xml:583 msgid "<option>--arch</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:581 +#: apt-ftparchive.1.xml:584 msgid "" "Accept in the <literal>packages</literal> and <literal>contents</literal> " "commands only package files matching <literal>*_arch.deb</literal> or " @@ -2567,12 +2574,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:587 +#: apt-ftparchive.1.xml:590 msgid "<option>APT::FTPArchive::AlwaysStat</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:589 +#: apt-ftparchive.1.xml:592 msgid "" "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If " "packages are recompiled and/or republished with the same version again, this " @@ -2586,12 +2593,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:599 +#: apt-ftparchive.1.xml:602 msgid "<option>APT::FTPArchive::LongDescription</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:601 +#: apt-ftparchive.1.xml:604 msgid "" "This configuration option defaults to \"<literal>true</literal>\" and should " "only be set to <literal>\"false\"</literal> if the Archive generated with " @@ -2601,27 +2608,27 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:613 apt.conf.5.xml:1087 apt_preferences.5.xml:496 +#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:544 #: sources.list.5.xml:198 #, fuzzy msgid "Examples" msgstr "Exemplos" #. type: Content of: <refentry><refsect1><para><programlisting> -#: apt-ftparchive.1.xml:619 +#: apt-ftparchive.1.xml:622 #, no-wrap msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:615 +#: apt-ftparchive.1.xml:618 msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:629 +#: apt-ftparchive.1.xml:632 msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@ -3632,15 +3639,29 @@ msgid "" "from the keyring the archive keys which are no longer valid." msgstr "" +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:140 +msgid "net-update" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:144 +msgid "" +"Update the local keyring with the keys of a key server and removes from the " +"keyring the archive keys which are no longer valid. This requires an " +"installed wget and an APT build configured to have a server to fetch from. " +"APT in Debian does not support this command, but Ubuntu's APT does." +msgstr "" + #. type: Content of: <refentry><refsect1><para> -#: apt-key.8.xml:143 +#: apt-key.8.xml:159 msgid "" "Note that options need to be defined before the commands described in the " "previous section." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:145 +#: apt-key.8.xml:161 #, fuzzy msgid "--keyring <replaceable>filename</replaceable>" msgstr "" @@ -3648,7 +3669,7 @@ msgstr "" "apt-get install <replaceable>pacote</replaceable>/testing\n" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:146 +#: apt-key.8.xml:162 msgid "" "With this option it is possible to specify a specific keyring file the " "command should operate on. The default is that a command is executed on the " @@ -3659,44 +3680,44 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt-key.8.xml:159 +#: apt-key.8.xml:175 msgid "&file-trustedgpg;" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:161 +#: apt-key.8.xml:177 #, fuzzy msgid "<filename>/etc/apt/trustdb.gpg</filename>" msgstr "<filename>/etc/apt.conf</>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:162 +#: apt-key.8.xml:178 msgid "Local trust database of archive keys." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:165 +#: apt-key.8.xml:181 msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:166 +#: apt-key.8.xml:182 msgid "Keyring of Debian archive trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:169 +#: apt-key.8.xml:185 msgid "" "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:170 +#: apt-key.8.xml:186 msgid "Keyring of Debian archive removed trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-key.8.xml:179 +#: apt-key.8.xml:195 #, fuzzy msgid "&apt-get;, &apt-secure;" msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;" @@ -3705,8 +3726,8 @@ msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;" #. type: Content of: <refentry><refentryinfo> #: apt-mark.8.xml:16 msgid "" -"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 " -"August 2009</date>" +"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>21 " +"April 2011</date>" msgstr "" #. type: Content of: <refentry><refnamediv><refname> @@ -3725,20 +3746,21 @@ msgid "" " <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-" "f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain" "\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain" -"\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </group> <arg " +"\">auto</arg> <arg choice=\"plain\">manual</arg> <arg choice=\"plain" +"\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </group> <arg " "choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </" -"arg> <arg choice=\"plain\">showauto</arg> </group>" +"arg> </group>" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:56 +#: apt-mark.8.xml:57 msgid "" "<command>apt-mark</command> will change whether a package has been marked as " "being automatically installed." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:60 +#: apt-mark.8.xml:61 msgid "" "When you request that a package is installed, and as a result other packages " "are installed to satisfy its dependencies, the dependencies are marked as " @@ -3748,108 +3770,132 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:68 -msgid "markauto" +#: apt-mark.8.xml:69 +msgid "auto" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:69 +#: apt-mark.8.xml:70 msgid "" -"<literal>markauto</literal> is used to mark a package as being automatically " +"<literal>auto</literal> is used to mark a package as being automatically " "installed, which will cause the package to be removed when no more manually " "installed packages depend on this package." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:76 -msgid "unmarkauto" +#: apt-mark.8.xml:77 +msgid "manual" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:77 +#: apt-mark.8.xml:78 msgid "" -"<literal>unmarkauto</literal> is used to mark a package as being manually " +"<literal>manual</literal> is used to mark a package as being manually " "installed, which will prevent the package from being automatically removed " "if no other packages depend on it." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:84 -msgid "showauto" +#: apt-mark.8.xml:85 +msgid "hold" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:85 +#: apt-mark.8.xml:86 msgid "" -"<literal>showauto</literal> is used to print a list of automatically " -"installed packages with each package on a new line." +"<literal>hold</literal> is used to mark a package as hold back, which will " +"prevent the package from being automatically installed, upgraded or " +"removed. The command is only a wrapper around <command>dpkg --set-" +"selections</command> and the state is therefore maintained by &dpkg; and not " +"effected by the <option>--filename</option> option." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:95 +msgid "unhold" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-mark.8.xml:96 msgid "" -"<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>" +"<literal>unhold</literal> is used to cancel a previously set hold on a " +"package to allow all actions again." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:97 -msgid "" -"<option>--file=<filename><replaceable>FILENAME</replaceable></filename></" -"option>" +#: apt-mark.8.xml:101 +msgid "showauto" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:100 +#: apt-mark.8.xml:102 msgid "" -"Read/Write package stats from <filename><replaceable>FILENAME</replaceable></" -"filename> instead of the default location, which is " -"<filename>extended_status</filename> in the directory defined by the " -"Configuration Item: <literal>Dir::State</literal>." +"<literal>showauto</literal> is used to print a list of automatically " +"installed packages with each package on a new line. All automatically " +"installed packages will be listed if no package is given. If packages are " +"given only those which are automatically installed will be shown." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:106 -msgid "<option>-h</option>" +#: apt-mark.8.xml:109 +msgid "showmanual" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:110 +msgid "" +"<literal>showmanual</literal> can be used in the same way as " +"<literal>showauto</literal> except that it will print a list of manually " +"installed packages instead." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:107 -msgid "<option>--help</option>" +#: apt-mark.8.xml:116 +msgid "showhold" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:108 -msgid "Show a short usage summary." +#: apt-mark.8.xml:117 +msgid "" +"<literal>showhold</literal> is used to print a list of packages on hold in " +"the same way as for the other show commands." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:114 -msgid "<option>-v</option>" +#: apt-mark.8.xml:130 +msgid "" +"<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-mark.8.xml:115 -msgid "<option>--version</option>" +#: apt-mark.8.xml:131 +msgid "" +"<option>--file=<filename><replaceable>FILENAME</replaceable></filename></" +"option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-mark.8.xml:116 -msgid "Show the program version." +#: apt-mark.8.xml:134 +msgid "" +"Read/Write package stats from <filename><replaceable>FILENAME</replaceable></" +"filename> instead of the default location, which is " +"<filename>extended_status</filename> in the directory defined by the " +"Configuration Item: <literal>Dir::State</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt-mark.8.xml:127 +#: apt-mark.8.xml:146 msgid " &file-extended_states;" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:132 +#: apt-mark.8.xml:151 #, fuzzy msgid "&apt-get;,&aptitude;,&apt-conf;" msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;" #. type: Content of: <refentry><refsect1><para> -#: apt-mark.8.xml:136 +#: apt-mark.8.xml:155 msgid "" "<command>apt-mark</command> returns zero on normal operation, non-zero on " "error." @@ -5950,30 +5996,34 @@ msgstr "prioridade 100" #: apt_preferences.5.xml:107 msgid "" "to the versions coming from archives which in their <filename>Release</" -"filename> files are marked as \"NotAutomatic: yes\" like the debian " -"experimental archive." +"filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</" +"emphasis> as \"ButAutomaticUpgrades: yes\" like the debian " +"<literal>experimental</literal> archive." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:112 +#: apt_preferences.5.xml:113 #, fuzzy msgid "priority 100" msgstr "prioridade 100" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:113 -#, fuzzy -msgid "to the version that is already installed (if any)." -msgstr "para a instância que já esteja instalada (caso exista)." +#: apt_preferences.5.xml:114 +msgid "" +"to the version that is already installed (if any) and to the versions coming " +"from archives which in their <filename>Release</filename> files are marked " +"as \"NotAutomatic: yes\" and \"ButAutomaticUpgrades: yes\" like the debian " +"backports archive since <literal>squeeze-backports</literal>." +msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:117 +#: apt_preferences.5.xml:121 #, fuzzy msgid "priority 500" msgstr "prioridade 500" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:118 +#: apt_preferences.5.xml:122 #, fuzzy msgid "" "to the versions that are not installed and do not belong to the target " @@ -5982,13 +6032,13 @@ msgstr "" "para as instâncias que não estã instaladas e que não pertencem a versão alvo." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:122 +#: apt_preferences.5.xml:126 #, fuzzy msgid "priority 990" msgstr "prioridade 990" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:123 +#: apt_preferences.5.xml:127 #, fuzzy msgid "" "to the versions that are not installed and belong to the target release." @@ -6008,21 +6058,22 @@ msgstr "" "Atribuirá :" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:128 +#: apt_preferences.5.xml:132 #, fuzzy msgid "" "If the target release has not been specified then APT simply assigns " "priority 100 to all installed package versions and priority 500 to all " -"uninstalled package versions, expect versions coming from archives which in " +"uninstalled package versions, except versions coming from archives which in " "their <filename>Release</filename> files are marked as \"NotAutomatic: yes\" " -"- these versions get the priority 1." +"- these versions get the priority 1 or priority 100 if it is additionally " +"marked as \"ButAutomaticUpgrades: yes\"." msgstr "" "Caso nenhuma versão alvo tenha sido especificada, o APT simplesmente irá " "atribuir a prioridade 100 para todas as instâncias de pacotes instaladas e a " "prioridade 500 para todas as instâncias de pacotes não instaladas." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:134 +#: apt_preferences.5.xml:139 #, fuzzy msgid "" "APT then applies the following rules, listed in order of precedence, to " @@ -6032,7 +6083,7 @@ msgstr "" "determinar qual instância de um pacote instalar." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:137 +#: apt_preferences.5.xml:142 #, fuzzy msgid "" "Never downgrade unless the priority of an available version exceeds 1000. " @@ -6049,13 +6100,13 @@ msgstr "" "\"downgrade\" pode ser arriscado.)" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:143 +#: apt_preferences.5.xml:148 #, fuzzy msgid "Install the highest priority version." msgstr "Instala a instância de prioridade mais alta." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:144 +#: apt_preferences.5.xml:149 #, fuzzy msgid "" "If two or more versions have the same priority, install the most recent one " @@ -6065,7 +6116,7 @@ msgstr "" "mais recente (ou seja, aquela com o maior número de versão)." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:147 +#: apt_preferences.5.xml:152 #, fuzzy msgid "" "If two or more versions have the same priority and version number but either " @@ -6077,7 +6128,7 @@ msgstr "" "<literal>--reinstall</literal> seja fornecida, instala aquela desinstalada." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:153 +#: apt_preferences.5.xml:158 #, fuzzy msgid "" "In a typical situation, the installed version of a package (priority 100) " @@ -6094,7 +6145,7 @@ msgstr "" "forem executados." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:160 +#: apt_preferences.5.xml:165 #, fuzzy msgid "" "More rarely, the installed version of a package is <emphasis>more</emphasis> " @@ -6109,7 +6160,7 @@ msgstr "" "upgrade</command> forem executados." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:165 +#: apt_preferences.5.xml:170 #, fuzzy msgid "" "Sometimes the installed version of a package is more recent than the version " @@ -6129,13 +6180,13 @@ msgstr "" "disponíveis possuir uma prioridade maior do que a versão instalada." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:174 +#: apt_preferences.5.xml:179 #, fuzzy msgid "The Effect of APT Preferences" msgstr "O Efeito das Preferências do APT" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:176 +#: apt_preferences.5.xml:181 #, fuzzy msgid "" "The APT preferences file allows the system administrator to control the " @@ -6149,7 +6200,7 @@ msgstr "" "das duas formas, uma forma específica e uma forma geral." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:182 +#: apt_preferences.5.xml:187 #, fuzzy msgid "" "The specific form assigns a priority (a \"Pin-Priority\") to one or more " @@ -6165,7 +6216,7 @@ msgstr "" "com \"<literal>5.8</literal>\"." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:189 +#: apt_preferences.5.xml:194 #, fuzzy, no-wrap msgid "" "Package: perl\n" @@ -6178,7 +6229,7 @@ msgstr "" "Pin-Priority: 1001\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:195 +#: apt_preferences.5.xml:200 #, fuzzy msgid "" "The general form assigns a priority to all of the package versions in a " @@ -6194,7 +6245,7 @@ msgstr "" "identificado pelo nome de domínio totalmente qualificado do site Internet." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:201 +#: apt_preferences.5.xml:206 #, fuzzy msgid "" "This general-form entry in the APT preferences file applies only to groups " @@ -6207,7 +6258,7 @@ msgstr "" "no site local." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:206 +#: apt_preferences.5.xml:211 #, fuzzy, no-wrap msgid "" "Package: *\n" @@ -6220,7 +6271,7 @@ msgstr "" "Pin-Priority: 999\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:211 +#: apt_preferences.5.xml:216 msgid "" "A note of caution: the keyword used here is \"<literal>origin</literal>\" " "which can be used to match a hostname. The following record will assign a " @@ -6229,7 +6280,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:215 +#: apt_preferences.5.xml:220 #, fuzzy, no-wrap msgid "" "Package: *\n" @@ -6242,7 +6293,7 @@ msgstr "" "Pin-Priority: 999\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:219 +#: apt_preferences.5.xml:224 #, fuzzy msgid "" "This should <emphasis>not</emphasis> be confused with the Origin of a " @@ -6259,7 +6310,7 @@ msgstr "" "como \"Debian\" ou \"Ximian\"." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:224 +#: apt_preferences.5.xml:229 #, fuzzy msgid "" "The following record assigns a low priority to all package versions " @@ -6271,7 +6322,7 @@ msgstr "" "\"<literal>unstable</literal>\"." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:228 +#: apt_preferences.5.xml:233 #, fuzzy, no-wrap msgid "" "Package: *\n" @@ -6284,7 +6335,7 @@ msgstr "" "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:233 +#: apt_preferences.5.xml:238 #, fuzzy msgid "" "The following record assigns a high priority to all package versions " @@ -6296,7 +6347,7 @@ msgstr "" "\"<literal>unstable</literal>\"." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:237 +#: apt_preferences.5.xml:242 #, fuzzy, no-wrap msgid "" "Package: *\n" @@ -6309,7 +6360,7 @@ msgstr "" "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:242 +#: apt_preferences.5.xml:247 #, fuzzy msgid "" "The following record assigns a high priority to all package versions " @@ -6322,7 +6373,7 @@ msgstr "" "literal>\"." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:247 +#: apt_preferences.5.xml:252 #, fuzzy, no-wrap msgid "" "Package: *\n" @@ -6335,19 +6386,78 @@ msgstr "" "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:258 +#: apt_preferences.5.xml:262 +msgid "Regular expressions and glob() syntax" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:264 +msgid "" +"APT also supports pinning by glob() expressions and regular expressions " +"surrounded by /. For example, the following example assigns the priority 500 " +"to all packages from experimental where the name starts with gnome (as a glob" +"()-like expression or contains the word kde (as a POSIX extended regular " +"expression surrounded by slashes)." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><programlisting> +#: apt_preferences.5.xml:273 +#, fuzzy, no-wrap +msgid "" +"Package: gnome* /kde/\n" +"Pin: release n=experimental\n" +"Pin-Priority: 500\n" +msgstr "" +"<programlisting>\n" +"Package: *\n" +"Pin: release a=unstable\n" +"Pin-Priority: 50\n" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:279 +msgid "" +"The rule for those expressions is that they can occur anywhere where a " +"string can occur. Those, the following pin assigns the priority 990 to all " +"packages from a release starting with karmic." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><programlisting> +#: apt_preferences.5.xml:285 +#, fuzzy, no-wrap +msgid "" +"Package: *\n" +"Pin: release n=karmic*\n" +"Pin-Priority: 990\n" +msgstr "" +"<programlisting>\n" +"Package: *\n" +"Pin: release a=unstable\n" +"Pin-Priority: 50\n" + +#. type: Content of: <refentry><refsect1><refsect2><literal> +#: apt_preferences.5.xml:290 +msgid "Package" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><literal> +#: apt_preferences.5.xml:296 +msgid "*" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt_preferences.5.xml:306 #, fuzzy msgid "How APT Interprets Priorities" msgstr "Como o APT Interpreta Prioridades" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:266 +#: apt_preferences.5.xml:314 #, fuzzy msgid "P > 1000" msgstr "P > 1000" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:267 +#: apt_preferences.5.xml:315 #, fuzzy msgid "" "causes a version to be installed even if this constitutes a downgrade of the " @@ -6357,13 +6467,13 @@ msgstr "" "dowgrade do pacote" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:271 +#: apt_preferences.5.xml:319 #, fuzzy msgid "990 < P <=1000" msgstr "990 < P <=1000" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:272 +#: apt_preferences.5.xml:320 #, fuzzy msgid "" "causes a version to be installed even if it does not come from the target " @@ -6373,13 +6483,13 @@ msgstr "" "versão alvo, a menos que a versão instalada seja mais recente" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:277 +#: apt_preferences.5.xml:325 #, fuzzy msgid "500 < P <=990" msgstr "500 < P <=990" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:278 +#: apt_preferences.5.xml:326 #, fuzzy msgid "" "causes a version to be installed unless there is a version available " @@ -6389,13 +6499,13 @@ msgstr "" "disponível pertencente a versão alvo ou a versão instalada seja mais recente" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:283 +#: apt_preferences.5.xml:331 #, fuzzy msgid "100 < P <=500" msgstr "100 < P <=500" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:284 +#: apt_preferences.5.xml:332 #, fuzzy msgid "" "causes a version to be installed unless there is a version available " @@ -6406,13 +6516,13 @@ msgstr "" "seja mais recente" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:289 +#: apt_preferences.5.xml:337 #, fuzzy msgid "0 < P <=100" msgstr "0 <= P <=100" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:290 +#: apt_preferences.5.xml:338 #, fuzzy msgid "" "causes a version to be installed only if there is no installed version of " @@ -6422,19 +6532,19 @@ msgstr "" "instalada do pacote" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:294 +#: apt_preferences.5.xml:342 #, fuzzy msgid "P < 0" msgstr "P < 0" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:295 +#: apt_preferences.5.xml:343 #, fuzzy msgid "prevents the version from being installed" msgstr "impede a versão de ser instalada" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:261 +#: apt_preferences.5.xml:309 #, fuzzy msgid "" "Priorities (P) assigned in the APT preferences file must be positive or " @@ -6446,7 +6556,7 @@ msgstr "" "seguir (a grosso modo):" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:300 +#: apt_preferences.5.xml:348 #, fuzzy msgid "" "If any specific-form records match an available package version then the " @@ -6462,7 +6572,7 @@ msgstr "" "determinará a prioridade da versão do pacote." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:306 +#: apt_preferences.5.xml:354 #, fuzzy msgid "" "For example, suppose the APT preferences file contains the three records " @@ -6472,7 +6582,7 @@ msgstr "" "registros apresentados anteriormente :" #. type: Content of: <refentry><refsect1><refsect2><programlisting> -#: apt_preferences.5.xml:310 +#: apt_preferences.5.xml:358 #, fuzzy, no-wrap msgid "" "Package: perl\n" @@ -6501,12 +6611,12 @@ msgstr "" "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:323 +#: apt_preferences.5.xml:371 msgid "Then:" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:325 +#: apt_preferences.5.xml:373 #, fuzzy msgid "" "The most recent available version of the <literal>perl</literal> package " @@ -6522,7 +6632,7 @@ msgstr "" "será feito um downgrade do <literal>perl</literal>." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:330 +#: apt_preferences.5.xml:378 #, fuzzy msgid "" "A version of any package other than <literal>perl</literal> that is " @@ -6534,7 +6644,7 @@ msgstr "" "mesmo versões pertencentes a versão alvo." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:334 +#: apt_preferences.5.xml:382 #, fuzzy msgid "" "A version of a package whose origin is not the local system but some other " @@ -6549,13 +6659,13 @@ msgstr "" "instalada." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:344 +#: apt_preferences.5.xml:392 #, fuzzy msgid "Determination of Package Version and Distribution Properties" msgstr "Determinação da Versão do Pacote e Propriedades da Distribuição" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:346 +#: apt_preferences.5.xml:394 #, fuzzy msgid "" "The locations listed in the &sources-list; file should provide " @@ -6567,31 +6677,31 @@ msgstr "" "os pacotes disponíveis nessas localidades." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:358 +#: apt_preferences.5.xml:406 #, fuzzy msgid "the <literal>Package:</literal> line" msgstr "a linha <literal>Package:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:359 +#: apt_preferences.5.xml:407 #, fuzzy msgid "gives the package name" msgstr "informa o nome do pacote" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:362 apt_preferences.5.xml:412 +#: apt_preferences.5.xml:410 apt_preferences.5.xml:460 #, fuzzy msgid "the <literal>Version:</literal> line" msgstr "a linha <literal>Version:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:363 +#: apt_preferences.5.xml:411 #, fuzzy msgid "gives the version number for the named package" msgstr "informa o número de versão do pacote" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:350 +#: apt_preferences.5.xml:398 #, fuzzy msgid "" "The <filename>Packages</filename> file is normally found in the directory " @@ -6613,13 +6723,13 @@ msgstr "" "do APT :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:379 +#: apt_preferences.5.xml:427 #, fuzzy msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line" msgstr "a linha <literal>Archive:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:380 +#: apt_preferences.5.xml:428 #, fuzzy msgid "" "names the archive to which all the packages in the directory tree belong. " @@ -6637,7 +6747,7 @@ msgstr "" "requerer a linha :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:390 +#: apt_preferences.5.xml:438 #, fuzzy, no-wrap msgid "Pin: release a=stable\n" msgstr "" @@ -6645,13 +6755,13 @@ msgstr "" "Pin: release a=stable\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:396 +#: apt_preferences.5.xml:444 #, fuzzy msgid "the <literal>Codename:</literal> line" msgstr "a linha <literal>Component:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:397 +#: apt_preferences.5.xml:445 #, fuzzy msgid "" "names the codename to which all the packages in the directory tree belong. " @@ -6669,7 +6779,7 @@ msgstr "" "requerer a linha :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:406 +#: apt_preferences.5.xml:454 #, fuzzy, no-wrap msgid "Pin: release n=&testing-codename;\n" msgstr "" @@ -6677,7 +6787,7 @@ msgstr "" "Pin: release a=stable\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:413 +#: apt_preferences.5.xml:461 #, fuzzy msgid "" "names the release version. For example, the packages in the tree might " @@ -6694,7 +6804,7 @@ msgstr "" "das linhas a seguir." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:422 +#: apt_preferences.5.xml:470 #, fuzzy, no-wrap msgid "" "Pin: release v=3.0\n" @@ -6707,13 +6817,13 @@ msgstr "" "Pin: release 3.0\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:431 +#: apt_preferences.5.xml:479 #, fuzzy msgid "the <literal>Component:</literal> line" msgstr "a linha <literal>Component:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:432 +#: apt_preferences.5.xml:480 #, fuzzy msgid "" "names the licensing component associated with the packages in the directory " @@ -6732,7 +6842,7 @@ msgstr "" "requerer a linha :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:441 +#: apt_preferences.5.xml:489 #, fuzzy, no-wrap msgid "Pin: release c=main\n" msgstr "" @@ -6740,13 +6850,13 @@ msgstr "" "Pin: release c=main\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:447 +#: apt_preferences.5.xml:495 #, fuzzy msgid "the <literal>Origin:</literal> line" msgstr "a linha <literal>Origin:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:448 +#: apt_preferences.5.xml:496 #, fuzzy msgid "" "names the originator of the packages in the directory tree of the " @@ -6760,7 +6870,7 @@ msgstr "" "requerer a linha :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:454 +#: apt_preferences.5.xml:502 #, fuzzy, no-wrap msgid "Pin: release o=Debian\n" msgstr "" @@ -6768,13 +6878,13 @@ msgstr "" "Pin: release o=Debian\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:460 +#: apt_preferences.5.xml:508 #, fuzzy msgid "the <literal>Label:</literal> line" msgstr "a linha <literal>Label:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:461 +#: apt_preferences.5.xml:509 #, fuzzy msgid "" "names the label of the packages in the directory tree of the " @@ -6787,7 +6897,7 @@ msgstr "" "arquivo de preferências do APT iria requerer a linha :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:467 +#: apt_preferences.5.xml:515 #, fuzzy, no-wrap msgid "Pin: release l=Debian\n" msgstr "" @@ -6795,7 +6905,7 @@ msgstr "" "Pin: release l=Debian\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:368 +#: apt_preferences.5.xml:416 #, fuzzy msgid "" "The <filename>Release</filename> file is normally found in the directory " @@ -6819,7 +6929,7 @@ msgstr "" "do APT :" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:474 +#: apt_preferences.5.xml:522 #, fuzzy msgid "" "All of the <filename>Packages</filename> and <filename>Release</filename> " @@ -6845,13 +6955,13 @@ msgstr "" "<literal>unstable</literal>." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:487 +#: apt_preferences.5.xml:535 #, fuzzy msgid "Optional Lines in an APT Preferences Record" msgstr "Linhas Opcionais em um Registro de Preferências do APT" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:489 +#: apt_preferences.5.xml:537 #, fuzzy msgid "" "Each record in the APT preferences file can optionally begin with one or " @@ -6863,13 +6973,13 @@ msgstr "" "</literal>. Isto oferece um local para inserir comentários." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:498 +#: apt_preferences.5.xml:546 #, fuzzy msgid "Tracking Stable" msgstr "Acompanhando a Stable" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:506 +#: apt_preferences.5.xml:554 #, fuzzy, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated\n" @@ -6894,7 +7004,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:500 +#: apt_preferences.5.xml:548 #, fuzzy msgid "" "The following APT preferences file will cause APT to assign a priority " @@ -6910,8 +7020,8 @@ msgstr "" "outras distribuições <literal>Debian</literal>." #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:523 apt_preferences.5.xml:569 -#: apt_preferences.5.xml:627 +#: apt_preferences.5.xml:571 apt_preferences.5.xml:617 +#: apt_preferences.5.xml:675 #, fuzzy, no-wrap msgid "" "apt-get install <replaceable>package-name</replaceable>\n" @@ -6924,7 +7034,7 @@ msgstr "" "apt-get dist-upgrade\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:518 +#: apt_preferences.5.xml:566 #, fuzzy msgid "" "With a suitable &sources-list; file and the above preferences file, any of " @@ -6937,7 +7047,7 @@ msgstr "" "ulítma(s) versão(ôes) <literal>stable</literal>." #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:535 +#: apt_preferences.5.xml:583 #, fuzzy, no-wrap msgid "apt-get install <replaceable>package</replaceable>/testing\n" msgstr "" @@ -6945,7 +7055,7 @@ msgstr "" "apt-get install <replaceable>pacote</replaceable>/testing\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:529 +#: apt_preferences.5.xml:577 #, fuzzy msgid "" "The following command will cause APT to upgrade the specified package to the " @@ -6958,13 +7068,13 @@ msgstr "" "atualizado novamente a menos que esse comando seja executado novamente." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:541 +#: apt_preferences.5.xml:589 #, fuzzy msgid "Tracking Testing or Unstable" msgstr "Acompanhando a Testing" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:550 +#: apt_preferences.5.xml:598 #, fuzzy, no-wrap msgid "" "Package: *\n" @@ -6993,7 +7103,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:543 +#: apt_preferences.5.xml:591 #, fuzzy msgid "" "The following APT preferences file will cause APT to assign a high priority " @@ -7010,7 +7120,7 @@ msgstr "" "versões de pacotes de outras distribuições <literal>Debian</literal>." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:564 +#: apt_preferences.5.xml:612 #, fuzzy msgid "" "With a suitable &sources-list; file and the above preferences file, any of " @@ -7023,7 +7133,7 @@ msgstr "" "(s) última(s) versão(ões) <literal>testing</literal>." #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:584 +#: apt_preferences.5.xml:632 #, fuzzy, no-wrap msgid "apt-get install <replaceable>package</replaceable>/unstable\n" msgstr "" @@ -7031,7 +7141,7 @@ msgstr "" "apt-get install <replaceable>pacote</replaceable>/unstable\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:575 +#: apt_preferences.5.xml:623 #, fuzzy msgid "" "The following command will cause APT to upgrade the specified package to the " @@ -7051,12 +7161,12 @@ msgstr "" "recente que a versão instalada." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:591 +#: apt_preferences.5.xml:639 msgid "Tracking the evolution of a codename release" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:605 +#: apt_preferences.5.xml:653 #, fuzzy, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated package versions\n" @@ -7086,7 +7196,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:593 +#: apt_preferences.5.xml:641 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -7101,7 +7211,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:622 +#: apt_preferences.5.xml:670 #, fuzzy msgid "" "With a suitable &sources-list; file and the above preferences file, any of " @@ -7114,7 +7224,7 @@ msgstr "" "ulítma(s) versão(ôes) <literal>stable</literal>." #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:642 +#: apt_preferences.5.xml:690 #, fuzzy, no-wrap msgid "apt-get install <replaceable>package</replaceable>/sid\n" msgstr "" @@ -7122,7 +7232,7 @@ msgstr "" "apt-get install <replaceable>pacote</replaceable>/testing\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:633 +#: apt_preferences.5.xml:681 #, fuzzy msgid "" "The following command will cause APT to upgrade the specified package to the " @@ -7142,13 +7252,13 @@ msgstr "" "recente que a versão instalada." #. type: Content of: <refentry><refsect1><variablelist> -#: apt_preferences.5.xml:651 +#: apt_preferences.5.xml:699 #, fuzzy msgid "&file-preferences;" msgstr "apt_preferences" #. type: Content of: <refentry><refsect1><para> -#: apt_preferences.5.xml:657 +#: apt_preferences.5.xml:705 #, fuzzy msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;" msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;" @@ -8563,6 +8673,10 @@ msgid "Which will use the already fetched archives on the disc." msgstr "" #, fuzzy +#~ msgid "to the version that is already installed (if any)." +#~ msgstr "para a instância que já esteja instalada (caso exista)." + +#, fuzzy #~ msgid "" #~ "The <literal>Pin-Priority:</literal> line in each APT preferences record " #~ "is optional. If omitted, APT assigns a priority of 1 less than the last " diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc index eb8938b95..c43e8f4b4 100644 --- a/ftparchive/writer.cc +++ b/ftparchive/writer.cc @@ -64,6 +64,7 @@ FTWScanner::FTWScanner(string const &Arch): Arch(Arch) DoMD5 = _config->FindB("APT::FTPArchive::MD5",true); DoSHA1 = _config->FindB("APT::FTPArchive::SHA1",true); DoSHA256 = _config->FindB("APT::FTPArchive::SHA256",true); + DoSHA512 = _config->FindB("APT::FTPArchive::SHA512",true); } /*}}}*/ // FTWScanner::Scanner - FTW Scanner /*{{{*/ @@ -1060,10 +1061,12 @@ bool ReleaseWriter::DoPackage(string FileName) CheckSums[NewFileName].SHA256 = SHA256.Result(); } - SHA256Summation SHA512; - SHA256.AddFD(fd.Fd(), fd.Size()); - CheckSums[NewFileName].SHA512 = SHA512.Result(); - + if (DoSHA512 == true) + { + SHA512Summation SHA512; + SHA512.AddFD(fd.Fd(), fd.Size()); + CheckSums[NewFileName].SHA512 = SHA512.Result(); + } fd.Close(); return true; diff --git a/ftparchive/writer.h b/ftparchive/writer.h index b8747decd..c6026e954 100644 --- a/ftparchive/writer.h +++ b/ftparchive/writer.h @@ -63,6 +63,7 @@ class FTWScanner bool DoMD5; bool DoSHA1; bool DoSHA256; + bool DoSHA512; unsigned long DeLinkLimit; string InternalPrefix; diff --git a/methods/mirror.cc b/methods/mirror.cc index 2cf5c9ce1..713dc211a 100644 --- a/methods/mirror.cc +++ b/methods/mirror.cc @@ -134,6 +134,10 @@ bool MirrorMethod::DownloadMirrorFile(string mirror_uri_str) string fetch = BaseUri; fetch.replace(0,strlen("mirror://"),"http://"); + // append the dist as a query string + if (Dist != "") + fetch += "?dist=" + Dist; + if(Debug) clog << "MirrorMethod::DownloadMirrorFile(): '" << fetch << "'" << " to " << MirrorFile << endl; @@ -274,8 +278,18 @@ bool MirrorMethod::InitMirrors() while (!in.eof()) { getline(in, s); - if (s.size() > 0) - AllMirrors.push_back(s); + + // ignore lines that start with # + if (s.find("#") == 0) + continue; + // ignore empty lines + if (s.size() == 0) + continue; + // ignore non http lines + if (s.find("http://") != 0) + continue; + + AllMirrors.push_back(s); } Mirror = AllMirrors[0]; UsedMirror = Mirror; @@ -329,6 +343,7 @@ string MirrorMethod::GetMirrorFileName(string mirror_uri_str) if(Debug) std::cerr << "found BaseURI: " << uristr << std::endl; BaseUri = uristr.substr(0,uristr.size()-1); + Dist = (*I)->GetDist(); } } // get new file diff --git a/methods/mirror.h b/methods/mirror.h index bd807e122..97d18144a 100644 --- a/methods/mirror.h +++ b/methods/mirror.h @@ -29,6 +29,7 @@ class MirrorMethod : public HttpMethod vector<string> AllMirrors; // all available mirrors string MirrorFile; // the file that contains the list of mirrors bool DownloadedMirrorFile; // already downloaded this session + string Dist; // the target distrubtion (e.g. sid, oneiric) bool Debug; diff --git a/po/apt-all.pot b/po/apt-all.pot index 73ed82195..b409363d0 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-12 17:42+0100\n" +"POT-Creation-Date: 2011-06-29 12:34+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -17,155 +17,159 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: cmdline/apt-cache.cc:156 +#: cmdline/apt-cache.cc:154 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "" -#: cmdline/apt-cache.cc:284 +#: cmdline/apt-cache.cc:282 msgid "Total package names: " msgstr "" -#: cmdline/apt-cache.cc:286 +#: cmdline/apt-cache.cc:284 msgid "Total package structures: " msgstr "" -#: cmdline/apt-cache.cc:326 +#: cmdline/apt-cache.cc:324 msgid " Normal packages: " msgstr "" -#: cmdline/apt-cache.cc:327 +#: cmdline/apt-cache.cc:325 msgid " Pure virtual packages: " msgstr "" -#: cmdline/apt-cache.cc:328 +#: cmdline/apt-cache.cc:326 msgid " Single virtual packages: " msgstr "" -#: cmdline/apt-cache.cc:329 +#: cmdline/apt-cache.cc:327 msgid " Mixed virtual packages: " msgstr "" -#: cmdline/apt-cache.cc:330 +#: cmdline/apt-cache.cc:328 msgid " Missing: " msgstr "" -#: cmdline/apt-cache.cc:332 +#: cmdline/apt-cache.cc:330 msgid "Total distinct versions: " msgstr "" -#: cmdline/apt-cache.cc:334 +#: cmdline/apt-cache.cc:332 msgid "Total distinct descriptions: " msgstr "" -#: cmdline/apt-cache.cc:336 +#: cmdline/apt-cache.cc:334 msgid "Total dependencies: " msgstr "" -#: cmdline/apt-cache.cc:339 +#: cmdline/apt-cache.cc:337 msgid "Total ver/file relations: " msgstr "" -#: cmdline/apt-cache.cc:341 +#: cmdline/apt-cache.cc:339 msgid "Total Desc/File relations: " msgstr "" -#: cmdline/apt-cache.cc:343 +#: cmdline/apt-cache.cc:341 msgid "Total Provides mappings: " msgstr "" -#: cmdline/apt-cache.cc:355 +#: cmdline/apt-cache.cc:353 msgid "Total globbed strings: " msgstr "" -#: cmdline/apt-cache.cc:369 +#: cmdline/apt-cache.cc:367 msgid "Total dependency version space: " msgstr "" -#: cmdline/apt-cache.cc:374 +#: cmdline/apt-cache.cc:372 msgid "Total slack space: " msgstr "" -#: cmdline/apt-cache.cc:382 +#: cmdline/apt-cache.cc:380 msgid "Total space accounted for: " msgstr "" -#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1194 +#: cmdline/apt-cache.cc:511 cmdline/apt-cache.cc:1139 #, c-format msgid "Package file %s is out of sync." msgstr "" -#: cmdline/apt-cache.cc:1273 +#: cmdline/apt-cache.cc:589 cmdline/apt-cache.cc:1374 +#: cmdline/apt-cache.cc:1376 cmdline/apt-cache.cc:1453 cmdline/apt-mark.cc:37 +#: cmdline/apt-mark.cc:84 cmdline/apt-mark.cc:160 +msgid "No packages found" +msgstr "" + +#: cmdline/apt-cache.cc:1218 msgid "You must give at least one search pattern" msgstr "" -#: cmdline/apt-cache.cc:1429 cmdline/apt-cache.cc:1431 -#: cmdline/apt-cache.cc:1508 -msgid "No packages found" +#: cmdline/apt-cache.cc:1353 +msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1503 apt-pkg/cacheset.cc:440 +#: cmdline/apt-cache.cc:1448 apt-pkg/cacheset.cc:440 #, c-format msgid "Unable to locate package %s" msgstr "" -#: cmdline/apt-cache.cc:1533 +#: cmdline/apt-cache.cc:1478 msgid "Package files:" msgstr "" -#: cmdline/apt-cache.cc:1540 cmdline/apt-cache.cc:1638 +#: cmdline/apt-cache.cc:1485 cmdline/apt-cache.cc:1576 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1554 +#: cmdline/apt-cache.cc:1499 msgid "Pinned packages:" msgstr "" -#: cmdline/apt-cache.cc:1566 cmdline/apt-cache.cc:1618 +#: cmdline/apt-cache.cc:1511 cmdline/apt-cache.cc:1556 msgid "(not found)" msgstr "" -#: cmdline/apt-cache.cc:1575 +#: cmdline/apt-cache.cc:1519 msgid " Installed: " msgstr "" -#: cmdline/apt-cache.cc:1576 +#: cmdline/apt-cache.cc:1520 msgid " Candidate: " msgstr "" -#: cmdline/apt-cache.cc:1600 cmdline/apt-cache.cc:1608 +#: cmdline/apt-cache.cc:1538 cmdline/apt-cache.cc:1546 msgid "(none)" msgstr "" -#: cmdline/apt-cache.cc:1615 +#: cmdline/apt-cache.cc:1553 msgid " Package pin: " msgstr "" #. Show the priority tables -#: cmdline/apt-cache.cc:1624 +#: cmdline/apt-cache.cc:1562 msgid " Version table:" msgstr "" -#: cmdline/apt-cache.cc:1738 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1675 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:73 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589 -#: cmdline/apt-get.cc:2793 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:3126 cmdline/apt-internal-solver.cc:30 +#: cmdline/apt-mark.cc:264 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "" -#: cmdline/apt-cache.cc:1745 +#: cmdline/apt-cache.cc:1682 msgid "" "Usage: apt-cache [options] command\n" -" apt-cache [options] add file1 [file2 ...]\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" " apt-cache [options] showsrc pkg1 [pkg2 ...]\n" "\n" -"apt-cache is a low-level tool used to manipulate APT's binary\n" -"cache files, and query information from them\n" +"apt-cache is a low-level tool used to query information\n" +"from APT's binary cache files\n" "\n" "Commands:\n" -" add - Add a package file to the source cache\n" " gencaches - Build both the package and source cache\n" " showpkg - Show some general information for a single package\n" " showsrc - Show source records\n" @@ -175,7 +179,6 @@ msgid "" " unmet - Show unmet dependencies\n" " search - Search the package list for a regex pattern\n" " show - Show a readable record for the package\n" -" showauto - Display a list of automatically installed packages\n" " depends - Show raw dependency information for a package\n" " rdepends - Show reverse dependency information for a package\n" " pkgnames - List the names of all packages in the system\n" @@ -211,11 +214,11 @@ msgstr "" msgid "Repeat this process for the rest of the CDs in your set." msgstr "" -#: cmdline/apt-config.cc:41 +#: cmdline/apt-config.cc:44 msgid "Arguments not in pairs" msgstr "" -#: cmdline/apt-config.cc:76 +#: cmdline/apt-config.cc:79 msgid "" "Usage: apt-config [options] command\n" "\n" @@ -250,7 +253,7 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1171 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1149 #, c-format msgid "Unable to write to %s" msgstr "" @@ -361,105 +364,100 @@ msgstr "" msgid "Failed to stat %s" msgstr "" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:245 msgid "Archive has no control record" msgstr "" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:482 msgid "Unable to get a cursor" msgstr "" -#: ftparchive/writer.cc:73 +#: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" msgstr "" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:84 #, c-format msgid "W: Unable to stat %s\n" msgstr "" -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:140 msgid "E: " msgstr "" -#: ftparchive/writer.cc:136 +#: ftparchive/writer.cc:142 msgid "W: " msgstr "" -#: ftparchive/writer.cc:143 +#: ftparchive/writer.cc:149 msgid "E: Errors apply to file " msgstr "" -#: ftparchive/writer.cc:161 ftparchive/writer.cc:193 +#: ftparchive/writer.cc:167 ftparchive/writer.cc:199 #, c-format msgid "Failed to resolve %s" msgstr "" -#: ftparchive/writer.cc:174 +#: ftparchive/writer.cc:180 msgid "Tree walking failed" msgstr "" -#: ftparchive/writer.cc:201 +#: ftparchive/writer.cc:207 #, c-format msgid "Failed to open %s" msgstr "" -#: ftparchive/writer.cc:260 +#: ftparchive/writer.cc:266 #, c-format msgid " DeLink %s [%s]\n" msgstr "" -#: ftparchive/writer.cc:268 +#: ftparchive/writer.cc:274 #, c-format msgid "Failed to readlink %s" msgstr "" -#: ftparchive/writer.cc:272 +#: ftparchive/writer.cc:278 #, c-format msgid "Failed to unlink %s" msgstr "" -#: ftparchive/writer.cc:279 +#: ftparchive/writer.cc:285 #, c-format msgid "*** Failed to link %s to %s" msgstr "" -#: ftparchive/writer.cc:289 +#: ftparchive/writer.cc:295 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr "" -#: ftparchive/writer.cc:393 +#: ftparchive/writer.cc:400 msgid "Archive had no package field" msgstr "" -#: ftparchive/writer.cc:401 ftparchive/writer.cc:688 +#: ftparchive/writer.cc:408 ftparchive/writer.cc:710 #, c-format msgid " %s has no override entry\n" msgstr "" -#: ftparchive/writer.cc:464 ftparchive/writer.cc:793 +#: ftparchive/writer.cc:476 ftparchive/writer.cc:826 #, c-format msgid " %s maintainer is %s not %s\n" msgstr "" -#: ftparchive/writer.cc:698 +#: ftparchive/writer.cc:720 #, c-format msgid " %s has no source override entry\n" msgstr "" -#: ftparchive/writer.cc:702 +#: ftparchive/writer.cc:724 #, c-format msgid " %s has no binary override entry either\n" msgstr "" -#: ftparchive/contents.cc:321 -#, c-format -msgid "Internal error, could not locate member %s" -msgstr "" - -#: ftparchive/contents.cc:358 ftparchive/contents.cc:389 +#: ftparchive/contents.cc:337 ftparchive/contents.cc:368 msgid "realloc - Failed to allocate memory" msgstr "" @@ -488,63 +486,63 @@ msgstr "" msgid "Failed to read the override file %s" msgstr "" -#: ftparchive/multicompress.cc:72 +#: ftparchive/multicompress.cc:67 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "" -#: ftparchive/multicompress.cc:102 +#: ftparchive/multicompress.cc:97 #, c-format msgid "Compressed output %s needs a compression set" msgstr "" -#: ftparchive/multicompress.cc:169 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:165 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "" -#: ftparchive/multicompress.cc:195 +#: ftparchive/multicompress.cc:191 msgid "Failed to create FILE*" msgstr "" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:194 msgid "Failed to fork" msgstr "" -#: ftparchive/multicompress.cc:212 +#: ftparchive/multicompress.cc:208 msgid "Compress child" msgstr "" -#: ftparchive/multicompress.cc:235 +#: ftparchive/multicompress.cc:231 #, c-format msgid "Internal error, failed to create %s" msgstr "" -#: ftparchive/multicompress.cc:286 +#: ftparchive/multicompress.cc:282 msgid "Failed to create subprocess IPC" msgstr "" -#: ftparchive/multicompress.cc:321 +#: ftparchive/multicompress.cc:319 msgid "Failed to exec compressor " msgstr "" -#: ftparchive/multicompress.cc:360 +#: ftparchive/multicompress.cc:358 msgid "decompressor" msgstr "" -#: ftparchive/multicompress.cc:403 +#: ftparchive/multicompress.cc:401 msgid "IO to subprocess/file failed" msgstr "" -#: ftparchive/multicompress.cc:455 +#: ftparchive/multicompress.cc:453 msgid "Failed to read while computing MD5" msgstr "" -#: ftparchive/multicompress.cc:472 +#: ftparchive/multicompress.cc:470 #, c-format msgid "Problem unlinking %s" msgstr "" -#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185 +#: ftparchive/multicompress.cc:485 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "" @@ -592,94 +590,94 @@ msgstr "" msgid " or" msgstr "" -#: cmdline/apt-get.cc:392 +#: cmdline/apt-get.cc:390 msgid "The following NEW packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:420 +#: cmdline/apt-get.cc:416 msgid "The following packages will be REMOVED:" msgstr "" -#: cmdline/apt-get.cc:442 +#: cmdline/apt-get.cc:438 msgid "The following packages have been kept back:" msgstr "" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:459 msgid "The following packages will be upgraded:" msgstr "" -#: cmdline/apt-get.cc:488 +#: cmdline/apt-get.cc:480 msgid "The following packages will be DOWNGRADED:" msgstr "" -#: cmdline/apt-get.cc:508 +#: cmdline/apt-get.cc:500 msgid "The following held packages will be changed:" msgstr "" -#: cmdline/apt-get.cc:563 +#: cmdline/apt-get.cc:555 #, c-format msgid "%s (due to %s) " msgstr "" -#: cmdline/apt-get.cc:571 +#: cmdline/apt-get.cc:563 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" -#: cmdline/apt-get.cc:605 +#: cmdline/apt-get.cc:594 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "" -#: cmdline/apt-get.cc:609 +#: cmdline/apt-get.cc:598 #, c-format msgid "%lu reinstalled, " msgstr "" -#: cmdline/apt-get.cc:611 +#: cmdline/apt-get.cc:600 #, c-format msgid "%lu downgraded, " msgstr "" -#: cmdline/apt-get.cc:613 +#: cmdline/apt-get.cc:602 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "" -#: cmdline/apt-get.cc:617 +#: cmdline/apt-get.cc:606 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "" -#: cmdline/apt-get.cc:639 +#: cmdline/apt-get.cc:628 #, c-format msgid "Note, selecting '%s' for task '%s'\n" msgstr "" -#: cmdline/apt-get.cc:645 +#: cmdline/apt-get.cc:634 #, c-format msgid "Note, selecting '%s' for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:662 +#: cmdline/apt-get.cc:651 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "" -#: cmdline/apt-get.cc:673 +#: cmdline/apt-get.cc:662 msgid " [Installed]" msgstr "" -#: cmdline/apt-get.cc:682 +#: cmdline/apt-get.cc:671 msgid " [Not candidate version]" msgstr "" -#: cmdline/apt-get.cc:684 +#: cmdline/apt-get.cc:673 msgid "You should explicitly select one to install." msgstr "" -#: cmdline/apt-get.cc:687 +#: cmdline/apt-get.cc:676 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -687,177 +685,177 @@ msgid "" "is only available from another source\n" msgstr "" -#: cmdline/apt-get.cc:705 +#: cmdline/apt-get.cc:694 msgid "However the following packages replace it:" msgstr "" -#: cmdline/apt-get.cc:717 +#: cmdline/apt-get.cc:706 #, c-format msgid "Package '%s' has no installation candidate" msgstr "" -#: cmdline/apt-get.cc:728 +#: cmdline/apt-get.cc:717 #, c-format msgid "Virtual packages like '%s' can't be removed\n" msgstr "" -#: cmdline/apt-get.cc:759 +#: cmdline/apt-get.cc:748 #, c-format msgid "Note, selecting '%s' instead of '%s'\n" msgstr "" -#: cmdline/apt-get.cc:789 +#: cmdline/apt-get.cc:778 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" -#: cmdline/apt-get.cc:793 +#: cmdline/apt-get.cc:782 #, c-format msgid "Skipping %s, it is not installed and only upgrades are requested.\n" msgstr "" -#: cmdline/apt-get.cc:803 +#: cmdline/apt-get.cc:794 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" -#: cmdline/apt-get.cc:808 +#: cmdline/apt-get.cc:799 #, c-format msgid "%s is already the newest version.\n" msgstr "" -#: cmdline/apt-get.cc:827 cmdline/apt-get.cc:2027 +#: cmdline/apt-get.cc:818 cmdline/apt-get.cc:2082 cmdline/apt-mark.cc:59 #, c-format msgid "%s set to manually installed.\n" msgstr "" -#: cmdline/apt-get.cc:853 +#: cmdline/apt-get.cc:844 #, c-format msgid "Selected version '%s' (%s) for '%s'\n" msgstr "" -#: cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:849 #, c-format msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" msgstr "" -#: cmdline/apt-get.cc:898 +#: cmdline/apt-get.cc:893 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "" -#: cmdline/apt-get.cc:973 +#: cmdline/apt-get.cc:971 msgid "Correcting dependencies..." msgstr "" -#: cmdline/apt-get.cc:976 +#: cmdline/apt-get.cc:974 msgid " failed." msgstr "" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:977 msgid "Unable to correct dependencies" msgstr "" -#: cmdline/apt-get.cc:982 +#: cmdline/apt-get.cc:980 msgid "Unable to minimize the upgrade set" msgstr "" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:982 msgid " Done" msgstr "" -#: cmdline/apt-get.cc:988 +#: cmdline/apt-get.cc:986 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "" -#: cmdline/apt-get.cc:991 +#: cmdline/apt-get.cc:989 msgid "Unmet dependencies. Try using -f." msgstr "" -#: cmdline/apt-get.cc:1016 +#: cmdline/apt-get.cc:1014 msgid "WARNING: The following packages cannot be authenticated!" msgstr "" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1018 msgid "Authentication warning overridden.\n" msgstr "" -#: cmdline/apt-get.cc:1027 +#: cmdline/apt-get.cc:1025 msgid "Install these packages without verification [y/N]? " msgstr "" -#: cmdline/apt-get.cc:1029 +#: cmdline/apt-get.cc:1027 msgid "Some packages could not be authenticated" msgstr "" -#: cmdline/apt-get.cc:1038 cmdline/apt-get.cc:1199 +#: cmdline/apt-get.cc:1036 cmdline/apt-get.cc:1197 msgid "There are problems and -y was used without --force-yes" msgstr "" -#: cmdline/apt-get.cc:1079 +#: cmdline/apt-get.cc:1077 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" -#: cmdline/apt-get.cc:1088 +#: cmdline/apt-get.cc:1086 msgid "Packages need to be removed but remove is disabled." msgstr "" -#: cmdline/apt-get.cc:1099 +#: cmdline/apt-get.cc:1097 msgid "Internal error, Ordering didn't finish" msgstr "" -#: cmdline/apt-get.cc:1137 +#: cmdline/apt-get.cc:1135 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1144 +#: cmdline/apt-get.cc:1142 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1149 +#: cmdline/apt-get.cc:1147 #, c-format msgid "Need to get %sB of archives.\n" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1156 +#: cmdline/apt-get.cc:1154 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1161 +#: cmdline/apt-get.cc:1159 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "" -#: cmdline/apt-get.cc:1176 cmdline/apt-get.cc:1179 cmdline/apt-get.cc:2367 -#: cmdline/apt-get.cc:2370 +#: cmdline/apt-get.cc:1174 cmdline/apt-get.cc:1177 cmdline/apt-get.cc:2496 +#: cmdline/apt-get.cc:2499 #, c-format msgid "Couldn't determine free space in %s" msgstr "" -#: cmdline/apt-get.cc:1189 +#: cmdline/apt-get.cc:1187 #, c-format msgid "You don't have enough free space in %s." msgstr "" -#: cmdline/apt-get.cc:1205 cmdline/apt-get.cc:1225 +#: cmdline/apt-get.cc:1203 cmdline/apt-get.cc:1223 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" -#: cmdline/apt-get.cc:1207 +#: cmdline/apt-get.cc:1205 msgid "Yes, do as I say!" msgstr "" -#: cmdline/apt-get.cc:1209 +#: cmdline/apt-get.cc:1207 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -865,46 +863,46 @@ msgid "" " ?] " msgstr "" -#: cmdline/apt-get.cc:1215 cmdline/apt-get.cc:1234 +#: cmdline/apt-get.cc:1213 cmdline/apt-get.cc:1232 msgid "Abort." msgstr "" -#: cmdline/apt-get.cc:1230 +#: cmdline/apt-get.cc:1228 msgid "Do you want to continue [Y/n]? " msgstr "" -#: cmdline/apt-get.cc:1302 cmdline/apt-get.cc:2427 apt-pkg/algorithms.cc:1470 +#: cmdline/apt-get.cc:1300 cmdline/apt-get.cc:2561 apt-pkg/algorithms.cc:1453 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" -#: cmdline/apt-get.cc:1320 +#: cmdline/apt-get.cc:1318 msgid "Some files failed to download" msgstr "" -#: cmdline/apt-get.cc:1321 cmdline/apt-get.cc:2436 +#: cmdline/apt-get.cc:1319 cmdline/apt-get.cc:2573 msgid "Download complete and in download only mode" msgstr "" -#: cmdline/apt-get.cc:1327 +#: cmdline/apt-get.cc:1325 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" -#: cmdline/apt-get.cc:1331 +#: cmdline/apt-get.cc:1329 msgid "--fix-missing and media swapping is not currently supported" msgstr "" -#: cmdline/apt-get.cc:1336 +#: cmdline/apt-get.cc:1334 msgid "Unable to correct missing packages." msgstr "" -#: cmdline/apt-get.cc:1337 +#: cmdline/apt-get.cc:1335 msgid "Aborting install." msgstr "" -#: cmdline/apt-get.cc:1365 +#: cmdline/apt-get.cc:1363 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -914,35 +912,35 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1369 +#: cmdline/apt-get.cc:1367 msgid "Note: This is done automatic and on purpose by dpkg." msgstr "" -#: cmdline/apt-get.cc:1499 +#: cmdline/apt-get.cc:1497 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1531 +#: cmdline/apt-get.cc:1529 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1567 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1583 msgid "The update command takes no arguments" msgstr "" -#: cmdline/apt-get.cc:1647 +#: cmdline/apt-get.cc:1645 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1699 +#: cmdline/apt-get.cc:1740 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -958,15 +956,15 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1702 cmdline/apt-get.cc:1858 +#: cmdline/apt-get.cc:1743 cmdline/apt-get.cc:1912 msgid "The following information may help to resolve the situation:" msgstr "" -#: cmdline/apt-get.cc:1706 +#: cmdline/apt-get.cc:1747 msgid "Internal Error, AutoRemover broke stuff" msgstr "" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1754 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -975,7 +973,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1717 +#: cmdline/apt-get.cc:1758 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -983,25 +981,25 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1719 +#: cmdline/apt-get.cc:1760 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1738 +#: cmdline/apt-get.cc:1779 msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1828 +#: cmdline/apt-get.cc:1878 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "" -#: cmdline/apt-get.cc:1831 +#: cmdline/apt-get.cc:1882 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -#: cmdline/apt-get.cc:1843 +#: cmdline/apt-get.cc:1897 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1009,69 +1007,80 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1861 +#: cmdline/apt-get.cc:1918 msgid "Broken packages" msgstr "" -#: cmdline/apt-get.cc:1889 +#: cmdline/apt-get.cc:1944 msgid "The following extra packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:2034 msgid "Suggested packages:" msgstr "" -#: cmdline/apt-get.cc:1980 +#: cmdline/apt-get.cc:2035 msgid "Recommended packages:" msgstr "" -#: cmdline/apt-get.cc:2022 +#: cmdline/apt-get.cc:2077 #, c-format msgid "Couldn't find package %s" msgstr "" -#: cmdline/apt-get.cc:2029 +#: cmdline/apt-get.cc:2084 cmdline/apt-mark.cc:61 #, c-format msgid "%s set to automatically installed.\n" msgstr "" -#: cmdline/apt-get.cc:2050 +#: cmdline/apt-get.cc:2092 cmdline/apt-mark.cc:105 +msgid "" +"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " +"instead." +msgstr "" + +#: cmdline/apt-get.cc:2108 msgid "Calculating upgrade... " msgstr "" -#: cmdline/apt-get.cc:2053 methods/ftp.cc:707 methods/connect.cc:111 +#: cmdline/apt-get.cc:2111 methods/ftp.cc:707 methods/connect.cc:111 msgid "Failed" msgstr "" -#: cmdline/apt-get.cc:2058 +#: cmdline/apt-get.cc:2116 msgid "Done" msgstr "" -#: cmdline/apt-get.cc:2125 cmdline/apt-get.cc:2133 +#: cmdline/apt-get.cc:2183 cmdline/apt-get.cc:2191 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:2157 cmdline/apt-get.cc:2190 +#: cmdline/apt-get.cc:2215 cmdline/apt-get.cc:2248 msgid "Unable to lock the download directory" msgstr "" -#: cmdline/apt-get.cc:2233 +#: cmdline/apt-get.cc:2299 +#, c-format +msgid "Downloading %s %s" +msgstr "" + +#: cmdline/apt-get.cc:2357 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:2273 cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2398 cmdline/apt-get.cc:2694 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:2289 +#: cmdline/apt-get.cc:2415 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2420 #, c-format msgid "" "Please use:\n" @@ -1079,115 +1088,120 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:2345 +#: cmdline/apt-get.cc:2473 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:2380 +#: cmdline/apt-get.cc:2510 #, c-format msgid "You don't have enough free space in %s" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2388 +#: cmdline/apt-get.cc:2519 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2393 +#: cmdline/apt-get.cc:2524 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2399 +#: cmdline/apt-get.cc:2530 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:2432 +#: cmdline/apt-get.cc:2568 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:2462 +#: cmdline/apt-get.cc:2599 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2474 +#: cmdline/apt-get.cc:2611 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2475 +#: cmdline/apt-get.cc:2612 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2492 +#: cmdline/apt-get.cc:2629 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2512 +#: cmdline/apt-get.cc:2649 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2528 +#: cmdline/apt-get.cc:2668 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2559 +#: cmdline/apt-get.cc:2699 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2579 +#: cmdline/apt-get.cc:2719 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2630 +#: cmdline/apt-get.cc:2770 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2683 +#: cmdline/apt-get.cc:2823 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:2719 +#: cmdline/apt-get.cc:2859 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2746 +#: cmdline/apt-get.cc:2886 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2762 +#: cmdline/apt-get.cc:2902 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2767 +#: cmdline/apt-get.cc:2907 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2798 +#: cmdline/apt-get.cc:3000 cmdline/apt-get.cc:3012 +#, c-format +msgid "Changelog for %s (%s)" +msgstr "" + +#: cmdline/apt-get.cc:3131 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:2839 +#: cmdline/apt-get.cc:3172 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1211,8 +1225,8 @@ msgid "" " clean - Erase downloaded archive files\n" " autoclean - Erase old downloaded archive files\n" " check - Verify that there are no broken dependencies\n" -" markauto - Mark the given packages as automatically installed\n" -" unmarkauto - Mark the given packages as manually installed\n" +" changelog - Download and display the changelog for the given package\n" +" download - Download the binary package into the current directory\n" "\n" "Options:\n" " -h This help text.\n" @@ -1233,7 +1247,7 @@ msgid "" " This APT has Super Cow Powers.\n" msgstr "" -#: cmdline/apt-get.cc:2995 +#: cmdline/apt-get.cc:3335 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1275,6 +1289,83 @@ msgid "" "in the drive '%s' and press enter\n" msgstr "" +#: cmdline/apt-internal-solver.cc:34 +msgid "" +"Usage: apt-internal-resolver\n" +"\n" +"apt-internal-resolver is an interface to use the current internal\n" +"like an external resolver for the APT family for debugging or alike\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -q Loggable output - no progress indicator\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +"apt.conf(5) manual pages for more information and options.\n" +" This APT has Super Cow Powers.\n" +msgstr "" + +#: cmdline/apt-mark.cc:46 +#, c-format +msgid "%s can not be marked as it is not installed.\n" +msgstr "" + +#: cmdline/apt-mark.cc:52 +#, c-format +msgid "%s was already set to manually installed.\n" +msgstr "" + +#: cmdline/apt-mark.cc:54 +#, c-format +msgid "%s was already set to automatically installed.\n" +msgstr "" + +#: cmdline/apt-mark.cc:169 +#, c-format +msgid "%s was already set on hold.\n" +msgstr "" + +#: cmdline/apt-mark.cc:171 +#, c-format +msgid "%s was already not hold.\n" +msgstr "" + +#: cmdline/apt-mark.cc:185 cmdline/apt-mark.cc:207 +#, c-format +msgid "%s set on hold.\n" +msgstr "" + +#: cmdline/apt-mark.cc:187 cmdline/apt-mark.cc:212 +#, c-format +msgid "Canceled hold on %s.\n" +msgstr "" + +#: cmdline/apt-mark.cc:220 +msgid "Executing dpkg failed. Are you root?" +msgstr "" + +#: cmdline/apt-mark.cc:268 +msgid "" +"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" +"\n" +"apt-mark is a simple command line interface for marking packages\n" +"as manual or automatical installed. It can also list marks.\n" +"\n" +"Commands:\n" +" auto - Mark the given packages as automatically installed\n" +" manual - Mark the given packages as manually installed\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -q Loggable output - no progress indicator\n" +" -qq No output except for errors\n" +" -s No-act. Just prints what would be done.\n" +" -f read/write auto/manual marking in the given file\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +"See the apt-mark(8) and apt.conf(5) manual pages for more information." +msgstr "" + #: cmdline/apt-sortpkgs.cc:86 msgid "Unknown package record!" msgstr "" @@ -1335,7 +1426,7 @@ msgstr "" msgid "Failed to exec gzip " msgstr "" -#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:208 msgid "Corrupted archive" msgstr "" @@ -1343,7 +1434,7 @@ msgstr "" msgid "Tar checksum failed, archive corrupted" msgstr "" -#: apt-inst/contrib/extracttar.cc:296 +#: apt-inst/contrib/extracttar.cc:300 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "" @@ -1404,12 +1495,12 @@ msgstr "" msgid "Duplicate conf file %s/%s" msgstr "" -#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:47 apt-inst/dirstream.cc:53 #, c-format msgid "Failed to write file %s" msgstr "" -#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 +#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "" @@ -1451,28 +1542,28 @@ msgstr "" msgid "The path is too long" msgstr "" -#: apt-inst/extract.cc:414 +#: apt-inst/extract.cc:412 #, c-format msgid "Overwrite package match with no version for %s" msgstr "" -#: apt-inst/extract.cc:431 +#: apt-inst/extract.cc:429 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:179 -#: apt-pkg/contrib/fileutl.cc:329 apt-pkg/sourcelist.cc:204 -#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:100 -#: apt-pkg/init.cc:108 apt-pkg/clean.cc:33 apt-pkg/policy.cc:307 -#: methods/mirror.cc:87 +#: apt-inst/extract.cc:462 apt-pkg/contrib/cdromutl.cc:179 +#: apt-pkg/contrib/fileutl.cc:343 apt-pkg/sourcelist.cc:204 +#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:102 +#: apt-pkg/init.cc:110 apt-pkg/clean.cc:33 apt-pkg/policy.cc:318 +#: methods/mirror.cc:91 #, c-format msgid "Unable to read %s" msgstr "" -#: apt-inst/extract.cc:491 +#: apt-inst/extract.cc:489 #, c-format msgid "Unable to stat %s" msgstr "" @@ -1496,9 +1587,9 @@ msgstr "" msgid "The info and temp directories need to be on the same filesystem" msgstr "" -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1070 -#: apt-pkg/pkgcachegen.cc:1174 apt-pkg/pkgcachegen.cc:1180 -#: apt-pkg/pkgcachegen.cc:1326 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1048 +#: apt-pkg/pkgcachegen.cc:1152 apt-pkg/pkgcachegen.cc:1158 +#: apt-pkg/pkgcachegen.cc:1304 msgid "Reading package lists" msgstr "" @@ -1571,51 +1662,57 @@ msgstr "" msgid "Error parsing MD5. Offset %lu" msgstr "" -#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43 +#: apt-inst/deb/debfile.cc:39 apt-inst/deb/debfile.cc:44 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "" -#: apt-inst/deb/debfile.cc:50 +#. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain +#: apt-inst/deb/debfile.cc:53 #, c-format msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" msgstr "" -#: apt-inst/deb/debfile.cc:110 +#: apt-inst/deb/debfile.cc:113 #, c-format msgid "Couldn't change to %s" msgstr "" -#: apt-inst/deb/debfile.cc:140 -msgid "Internal error, could not locate member" +#: apt-inst/deb/debfile.cc:154 +#, c-format +msgid "Internal error, could not locate member %s" msgstr "" -#: apt-inst/deb/debfile.cc:173 +#: apt-inst/deb/debfile.cc:189 msgid "Failed to locate a valid control file" msgstr "" -#: apt-inst/deb/debfile.cc:258 +#: apt-inst/deb/debfile.cc:274 msgid "Unparsable control file" msgstr "" -#: methods/bzip2.cc:65 +#: methods/bzip2.cc:60 methods/gzip.cc:52 +msgid "Empty files can't be valid archives" +msgstr "" + +#: methods/bzip2.cc:64 #, c-format msgid "Couldn't open pipe for %s" msgstr "" -#: methods/bzip2.cc:109 +#: methods/bzip2.cc:108 #, c-format msgid "Read error from %s process" msgstr "" -#: methods/bzip2.cc:141 methods/bzip2.cc:150 methods/copy.cc:43 -#: methods/gzip.cc:93 methods/gzip.cc:102 methods/rred.cc:486 -#: methods/rred.cc:495 +#: methods/bzip2.cc:140 methods/bzip2.cc:149 methods/copy.cc:43 +#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:524 +#: methods/rred.cc:533 msgid "Failed to stat" msgstr "" -#: methods/bzip2.cc:147 methods/copy.cc:80 methods/gzip.cc:99 -#: methods/rred.cc:492 +#: methods/bzip2.cc:146 methods/copy.cc:80 methods/gzip.cc:98 +#: methods/rred.cc:530 msgid "Failed to set modification time" msgstr "" @@ -1643,7 +1740,7 @@ msgstr "" msgid "Disk not found." msgstr "" -#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:265 msgid "File not found" msgstr "" @@ -1695,7 +1792,7 @@ msgstr "" msgid "TYPE failed, server said: %s" msgstr "" -#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226 +#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:184 methods/rsh.cc:227 msgid "Connection timeout" msgstr "" @@ -1703,11 +1800,11 @@ msgstr "" msgid "Server closed the connection" msgstr "" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:802 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:820 methods/rsh.cc:191 msgid "Read error" msgstr "" -#: methods/ftp.cc:351 methods/rsh.cc:197 +#: methods/ftp.cc:351 methods/rsh.cc:198 msgid "A response overflowed the buffer." msgstr "" @@ -1715,7 +1812,7 @@ msgstr "" msgid "Protocol corruption" msgstr "" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:844 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:862 methods/rsh.cc:233 msgid "Write error" msgstr "" @@ -1769,7 +1866,7 @@ msgstr "" msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:869 methods/http.cc:1006 methods/rsh.cc:302 +#: methods/ftp.cc:869 methods/http.cc:1023 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" @@ -1778,7 +1875,7 @@ msgstr "" msgid "Unable to fetch file, server said '%s'" msgstr "" -#: methods/ftp.cc:897 methods/rsh.cc:321 +#: methods/ftp.cc:897 methods/rsh.cc:322 msgid "Data socket timed out" msgstr "" @@ -1828,7 +1925,7 @@ msgstr "" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:149 methods/rsh.cc:424 +#: methods/connect.cc:149 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "" @@ -1919,47 +2016,47 @@ msgstr "" msgid "Unknown date format" msgstr "" -#: methods/http.cc:799 +#: methods/http.cc:800 msgid "Select failed" msgstr "" -#: methods/http.cc:804 +#: methods/http.cc:805 msgid "Connection timed out" msgstr "" -#: methods/http.cc:827 +#: methods/http.cc:828 msgid "Error writing to output file" msgstr "" -#: methods/http.cc:858 +#: methods/http.cc:859 msgid "Error writing to file" msgstr "" -#: methods/http.cc:886 +#: methods/http.cc:887 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:900 +#: methods/http.cc:901 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:902 +#: methods/http.cc:903 msgid "Error reading from server" msgstr "" -#: methods/http.cc:991 apt-pkg/contrib/mmap.cc:281 +#: methods/http.cc:1008 apt-pkg/contrib/mmap.cc:291 msgid "Failed to truncate file" msgstr "" -#: methods/http.cc:1160 +#: methods/http.cc:1183 msgid "Bad header data" msgstr "" -#: methods/http.cc:1177 methods/http.cc:1232 +#: methods/http.cc:1200 methods/http.cc:1255 msgid "Connection failed" msgstr "" -#: methods/http.cc:1324 +#: methods/http.cc:1347 msgid "Internal error" msgstr "" @@ -1972,7 +2069,7 @@ msgstr "" msgid "Couldn't duplicate file descriptor %i" msgstr "" -#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:250 +#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:258 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "" @@ -1985,21 +2082,21 @@ msgstr "" msgid "Unable to synchronize mmap" msgstr "" -#: apt-pkg/contrib/mmap.cc:300 +#: apt-pkg/contrib/mmap.cc:310 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" -#: apt-pkg/contrib/mmap.cc:399 +#: apt-pkg/contrib/mmap.cc:409 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " "reached." msgstr "" -#: apt-pkg/contrib/mmap.cc:402 +#: apt-pkg/contrib/mmap.cc:412 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2028,7 +2125,7 @@ msgstr "" msgid "%lis" msgstr "" -#: apt-pkg/contrib/strutl.cc:1119 +#: apt-pkg/contrib/strutl.cc:1138 #, c-format msgid "Selection %s not found" msgstr "" @@ -2088,12 +2185,12 @@ msgstr "" msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "" -#: apt-pkg/contrib/progress.cc:153 +#: apt-pkg/contrib/progress.cc:144 #, c-format msgid "%c%s... Error!" msgstr "" -#: apt-pkg/contrib/progress.cc:155 +#: apt-pkg/contrib/progress.cc:146 #, c-format msgid "%c%s... Done" msgstr "" @@ -2151,106 +2248,122 @@ msgstr "" #: apt-pkg/contrib/cdromutl.cc:175 apt-pkg/contrib/cdromutl.cc:209 #: apt-pkg/acquire.cc:456 apt-pkg/acquire.cc:481 apt-pkg/clean.cc:39 -#: methods/mirror.cc:93 +#: methods/mirror.cc:97 #, c-format msgid "Unable to change to %s" msgstr "" -#: apt-pkg/contrib/cdromutl.cc:217 +#: apt-pkg/contrib/cdromutl.cc:220 msgid "Failed to stat the cdrom" msgstr "" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:168 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:159 +#: apt-pkg/contrib/fileutl.cc:173 #, c-format msgid "Could not open lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:177 +#: apt-pkg/contrib/fileutl.cc:191 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:181 +#: apt-pkg/contrib/fileutl.cc:195 #, c-format msgid "Could not get lock %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:321 +#: apt-pkg/contrib/fileutl.cc:335 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:661 +#: apt-pkg/contrib/fileutl.cc:362 +#, c-format +msgid "Ignoring '%s' in directory '%s' as it is not a regular file" +msgstr "" + +#: apt-pkg/contrib/fileutl.cc:380 +#, c-format +msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" +msgstr "" + +#: apt-pkg/contrib/fileutl.cc:389 +#, c-format +msgid "" +"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" +msgstr "" + +#: apt-pkg/contrib/fileutl.cc:679 #, c-format msgid "Waited for %s but it wasn't there" msgstr "" -#: apt-pkg/contrib/fileutl.cc:673 +#: apt-pkg/contrib/fileutl.cc:691 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:693 #, c-format msgid "Sub-process %s received signal %u." msgstr "" -#: apt-pkg/contrib/fileutl.cc:679 +#: apt-pkg/contrib/fileutl.cc:697 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "" -#: apt-pkg/contrib/fileutl.cc:681 +#: apt-pkg/contrib/fileutl.cc:699 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "" -#: apt-pkg/contrib/fileutl.cc:746 +#: apt-pkg/contrib/fileutl.cc:764 #, c-format msgid "Could not open file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:763 +#: apt-pkg/contrib/fileutl.cc:781 #, c-format msgid "Could not open file descriptor %d" msgstr "" -#: apt-pkg/contrib/fileutl.cc:823 +#: apt-pkg/contrib/fileutl.cc:841 #, c-format msgid "read, still have %lu to read but none left" msgstr "" -#: apt-pkg/contrib/fileutl.cc:856 +#: apt-pkg/contrib/fileutl.cc:874 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "" -#: apt-pkg/contrib/fileutl.cc:985 +#: apt-pkg/contrib/fileutl.cc:1010 #, c-format msgid "Problem closing the gzip file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:988 +#: apt-pkg/contrib/fileutl.cc:1013 #, c-format msgid "Problem closing the file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:993 +#: apt-pkg/contrib/fileutl.cc:1018 #, c-format msgid "Problem renaming the file %s to %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1004 +#: apt-pkg/contrib/fileutl.cc:1029 #, c-format msgid "Problem unlinking the file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1017 +#: apt-pkg/contrib/fileutl.cc:1042 msgid "Problem syncing the file" msgstr "" @@ -2275,59 +2388,59 @@ msgstr "" msgid "The package cache was built for a different architecture" msgstr "" -#: apt-pkg/pkgcache.cc:293 +#: apt-pkg/pkgcache.cc:299 msgid "Depends" msgstr "" -#: apt-pkg/pkgcache.cc:293 +#: apt-pkg/pkgcache.cc:299 msgid "PreDepends" msgstr "" -#: apt-pkg/pkgcache.cc:293 +#: apt-pkg/pkgcache.cc:299 msgid "Suggests" msgstr "" -#: apt-pkg/pkgcache.cc:294 +#: apt-pkg/pkgcache.cc:300 msgid "Recommends" msgstr "" -#: apt-pkg/pkgcache.cc:294 +#: apt-pkg/pkgcache.cc:300 msgid "Conflicts" msgstr "" -#: apt-pkg/pkgcache.cc:294 +#: apt-pkg/pkgcache.cc:300 msgid "Replaces" msgstr "" -#: apt-pkg/pkgcache.cc:295 +#: apt-pkg/pkgcache.cc:301 msgid "Obsoletes" msgstr "" -#: apt-pkg/pkgcache.cc:295 +#: apt-pkg/pkgcache.cc:301 msgid "Breaks" msgstr "" -#: apt-pkg/pkgcache.cc:295 +#: apt-pkg/pkgcache.cc:301 msgid "Enhances" msgstr "" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:312 msgid "important" msgstr "" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:312 msgid "required" msgstr "" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:312 msgid "standard" msgstr "" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:313 msgid "optional" msgstr "" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:313 msgid "extra" msgstr "" @@ -2357,17 +2470,12 @@ msgstr "" msgid "Failed to write temporary StateFile %s" msgstr "" -#: apt-pkg/depcache.cc:922 -#, c-format -msgid "Internal error, group '%s' has no installable pseudo package" -msgstr "" - -#: apt-pkg/tagfile.cc:102 +#: apt-pkg/tagfile.cc:123 #, c-format msgid "Unable to parse package file %s (1)" msgstr "" -#: apt-pkg/tagfile.cc:189 +#: apt-pkg/tagfile.cc:210 #, c-format msgid "Unable to parse package file %s (2)" msgstr "" @@ -2427,7 +2535,7 @@ msgstr "" msgid "Opening %s" msgstr "" -#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:438 +#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:444 #, c-format msgid "Line %u too long in source list %s." msgstr "" @@ -2442,14 +2550,14 @@ msgstr "" msgid "Type '%s' is not known on line %u in source list %s" msgstr "" -#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:616 +#: apt-pkg/packagemanager.cc:335 apt-pkg/packagemanager.cc:623 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:452 +#: apt-pkg/packagemanager.cc:456 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2457,7 +2565,7 @@ msgid "" "you really want to do it, activate the APT::Force-LoopBreak option." msgstr "" -#: apt-pkg/packagemanager.cc:495 +#: apt-pkg/packagemanager.cc:501 #, c-format msgid "" "Could not perform immediate configuration on already unpacked '%s'. Please " @@ -2469,25 +2577,25 @@ msgstr "" msgid "Index file type '%s' is not supported" msgstr "" -#: apt-pkg/algorithms.cc:292 +#: apt-pkg/algorithms.cc:250 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" -#: apt-pkg/algorithms.cc:1218 +#: apt-pkg/algorithms.cc:1186 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" -#: apt-pkg/algorithms.cc:1220 +#: apt-pkg/algorithms.cc:1188 msgid "Unable to correct problems, you have held broken packages." msgstr "" -#: apt-pkg/algorithms.cc:1496 apt-pkg/algorithms.cc:1498 +#: apt-pkg/algorithms.cc:1479 apt-pkg/algorithms.cc:1481 msgid "" -"Some index files failed to download, they have been ignored, or old ones " +"Some index files failed to download. They have been ignored, or old ones " "used instead." msgstr "" @@ -2528,17 +2636,17 @@ msgstr "" msgid "Method %s did not start correctly" msgstr "" -#: apt-pkg/acquire-worker.cc:413 +#: apt-pkg/acquire-worker.cc:423 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" -#: apt-pkg/init.cc:143 +#: apt-pkg/init.cc:145 #, c-format msgid "Packaging system '%s' is not supported" msgstr "" -#: apt-pkg/init.cc:159 +#: apt-pkg/init.cc:161 msgid "Unable to determine a suitable packaging system type" msgstr "" @@ -2563,17 +2671,17 @@ msgstr "" msgid "The list of sources could not be read." msgstr "" -#: apt-pkg/policy.cc:344 +#: apt-pkg/policy.cc:355 #, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "" -#: apt-pkg/policy.cc:366 +#: apt-pkg/policy.cc:377 #, c-format msgid "Did not understand pin type %s" msgstr "" -#: apt-pkg/policy.cc:374 +#: apt-pkg/policy.cc:385 msgid "No priority (or zero) specified for pin" msgstr "" @@ -2581,155 +2689,168 @@ msgstr "" msgid "Cache has an incompatible versioning system" msgstr "" -#: apt-pkg/pkgcachegen.cc:198 +#: apt-pkg/pkgcachegen.cc:187 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "" -#: apt-pkg/pkgcachegen.cc:215 +#: apt-pkg/pkgcachegen.cc:204 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:253 +#: apt-pkg/pkgcachegen.cc:242 #, c-format msgid "Error occurred while processing %s (NewFileDesc1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:285 +#: apt-pkg/pkgcachegen.cc:274 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "" -#: apt-pkg/pkgcachegen.cc:289 +#: apt-pkg/pkgcachegen.cc:278 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:306 apt-pkg/pkgcachegen.cc:316 -#: apt-pkg/pkgcachegen.cc:324 +#: apt-pkg/pkgcachegen.cc:295 apt-pkg/pkgcachegen.cc:305 +#: apt-pkg/pkgcachegen.cc:313 #, c-format msgid "Error occurred while processing %s (NewVersion%d)" msgstr "" -#: apt-pkg/pkgcachegen.cc:320 +#: apt-pkg/pkgcachegen.cc:309 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "" -#: apt-pkg/pkgcachegen.cc:353 +#: apt-pkg/pkgcachegen.cc:342 #, c-format msgid "Error occurred while processing %s (NewFileDesc2)" msgstr "" -#: apt-pkg/pkgcachegen.cc:360 +#: apt-pkg/pkgcachegen.cc:348 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:363 +#: apt-pkg/pkgcachegen.cc:351 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:366 +#: apt-pkg/pkgcachegen.cc:354 msgid "Wow, you exceeded the number of descriptions this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:369 +#: apt-pkg/pkgcachegen.cc:357 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:398 +#: apt-pkg/pkgcachegen.cc:386 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "" -#: apt-pkg/pkgcachegen.cc:412 +#: apt-pkg/pkgcachegen.cc:400 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "" -#: apt-pkg/pkgcachegen.cc:418 +#: apt-pkg/pkgcachegen.cc:406 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" -#: apt-pkg/pkgcachegen.cc:982 +#: apt-pkg/pkgcachegen.cc:960 #, c-format msgid "Couldn't stat source package list %s" msgstr "" -#: apt-pkg/pkgcachegen.cc:1087 +#: apt-pkg/pkgcachegen.cc:1065 msgid "Collecting File Provides" msgstr "" -#: apt-pkg/pkgcachegen.cc:1265 apt-pkg/pkgcachegen.cc:1272 +#: apt-pkg/pkgcachegen.cc:1243 apt-pkg/pkgcachegen.cc:1250 msgid "IO Error saving source cache" msgstr "" -#: apt-pkg/acquire-item.cc:136 +#: apt-pkg/acquire-item.cc:135 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "" -#: apt-pkg/acquire-item.cc:484 +#: apt-pkg/acquire-item.cc:636 msgid "MD5Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:746 apt-pkg/acquire-item.cc:1574 -#: apt-pkg/acquire-item.cc:1717 +#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1850 +#: apt-pkg/acquire-item.cc:1993 msgid "Hash Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:1244 +#: apt-pkg/acquire-item.cc:1388 +#, c-format +msgid "" +"Unable to find expected entry '%s' in Release file (Wrong sources.list entry " +"or malformed file)" +msgstr "" + +#: apt-pkg/acquire-item.cc:1403 +#, c-format +msgid "Unable to find hash sum for '%s' in Release file" +msgstr "" + +#: apt-pkg/acquire-item.cc:1439 msgid "There is no public key available for the following key IDs:\n" msgstr "" #. TRANSLATOR: The first %s is the URL of the bad Release file, the second is #. the time since then the file is invalid - formated in the same way as in #. the download progress display (e.g. 7d 3h 42min 1s) -#: apt-pkg/acquire-item.cc:1281 +#: apt-pkg/acquire-item.cc:1476 #, c-format msgid "Release file expired, ignoring %s (invalid since %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1302 +#: apt-pkg/acquire-item.cc:1497 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1328 +#: apt-pkg/acquire-item.cc:1530 #, c-format msgid "" "A error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" -#: apt-pkg/acquire-item.cc:1337 +#. Invalid signature file, reject (LP: #346386) (Closes: #627642) +#: apt-pkg/acquire-item.cc:1540 apt-pkg/acquire-item.cc:1545 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1365 +#: apt-pkg/acquire-item.cc:1637 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -#: apt-pkg/acquire-item.cc:1424 +#: apt-pkg/acquire-item.cc:1696 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package." msgstr "" -#: apt-pkg/acquire-item.cc:1479 +#: apt-pkg/acquire-item.cc:1755 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:1566 +#: apt-pkg/acquire-item.cc:1842 msgid "Size mismatch" msgstr "" @@ -2738,130 +2859,129 @@ msgstr "" msgid "Unable to parse Release file %s" msgstr "" -#: apt-pkg/indexrecords.cc:60 +#: apt-pkg/indexrecords.cc:63 #, c-format msgid "No sections in Release file %s" msgstr "" -#: apt-pkg/indexrecords.cc:94 +#: apt-pkg/indexrecords.cc:97 #, c-format msgid "No Hash entry in Release file %s" msgstr "" -#: apt-pkg/indexrecords.cc:107 +#: apt-pkg/indexrecords.cc:110 #, c-format msgid "Invalid 'Valid-Until' entry in Release file %s" msgstr "" -#: apt-pkg/indexrecords.cc:122 +#: apt-pkg/indexrecords.cc:125 #, c-format msgid "Invalid 'Date' entry in Release file %s" msgstr "" -#: apt-pkg/vendorlist.cc:66 +#: apt-pkg/vendorlist.cc:71 #, c-format msgid "Vendor block %s contains no fingerprint" msgstr "" -#: apt-pkg/cdrom.cc:518 +#: apt-pkg/cdrom.cc:525 #, c-format msgid "" "Using CD-ROM mount point %s\n" "Mounting CD-ROM\n" msgstr "" -#: apt-pkg/cdrom.cc:527 apt-pkg/cdrom.cc:615 +#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:631 msgid "Identifying.. " msgstr "" -#: apt-pkg/cdrom.cc:552 +#: apt-pkg/cdrom.cc:562 #, c-format msgid "Stored label: %s\n" msgstr "" -#: apt-pkg/cdrom.cc:559 apt-pkg/cdrom.cc:827 +#: apt-pkg/cdrom.cc:571 apt-pkg/cdrom.cc:847 msgid "Unmounting CD-ROM...\n" msgstr "" -#: apt-pkg/cdrom.cc:578 +#: apt-pkg/cdrom.cc:591 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "" -#: apt-pkg/cdrom.cc:596 +#: apt-pkg/cdrom.cc:609 msgid "Unmounting CD-ROM\n" msgstr "" -#: apt-pkg/cdrom.cc:600 +#: apt-pkg/cdrom.cc:614 msgid "Waiting for disc...\n" msgstr "" -#. Mount the new CDROM -#: apt-pkg/cdrom.cc:608 +#: apt-pkg/cdrom.cc:623 msgid "Mounting CD-ROM...\n" msgstr "" -#: apt-pkg/cdrom.cc:626 +#: apt-pkg/cdrom.cc:642 msgid "Scanning disc for index files..\n" msgstr "" -#: apt-pkg/cdrom.cc:666 +#: apt-pkg/cdrom.cc:684 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " "%zu signatures\n" msgstr "" -#: apt-pkg/cdrom.cc:677 +#: apt-pkg/cdrom.cc:695 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "" -#: apt-pkg/cdrom.cc:703 +#: apt-pkg/cdrom.cc:722 #, c-format msgid "Found label '%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:732 +#: apt-pkg/cdrom.cc:751 msgid "That is not a valid name, try again.\n" msgstr "" -#: apt-pkg/cdrom.cc:748 +#: apt-pkg/cdrom.cc:768 #, c-format msgid "" "This disc is called: \n" "'%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:752 +#: apt-pkg/cdrom.cc:770 msgid "Copying package lists..." msgstr "" -#: apt-pkg/cdrom.cc:778 +#: apt-pkg/cdrom.cc:797 msgid "Writing new source list\n" msgstr "" -#: apt-pkg/cdrom.cc:787 +#: apt-pkg/cdrom.cc:805 msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:908 +#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:909 #, c-format msgid "Wrote %i records.\n" msgstr "" -#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:910 +#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:911 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "" -#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:913 +#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:914 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "" -#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:916 +#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:917 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -2928,177 +3048,204 @@ msgstr "" msgid "Can't select installed version from package %s as it is not installed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:52 +#: apt-pkg/edsp.cc:32 apt-pkg/edsp.cc:52 +msgid "Send scenario to solver" +msgstr "" + +#: apt-pkg/edsp.cc:204 +msgid "Send request to solver" +msgstr "" + +#: apt-pkg/edsp.cc:272 +msgid "Prepare for receiving solution" +msgstr "" + +#: apt-pkg/edsp.cc:279 +msgid "External solver failed without a proper error message" +msgstr "" + +#: apt-pkg/edsp.cc:550 apt-pkg/edsp.cc:553 apt-pkg/edsp.cc:558 +msgid "Execute external solver" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:69 #, c-format msgid "Installing %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:823 +#: apt-pkg/deb/dpkgpm.cc:70 apt-pkg/deb/dpkgpm.cc:864 #, c-format msgid "Configuring %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:830 +#: apt-pkg/deb/dpkgpm.cc:71 apt-pkg/deb/dpkgpm.cc:871 #, c-format msgid "Removing %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:55 +#: apt-pkg/deb/dpkgpm.cc:72 #, c-format msgid "Completely removing %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:56 +#: apt-pkg/deb/dpkgpm.cc:73 #, c-format msgid "Noting disappearance of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:57 +#: apt-pkg/deb/dpkgpm.cc:74 #, c-format msgid "Running post-installation trigger %s" msgstr "" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:646 +#: apt-pkg/deb/dpkgpm.cc:670 #, c-format msgid "Directory '%s' missing" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:661 apt-pkg/deb/dpkgpm.cc:675 +#: apt-pkg/deb/dpkgpm.cc:685 apt-pkg/deb/dpkgpm.cc:705 #, c-format msgid "Could not open file '%s'" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:816 +#: apt-pkg/deb/dpkgpm.cc:857 #, c-format msgid "Preparing %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:817 +#: apt-pkg/deb/dpkgpm.cc:858 #, c-format msgid "Unpacking %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:822 +#: apt-pkg/deb/dpkgpm.cc:863 #, c-format msgid "Preparing to configure %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:824 +#: apt-pkg/deb/dpkgpm.cc:865 #, c-format msgid "Installed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:829 +#: apt-pkg/deb/dpkgpm.cc:870 #, c-format msgid "Preparing for removal of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:831 +#: apt-pkg/deb/dpkgpm.cc:872 #, c-format msgid "Removed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:836 +#: apt-pkg/deb/dpkgpm.cc:877 #, c-format msgid "Preparing to completely remove %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:837 +#: apt-pkg/deb/dpkgpm.cc:878 #, c-format msgid "Completely removed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1043 +#: apt-pkg/deb/dpkgpm.cc:1098 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1074 +#: apt-pkg/deb/dpkgpm.cc:1129 msgid "Running dpkg" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1277 +#: apt-pkg/deb/dpkgpm.cc:1354 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1282 +#: apt-pkg/deb/dpkgpm.cc:1359 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1284 +#: apt-pkg/deb/dpkgpm.cc:1361 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1290 +#: apt-pkg/deb/dpkgpm.cc:1367 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1296 +#: apt-pkg/deb/dpkgpm.cc:1373 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1303 +#: apt-pkg/deb/dpkgpm.cc:1380 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" -#: apt-pkg/deb/debsystem.cc:69 +#: apt-pkg/deb/debsystem.cc:79 #, c-format msgid "" "Unable to lock the administration directory (%s), is another process using " "it?" msgstr "" -#: apt-pkg/deb/debsystem.cc:72 +#: apt-pkg/deb/debsystem.cc:82 #, c-format msgid "Unable to lock the administration directory (%s), are you root?" msgstr "" #. TRANSLATORS: the %s contains the recovery command, usually #. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:88 +#: apt-pkg/deb/debsystem.cc:98 #, c-format msgid "" "dpkg was interrupted, you must manually run '%s' to correct the problem. " msgstr "" -#: apt-pkg/deb/debsystem.cc:106 +#: apt-pkg/deb/debsystem.cc:116 msgid "Not locked" msgstr "" #. FIXME: fallback to a default mirror here instead #. and provide a config option to define that default -#: methods/mirror.cc:200 +#: methods/mirror.cc:260 #, c-format msgid "No mirror file '%s' found " msgstr "" -#: methods/mirror.cc:343 +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:267 +#, c-format +msgid "Can not read mirror file '%s'" +msgstr "" + +#: methods/mirror.cc:422 #, c-format msgid "[Mirror: %s]" msgstr "" -#: methods/rred.cc:465 +#: methods/rred.cc:503 #, c-format msgid "" "Could not patch %s with mmap and with file operation usage - the patch seems " "to be corrupt." msgstr "" -#: methods/rred.cc:470 +#: methods/rred.cc:508 #, c-format msgid "" "Could not patch %s with mmap (but no mmap specific fail) - the patch seems " "to be corrupt." msgstr "" -#: methods/rsh.cc:329 +#: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "" @@ -1,23 +1,22 @@ # Catalan translation of APT. -# Copyright © 2002, 2003, 2004, 2005, 2006, 2008, 2009 Software in the Public Interest, Inc. +# Copyright © 2002, 2003, 2004, 2005, 2006, 2008, 2009, 2010, 2011 Software in the Public Interest, Inc. # Antoni Bella Perez <bella5@teleline.es>, 2002, 2003. # Matt Bonner <mateubonet@yahoo.com>, 2003. -# Jordi Mallach <jordi@debian.org>, 2004, 2005, 2006, 2008, 2009. +# Jordi Mallach <jordi@debian.org>, 2004, 2005, 2006, 2008, 2009, 2011. # Agustí Grau <fletxa@gmail.com>, 2010. msgid "" msgstr "" -"Project-Id-Version: apt 0.7.22\n" +"Project-Id-Version: apt 0.8.15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-02-15 06:09+0100\n" -"PO-Revision-Date: 2010-09-02 11:51+0100\n" -"Last-Translator: Agustí Grau <fletxa@gmail.com>\n" +"POT-Creation-Date: 2011-01-12 17:42+0100\n" +"PO-Revision-Date: 2011-06-16 01:41+0200\n" +"Last-Translator: Jordi Mallach <jordi@debian.org>\n" "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n" "Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Virtaal 0.6.1\n" #: cmdline/apt-cache.cc:156 #, c-format @@ -30,7 +29,7 @@ msgstr "Nombre total de paquets: " #: cmdline/apt-cache.cc:286 msgid "Total package structures: " -msgstr "Total d'estructures de paquets: " +msgstr "Nombre total d'estructures de paquets: " #: cmdline/apt-cache.cc:326 msgid " Normal packages: " @@ -54,120 +53,156 @@ msgstr " Falten: " #: cmdline/apt-cache.cc:332 msgid "Total distinct versions: " -msgstr "Total de versions diferents: " +msgstr "Nombre total de versions diferents: " #: cmdline/apt-cache.cc:334 msgid "Total distinct descriptions: " -msgstr "Total de descripcions diferents: " +msgstr "Nombre total de descripcions diferents: " #: cmdline/apt-cache.cc:336 msgid "Total dependencies: " -msgstr "Total de dependències: " +msgstr "Nombre total de dependències: " #: cmdline/apt-cache.cc:339 msgid "Total ver/file relations: " -msgstr "Total de relacions versió/fitxer: " +msgstr "Nombre total de relacions versió/fitxer: " #: cmdline/apt-cache.cc:341 msgid "Total Desc/File relations: " -msgstr "Total de relacions descripció/fitxer: " +msgstr "Nombre total de relacions descripció/fitxer: " #: cmdline/apt-cache.cc:343 msgid "Total Provides mappings: " -msgstr "Total dels mapes aportats: " +msgstr "Nombre total dels mapes aportats: " #: cmdline/apt-cache.cc:355 msgid "Total globbed strings: " -msgstr "Total de cadenes globals: " +msgstr "Nombre total de cadenes globals: " #: cmdline/apt-cache.cc:369 msgid "Total dependency version space: " -msgstr "Total de l'espai per a dependències de versió: " +msgstr "Nombre total de l'espai per a dependències de versió: " #: cmdline/apt-cache.cc:374 msgid "Total slack space: " -msgstr "Total de l'espai desperdiciat: " +msgstr "Nombre total de l'espai desperdiciat: " #: cmdline/apt-cache.cc:382 msgid "Total space accounted for: " -msgstr "Total de l'espai atribuït a: " +msgstr "Nombre total de l'espai atribuït a: " -#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1142 +#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1194 #, c-format msgid "Package file %s is out of sync." msgstr "El fitxer %s del paquet està desincronitzat." -#: cmdline/apt-cache.cc:591 cmdline/apt-cache.cc:1377 -#: cmdline/apt-cache.cc:1379 cmdline/apt-cache.cc:1456 -msgid "No packages found" -msgstr "No s'han trobat paquets" - -#: cmdline/apt-cache.cc:1221 +#: cmdline/apt-cache.cc:1273 msgid "You must give at least one search pattern" msgstr "Heu de donar com a mínim un patró de cerca" -#: cmdline/apt-cache.cc:1451 apt-pkg/cacheset.cc:440 +#: cmdline/apt-cache.cc:1429 cmdline/apt-cache.cc:1431 +#: cmdline/apt-cache.cc:1508 +msgid "No packages found" +msgstr "No s'han trobat paquets" + +#: cmdline/apt-cache.cc:1503 apt-pkg/cacheset.cc:440 #, c-format msgid "Unable to locate package %s" msgstr "No s'ha trobat el paquet %s" -#: cmdline/apt-cache.cc:1481 +#: cmdline/apt-cache.cc:1533 msgid "Package files:" msgstr "Fitxers de paquets:" -#: cmdline/apt-cache.cc:1488 cmdline/apt-cache.cc:1586 +#: cmdline/apt-cache.cc:1540 cmdline/apt-cache.cc:1638 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "Memòria cau no sincronitzada, no es pot fer x-ref a un fitxer del paquet" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1502 +#: cmdline/apt-cache.cc:1554 msgid "Pinned packages:" msgstr "Paquets etiquetats:" -#: cmdline/apt-cache.cc:1514 cmdline/apt-cache.cc:1566 +#: cmdline/apt-cache.cc:1566 cmdline/apt-cache.cc:1618 msgid "(not found)" msgstr "(no trobat)" -#: cmdline/apt-cache.cc:1523 +#: cmdline/apt-cache.cc:1575 msgid " Installed: " -msgstr " Instal·lat: " +msgstr " Instaŀlat: " -#: cmdline/apt-cache.cc:1524 +#: cmdline/apt-cache.cc:1576 msgid " Candidate: " msgstr " Candidat: " -#: cmdline/apt-cache.cc:1548 cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1600 cmdline/apt-cache.cc:1608 msgid "(none)" msgstr "(cap)" -#: cmdline/apt-cache.cc:1563 +#: cmdline/apt-cache.cc:1615 msgid " Package pin: " msgstr " Etiqueta del paquet: " #. Show the priority tables -#: cmdline/apt-cache.cc:1572 +#: cmdline/apt-cache.cc:1624 msgid " Version table:" msgstr " Taula de versió:" -#: cmdline/apt-cache.cc:1686 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1738 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589 -#: cmdline/apt-get.cc:3047 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2793 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s per a %s compilat el %s %s\n" -#: cmdline/apt-cache.cc:1693 +#: cmdline/apt-cache.cc:1745 #, fuzzy +#| msgid "" +#| "Usage: apt-cache [options] command\n" +#| " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" +#| " apt-cache [options] showsrc pkg1 [pkg2 ...]\n" +#| "\n" +#| "apt-cache is a low-level tool used to query information\n" +#| "from APT's binary cache files\n" +#| "\n" +#| "Commands:\n" +#| " gencaches - Build both the package and source cache\n" +#| " showpkg - Show some general information for a single package\n" +#| " showsrc - Show source records\n" +#| " stats - Show some basic statistics\n" +#| " dump - Show the entire file in a terse form\n" +#| " dumpavail - Print an available file to stdout\n" +#| " unmet - Show unmet dependencies\n" +#| " search - Search the package list for a regex pattern\n" +#| " show - Show a readable record for the package\n" +#| " depends - Show raw dependency information for a package\n" +#| " rdepends - Show reverse dependency information for a package\n" +#| " pkgnames - List the names of all packages in the system\n" +#| " dotty - Generate package graphs for GraphViz\n" +#| " xvcg - Generate package graphs for xvcg\n" +#| " policy - Show policy settings\n" +#| "\n" +#| "Options:\n" +#| " -h This help text.\n" +#| " -p=? The package cache.\n" +#| " -s=? The source cache.\n" +#| " -q Disable progress indicator.\n" +#| " -i Show only important deps for the unmet command.\n" +#| " -c=? Read this configuration file\n" +#| " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#| "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" msgid "" "Usage: apt-cache [options] command\n" +" apt-cache [options] add file1 [file2 ...]\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" " apt-cache [options] showsrc pkg1 [pkg2 ...]\n" "\n" -"apt-cache is a low-level tool used to query information\n" -"from APT's binary cache files\n" +"apt-cache is a low-level tool used to manipulate APT's binary\n" +"cache files, and query information from them\n" "\n" "Commands:\n" +" add - Add a package file to the source cache\n" " gencaches - Build both the package and source cache\n" " showpkg - Show some general information for a single package\n" " showsrc - Show source records\n" @@ -196,41 +231,39 @@ msgid "" "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" msgstr "" "Forma d'ús: apt-cache [opcions] ordre\n" -" apt-cache [opcions] add fitxer1 [fitxer2 ...]\n" -" apt-cache [opcions] showpkg paquet1 [paquet2 ...]\n" -" apt-cache [opcions] showsrc paquet1 [paquet2 ...]\n" +" apt-cache [opcions] add fitxer1 [fitxer2 …]\n" +" apt-cache [opcions] showpkg paquet1 [paquet2 …]\n" +" apt-cache [opcions] showsrc paquet1 [paquet2 …]\n" "\n" -"apt-cache és una eina usada per a manipular fitxers binaris en\n" -"el cau d'APT, i així poder consultar-ne la informació\n" +"apt-cache és una eina de baix nivell emprada per consultar\n" +"la informació dels fitxers binaris de memòria cau de l'APT.\n" "\n" "Ordres:\n" -" add - Afegeix un fitxer de paquet a la memòria cau de les fonts\n" -" gencaches - Crea la memòria cau de tots dos, paquet i font\n" -" showpkg - Mostra alguna informació general d'un sol paquet\n" -" showsrc - Mostra un registre de les fonts\n" +" gencaches - Crea la memòria cau de paquets i fonts\n" +" showpkg - Mostra informació general d'un sol paquet\n" +" showsrc - Mostra un registre d'un paquet font\n" " stats - Mostra algunes estadístiques bàsiques\n" " dump - Mostra el fitxer sencer en un format concís\n" -" dumpavail - Genera un registre llegible a stdout\n" +" dumpavail - Imprimeix un fitxer «available» per sortida estàndard\n" " unmet - Mostra dependències sense satisfer\n" -" search - Cerca en la llista de paquets per un patró d'expressió regular\n" -" show - Mostra un registre llegible pel paquet \n" -" showauto - Mostra una llista de paquets instal·lats automàticanent\n" +" search - Cerca un patró d'expressió regular a la llista de paquets\n" +" show - Mostra un registre llegible pel paquet\n" " depends - Mostra informació de dependències (en cru) d'un paquet\n" -" rdepends - Mostra informació de dependències enrere d'un paquet\n" +" rdepends - Mostra informació de dependències inverses d'un paquet\n" " pkgnames - Llista els noms de tots els paquets del sistema\n" -" dotty - Genera gràfiques del paquet per a GraphViz\n" -" xvcg - Genera gràfiques del paquet per a xvcg\n" +" dotty - Genera gràfiques de paquets per al GraphViz\n" +" xvcg - Genera gràfiques de paquets per al xvcg\n" " policy - Mostra la configuració de política\n" "\n" "Opcions:\n" " -h Aquest text d'ajuda.\n" " -p=? La memòria cau de paquets.\n" " -s=? La memòria cau de la font.\n" -" -q Inhabilita l'indicatiu de progres.\n" -" -i Només mostra dependències importants d'una ordre inadequada.\n" -" -c=? Llegeix aquest fitxer de configuració\n" -" -o=? Estableix una opció de conf arbitrària, p.ex. -o dir::cache=/tmp\n" -"Consulteu les pàgines del manual apt-cache(8) i apt.conf(5) per a més " +" -q Inhabilita l'indicador de progrés.\n" +" -i Només mostra dependències importants amb l'opció «unmet».\n" +" -c=? Llegeix aquest fitxer de configuració.\n" +" -o=? Estableix una opció de conf arbitrària, p. ex. -o dir::cache=/tmp\n" +"Vegeu les pàgines de manual apt-cache(8) i apt.conf(5) per a més " "informació.\n" #: cmdline/apt-cdrom.cc:77 @@ -271,7 +304,7 @@ msgid "" msgstr "" "Forma d'ús: apt-config [opcions] ordre\n" "\n" -"apt-config és una simple eina per a llegir el fitxer de configuració d'APT\n" +"apt-config és una eina simple per llegir el fitxer de configuració d'APT\n" "\n" "Ordres:\n" " shell - Mode shell\n" @@ -280,7 +313,7 @@ msgstr "" "Opcions:\n" " -h Aquest text d'ajuda.\n" " -c=? Llegeix aquest fitxer de configuració\n" -" -o=? Estableix una opció de conf arbitrària, p.ex. -o dir::cache=/tmp\n" +" -o=? Estableix una opció de conf arbitrària, p. ex. -o dir::cache=/tmp\n" #: cmdline/apt-extracttemplates.cc:98 #, c-format @@ -300,7 +333,7 @@ msgid "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Forma d'ús: apt-extracttemplates fitxer1 [fitxer2 ...]\n" +"Forma d'ús: apt-extracttemplates fitxer1 [fitxer2 …]\n" "\n" "apt-extracttemplates és una eina per a extreure informació de\n" "configuració i plantilles dels paquets debian\n" @@ -311,14 +344,14 @@ msgstr "" " -c=? Llegeix aquest fitxer de configuració\n" " -o=? Estableix una opció de conf arbitrària, p.e. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1175 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1171 #, c-format msgid "Unable to write to %s" msgstr "No es pot escriure en %s" #: cmdline/apt-extracttemplates.cc:309 msgid "Cannot get debconf version. Is debconf installed?" -msgstr "No es pot determinar la versió de debconf. Està instal·lat debconf?" +msgstr "No es pot determinar la versió de debconf. Està instaŀlat debconf?" #: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:347 msgid "Package extension list is too long" @@ -667,16 +700,16 @@ msgstr "Els següents paquets tenen dependències sense satisfer:" #: cmdline/apt-get.cc:342 #, c-format msgid "but %s is installed" -msgstr "però està instal·lat %s" +msgstr "però està instaŀlat %s" #: cmdline/apt-get.cc:344 #, c-format msgid "but %s is to be installed" -msgstr "però s'instal·larà %s" +msgstr "però s'instaŀlarà %s" #: cmdline/apt-get.cc:351 msgid "but it is not installable" -msgstr "però no és instal·lable" +msgstr "però no és instaŀlable" #: cmdline/apt-get.cc:353 msgid "but it is a virtual package" @@ -684,11 +717,11 @@ msgstr "però és un paquet virtual" #: cmdline/apt-get.cc:356 msgid "but it is not installed" -msgstr "però no està instal·lat" +msgstr "però no està instaŀlat" #: cmdline/apt-get.cc:356 msgid "but it is not going to be installed" -msgstr "però no serà instal·lat" +msgstr "però no serà instaŀlat" #: cmdline/apt-get.cc:361 msgid " or" @@ -696,7 +729,7 @@ msgstr " o" #: cmdline/apt-get.cc:392 msgid "The following NEW packages will be installed:" -msgstr "S'instal·laran els paquets NOUS següents:" +msgstr "S'instaŀlaran els paquets NOUS següents:" #: cmdline/apt-get.cc:420 msgid "The following packages will be REMOVED:" @@ -734,12 +767,12 @@ msgstr "" #: cmdline/apt-get.cc:605 #, c-format msgid "%lu upgraded, %lu newly installed, " -msgstr "%lu actualitzats, %lu nous a instal·lar, " +msgstr "%lu actualitzats, %lu nous a instaŀlar, " #: cmdline/apt-get.cc:609 #, c-format msgid "%lu reinstalled, " -msgstr "%lu reinstal·lats, " +msgstr "%lu reinstaŀlats, " #: cmdline/apt-get.cc:611 #, c-format @@ -754,7 +787,7 @@ msgstr "%lu a suprimir i %lu no actualitzats.\n" #: cmdline/apt-get.cc:617 #, c-format msgid "%lu not fully installed or removed.\n" -msgstr "%lu no instal·lats o suprimits completament.\n" +msgstr "%lu no instaŀlats o suprimits completament.\n" #: cmdline/apt-get.cc:639 #, c-format @@ -773,7 +806,7 @@ msgstr "El paquet %s és un paquet virtual proveït per:\n" #: cmdline/apt-get.cc:673 msgid " [Installed]" -msgstr " [Instal·lat]" +msgstr " [Instaŀlat]" #: cmdline/apt-get.cc:682 msgid " [Not candidate version]" @@ -781,7 +814,7 @@ msgstr "[Versió no candidata]" #: cmdline/apt-get.cc:684 msgid "You should explicitly select one to install." -msgstr "Necessiteu seleccionar-ne un explícitament per a instal·lar-lo." +msgstr "Necessiteu seleccionar-ne un explícitament per a instaŀlar-lo." #: cmdline/apt-get.cc:687 #, c-format @@ -801,44 +834,44 @@ msgstr "Tot i que els següents paquets el reemplacen:" #: cmdline/apt-get.cc:717 #, c-format msgid "Package '%s' has no installation candidate" -msgstr "El paquet '%s' no té candidat d'instal·lació" +msgstr "El paquet «%s» no té candidat d'instaŀlació" #: cmdline/apt-get.cc:728 #, c-format msgid "Virtual packages like '%s' can't be removed\n" -msgstr "Els paquets virtuals com '%s' no poden ser esborrats\n" +msgstr "Els paquets virtuals com «%s» no poden ser esborrats\n" #: cmdline/apt-get.cc:759 #, c-format msgid "Note, selecting '%s' instead of '%s'\n" -msgstr "Nota: s'està seleccionant '%s' en comptes de '%s'\n" +msgstr "Nota: s'està seleccionant «%s» en lloc de «%s»\n" #: cmdline/apt-get.cc:789 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" -"S'està ometent %s, ja està instal·lat i l'actualització no està establerta.\n" +"S'està ometent %s, ja està instaŀlat i l'actualització no està establerta.\n" #: cmdline/apt-get.cc:793 #, c-format msgid "Skipping %s, it is not installed and only upgrades are requested.\n" msgstr "" -"S'està ometent '%s', no està instal·lat i només es demana l'actualització.\n" +"S'està ometent '%s', no està instaŀlat i només es demana l'actualització.\n" #: cmdline/apt-get.cc:803 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" -msgstr "No es possible la reinstal·lació del paquet %s, no es pot baixar.\n" +msgstr "No es possible la reinstaŀlació del paquet %s, no es pot baixar.\n" #: cmdline/apt-get.cc:808 #, c-format msgid "%s is already the newest version.\n" msgstr "%s ja es troba en la versió més recent.\n" -#: cmdline/apt-get.cc:827 cmdline/apt-get.cc:2024 +#: cmdline/apt-get.cc:827 cmdline/apt-get.cc:2027 #, c-format msgid "%s set to manually installed.\n" -msgstr "S'ha marcat %s com instal·lat manualment.\n" +msgstr "S'ha marcat %s com instaŀlat manualment.\n" #: cmdline/apt-get.cc:853 #, c-format @@ -846,100 +879,100 @@ msgid "Selected version '%s' (%s) for '%s'\n" msgstr "Versió seleccionada '%s' (%s) per a '%s'\n" #: cmdline/apt-get.cc:858 -#, fuzzy, c-format +#, c-format msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" -msgstr "Versió seleccionada '%s' (%s) per a '%s'\n" +msgstr "Versió seleccionada «%s» (%s) per a «%s» degut a «%s»\n" -#: cmdline/apt-get.cc:899 +#: cmdline/apt-get.cc:898 #, c-format msgid "Package %s is not installed, so not removed\n" -msgstr "El paquet %s no està instal·lat, així doncs no es suprimirà\n" +msgstr "El paquet %s no està instaŀlat, així doncs no es suprimirà\n" -#: cmdline/apt-get.cc:977 +#: cmdline/apt-get.cc:973 msgid "Correcting dependencies..." -msgstr "S'estan corregint les dependències..." +msgstr "S'estan corregint les dependències…" -#: cmdline/apt-get.cc:980 +#: cmdline/apt-get.cc:976 msgid " failed." msgstr " ha fallat." -#: cmdline/apt-get.cc:983 +#: cmdline/apt-get.cc:979 msgid "Unable to correct dependencies" msgstr "No es poden corregir les dependències" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:982 msgid "Unable to minimize the upgrade set" msgstr "No es pot minimitzar el joc de versions revisades" -#: cmdline/apt-get.cc:988 +#: cmdline/apt-get.cc:984 msgid " Done" msgstr " Fet" -#: cmdline/apt-get.cc:992 +#: cmdline/apt-get.cc:988 msgid "You might want to run 'apt-get -f install' to correct these." -msgstr "Potser voldreu executar 'apt-get -f install' per a corregir-ho." +msgstr "Potser voldreu executar «apt-get -f install» per a corregir-ho." -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:991 msgid "Unmet dependencies. Try using -f." msgstr "Dependències sense satisfer. Proveu-ho emprant -f." -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1016 msgid "WARNING: The following packages cannot be authenticated!" msgstr "AVÍS: No es poden autenticar els següents paquets!" -#: cmdline/apt-get.cc:1024 +#: cmdline/apt-get.cc:1020 msgid "Authentication warning overridden.\n" msgstr "S'ha descartat l'avís d'autenticació.\n" -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1027 msgid "Install these packages without verification [y/N]? " -msgstr "Voleu instal·lar aquests paquets sense verificar-los [s/N]? " +msgstr "Voleu instaŀlar aquests paquets sense verificar-los [s/N]? " -#: cmdline/apt-get.cc:1033 +#: cmdline/apt-get.cc:1029 msgid "Some packages could not be authenticated" msgstr "No s'ha pogut autenticar alguns paquets" -#: cmdline/apt-get.cc:1042 cmdline/apt-get.cc:1203 +#: cmdline/apt-get.cc:1038 cmdline/apt-get.cc:1199 msgid "There are problems and -y was used without --force-yes" msgstr "Hi ha problemes i s'ha emprat -y sense --force-yes" -#: cmdline/apt-get.cc:1083 +#: cmdline/apt-get.cc:1079 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" "S'ha produït un error intern, s'ha cridat a InstallPackages amb paquets " "trencats!" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1088 msgid "Packages need to be removed but remove is disabled." msgstr "" "Els paquets necessiten ser suprimits però s'ha inhabilitat la supressió." -#: cmdline/apt-get.cc:1103 +#: cmdline/apt-get.cc:1099 msgid "Internal error, Ordering didn't finish" msgstr "S'ha produït un error intern, l'ordenació no ha acabat" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1137 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" -"Què estrany... les mides no coincideixen, informeu a apt@packages.debian.org" +"Què estrany… les mides no coincideixen, informeu a apt@packages.debian.org" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1148 +#: cmdline/apt-get.cc:1144 #, c-format msgid "Need to get %sB/%sB of archives.\n" -msgstr "Es necessita obtenir %sB/%sB d'arxius.\n" +msgstr "S'ha d'obtenir %sB/%sB d'arxius.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1153 +#: cmdline/apt-get.cc:1149 #, c-format msgid "Need to get %sB of archives.\n" -msgstr "Es necessita obtenir %sB d'arxius.\n" +msgstr "S'ha d'obtenir %sB d'arxius.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1160 +#: cmdline/apt-get.cc:1156 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "" @@ -947,31 +980,31 @@ msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1165 +#: cmdline/apt-get.cc:1161 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "Després d'aquesta operació s'alliberaran %sB d'espai en disc.\n" -#: cmdline/apt-get.cc:1180 cmdline/apt-get.cc:1183 cmdline/apt-get.cc:2428 -#: cmdline/apt-get.cc:2431 +#: cmdline/apt-get.cc:1176 cmdline/apt-get.cc:1179 cmdline/apt-get.cc:2367 +#: cmdline/apt-get.cc:2370 #, c-format msgid "Couldn't determine free space in %s" msgstr "No s'ha pogut determinar l'espai lliure en %s" -#: cmdline/apt-get.cc:1193 +#: cmdline/apt-get.cc:1189 #, c-format msgid "You don't have enough free space in %s." msgstr "No teniu prou espai lliure en %s." -#: cmdline/apt-get.cc:1209 cmdline/apt-get.cc:1229 +#: cmdline/apt-get.cc:1205 cmdline/apt-get.cc:1225 msgid "Trivial Only specified but this is not a trivial operation." -msgstr "Es va especificar Trivial Only però aquesta operació no és trivial." +msgstr "S'ha especificat «Trivial Only» però aquesta operació no és trivial." -#: cmdline/apt-get.cc:1211 +#: cmdline/apt-get.cc:1207 msgid "Yes, do as I say!" msgstr "Sí, fes el que et dic!" -#: cmdline/apt-get.cc:1213 +#: cmdline/apt-get.cc:1209 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -979,31 +1012,31 @@ msgid "" " ?] " msgstr "" "Esteu a punt de fer quelcom potencialment nociu.\n" -"Per a continuar escriviu la frase «%s»\n" +"Per continuar escriviu la frase «%s»\n" " ?] " -#: cmdline/apt-get.cc:1219 cmdline/apt-get.cc:1238 +#: cmdline/apt-get.cc:1215 cmdline/apt-get.cc:1234 msgid "Abort." msgstr "Avortat." -#: cmdline/apt-get.cc:1234 +#: cmdline/apt-get.cc:1230 msgid "Do you want to continue [Y/n]? " msgstr "Voleu continuar [S/n]? " -#: cmdline/apt-get.cc:1306 cmdline/apt-get.cc:2488 apt-pkg/algorithms.cc:1491 +#: cmdline/apt-get.cc:1302 cmdline/apt-get.cc:2427 apt-pkg/algorithms.cc:1470 #, c-format msgid "Failed to fetch %s %s\n" msgstr "No s'ha pogut obtenir %s %s\n" -#: cmdline/apt-get.cc:1324 +#: cmdline/apt-get.cc:1320 msgid "Some files failed to download" msgstr "Alguns fitxers no s'han pogut baixar" -#: cmdline/apt-get.cc:1325 cmdline/apt-get.cc:2497 +#: cmdline/apt-get.cc:1321 cmdline/apt-get.cc:2436 msgid "Download complete and in download only mode" -msgstr "Descàrrega completa i en mode de només descàrrega" +msgstr "Baixada completa i en mode de només baixada" -#: cmdline/apt-get.cc:1331 +#: cmdline/apt-get.cc:1327 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -1011,19 +1044,19 @@ msgstr "" "No es poden baixar alguns arxius, proveu a executar apt-get update o " "intenteu-ho amb --fix-missing." -#: cmdline/apt-get.cc:1335 +#: cmdline/apt-get.cc:1331 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing i els medi intercanviables actualment no estan suportats" -#: cmdline/apt-get.cc:1340 +#: cmdline/apt-get.cc:1336 msgid "Unable to correct missing packages." msgstr "No es poden corregir els paquets que falten." -#: cmdline/apt-get.cc:1341 +#: cmdline/apt-get.cc:1337 msgid "Aborting install." -msgstr "S'està avortant la instal·lació." +msgstr "S'està avortant la instaŀlació." -#: cmdline/apt-get.cc:1369 +#: cmdline/apt-get.cc:1365 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -1037,37 +1070,37 @@ msgstr[1] "" "Els següents paquets han desaparegut del vostre sistema ja\n" "que tots els fitxers s'han sobreescrit per altres paquets:" -#: cmdline/apt-get.cc:1373 +#: cmdline/apt-get.cc:1369 msgid "Note: This is done automatic and on purpose by dpkg." -msgstr "Nota: Això es realitzarà automàticament a propòsit del dpkg." +msgstr "Nota: Això ho fa el dpkg automàticament i a propòsit." -#: cmdline/apt-get.cc:1503 +#: cmdline/apt-get.cc:1499 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" -msgstr "Ignorar la versió objectiu '%s' no disponible del paquet '%s'" +msgstr "Ignora la versió objectiu «%s» no disponible del paquet «%s»" -#: cmdline/apt-get.cc:1535 +#: cmdline/apt-get.cc:1531 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" -msgstr "S'està agafant '%s' com a paquet font en comptes de '%s'\n" +msgstr "S'està agafant «%s» com a paquet font en lloc de '%s'\n" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1573 +#: cmdline/apt-get.cc:1569 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "Ignorar la versió '%s' no disponible del paquet '%s'" +msgstr "Descarta la versió «%s» no disponible del paquet «%s»" -#: cmdline/apt-get.cc:1589 +#: cmdline/apt-get.cc:1585 msgid "The update command takes no arguments" msgstr "L'ordre update no pren arguments" -#: cmdline/apt-get.cc:1651 +#: cmdline/apt-get.cc:1647 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" "Es suposa que no hauriem de suprimir coses, no es pot iniciar el supressor " "automàtic" -#: cmdline/apt-get.cc:1703 +#: cmdline/apt-get.cc:1699 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1085,226 +1118,221 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1706 cmdline/apt-get.cc:1855 +#: cmdline/apt-get.cc:1702 cmdline/apt-get.cc:1858 msgid "The following information may help to resolve the situation:" msgstr "La informació següent pot ajudar-vos a resoldre la situació:" -#: cmdline/apt-get.cc:1710 +#: cmdline/apt-get.cc:1706 msgid "Internal Error, AutoRemover broke stuff" msgstr "S'ha produït un error intern, el supressor automàtic ha trencat coses" -#: cmdline/apt-get.cc:1717 +#: cmdline/apt-get.cc:1713 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" "The following packages were automatically installed and are no longer " "required:" msgstr[0] "" -"El paquet següent s'ha instal·lat automàticament i ja no serà necessari:" +"El paquet següent s'ha instaŀlat automàticament i ja no serà necessari:" msgstr[1] "" -"Els paquets següents s'han instal·lat automàticament i ja no són necessaris:" +"Els paquets següents s'han instaŀlat automàticament i ja no són necessaris:" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1717 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" "%lu packages were automatically installed and are no longer required.\n" msgstr[0] "" -"El paquet %lu es va instal·lar automàticament i ja no és necessari:\n" +"El paquet %lu es va instaŀlar automàticament i ja no és necessari:\n" msgstr[1] "" -"Els paquets %lu es van s'instal·lar automàticament i ja no són necessaris:\n" +"Els paquets %lu es van s'instaŀlar automàticament i ja no són necessaris:\n" -#: cmdline/apt-get.cc:1723 +#: cmdline/apt-get.cc:1719 msgid "Use 'apt-get autoremove' to remove them." msgstr "Empreu «apt-get autoremove» per a suprimir-los." -#: cmdline/apt-get.cc:1742 +#: cmdline/apt-get.cc:1738 msgid "Internal error, AllUpgrade broke stuff" msgstr "Error intern, AllUpgrade ha trencat coses" -#: cmdline/apt-get.cc:1825 +#: cmdline/apt-get.cc:1828 msgid "You might want to run 'apt-get -f install' to correct these:" -msgstr "Potser voldreu executar 'apt-get -f install' per a corregir-ho:" +msgstr "Potser voldreu executar «apt-get -f install» per corregir-ho:" -#: cmdline/apt-get.cc:1828 +#: cmdline/apt-get.cc:1831 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -"Dependències insatisfetes. Intenteu 'apt-get -f install' sense paquets (o " +"Dependències insatisfetes. Proveu amb «apt-get -f install» sense paquets (o " "especifiqueu una solució)." -#: cmdline/apt-get.cc:1840 +#: cmdline/apt-get.cc:1843 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" "distribution that some required packages have not yet been created\n" "or been moved out of Incoming." msgstr "" -"No s'han pogut instal·lar alguns paquets. Això pot ser degut a que vàreu\n" -"requerir una situació imposible o a que esteu emprant la distribució\n" -"unstable i alguns paquets requerits encara no han estat creats o bé\n" -"encara no els hi han afegit." +"No s'han pogut instaŀlar alguns paquets. Això pot ser degut a que heu\n" +"demanat una situació impossible o que esteu emprant la distribució\n" +"«unstable» i alguns paquets requerits encara no han estat creats o bé\n" +"encara no els hi han introduït des d'«Incoming»." -#: cmdline/apt-get.cc:1858 +#: cmdline/apt-get.cc:1861 msgid "Broken packages" msgstr "Paquets trencats" -#: cmdline/apt-get.cc:1886 +#: cmdline/apt-get.cc:1889 msgid "The following extra packages will be installed:" -msgstr "S'instal·laran els següents paquets extres:" +msgstr "S'instaŀlaran els següents paquets extres:" -#: cmdline/apt-get.cc:1976 +#: cmdline/apt-get.cc:1979 msgid "Suggested packages:" msgstr "Paquets suggerits:" -#: cmdline/apt-get.cc:1977 +#: cmdline/apt-get.cc:1980 msgid "Recommended packages:" msgstr "Paquets recomanats:" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2022 #, c-format msgid "Couldn't find package %s" msgstr "No s'ha pogut trobar el paquet %s" -#: cmdline/apt-get.cc:2026 +#: cmdline/apt-get.cc:2029 #, c-format msgid "%s set to automatically installed.\n" -msgstr "S'ha marcat %s com instal·lat automàticament.\n" +msgstr "S'ha marcat %s com instaŀlat automàticament.\n" -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2050 msgid "Calculating upgrade... " -msgstr "S'està calculant l'actualització... " +msgstr "S'està calculant l'actualització… " -#: cmdline/apt-get.cc:2050 methods/ftp.cc:707 methods/connect.cc:111 +#: cmdline/apt-get.cc:2053 methods/ftp.cc:707 methods/connect.cc:111 msgid "Failed" msgstr "Ha fallat" -#: cmdline/apt-get.cc:2055 +#: cmdline/apt-get.cc:2058 msgid "Done" msgstr "Fet" -#: cmdline/apt-get.cc:2122 cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2125 cmdline/apt-get.cc:2133 msgid "Internal error, problem resolver broke stuff" msgstr "" "S'ha produït un error intern, el solucionador de problemes ha trencat coses" -#: cmdline/apt-get.cc:2154 cmdline/apt-get.cc:2187 +#: cmdline/apt-get.cc:2157 cmdline/apt-get.cc:2190 msgid "Unable to lock the download directory" msgstr "No és possible blocar el directori de descàrrega" -#: cmdline/apt-get.cc:2238 -#, c-format -msgid "Downloading %s %s" -msgstr "" - -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2233 msgid "Must specify at least one package to fetch source for" msgstr "Haureu d'especificar un paquet de codi font per a baixar" -#: cmdline/apt-get.cc:2334 cmdline/apt-get.cc:2615 +#: cmdline/apt-get.cc:2273 cmdline/apt-get.cc:2554 #, c-format msgid "Unable to find a source package for %s" msgstr "No es pot trobar un paquet de fonts per a %s" -#: cmdline/apt-get.cc:2350 +#: cmdline/apt-get.cc:2289 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -"Avís: L'empaquetat '%s' és mantingut pel sistema de control de versions '%s' " -"a:\n" +"Avís: L'empaquetat de «%s» és mantingut amb el sistema de control de\n" +"versions «%s» a:\n" "%s\n" -#: cmdline/apt-get.cc:2355 +#: cmdline/apt-get.cc:2294 #, c-format msgid "" "Please use:\n" "bzr get %s\n" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -"Utilitzeu:\n" +"Empreu:\n" "bzr get %s\n" -"per a recuperar les últimes actualitzacions (possiblement inèdites) del " +"per a obtenir les últimes actualitzacions (possiblement no publicades) del " "paquet.\n" -#: cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:2345 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "S'està ometent el fitxer ja baixat «%s»\n" -#: cmdline/apt-get.cc:2441 +#: cmdline/apt-get.cc:2380 #, c-format msgid "You don't have enough free space in %s" msgstr "No teniu prou espai lliure en %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2388 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Es necessita baixar %sB/%sB d'arxius font.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2454 +#: cmdline/apt-get.cc:2393 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Es necessita baixar %sB d'arxius font.\n" -#: cmdline/apt-get.cc:2460 +#: cmdline/apt-get.cc:2399 #, c-format msgid "Fetch source %s\n" -msgstr "Obté el font %s\n" +msgstr "Obtén el font %s\n" -#: cmdline/apt-get.cc:2493 +#: cmdline/apt-get.cc:2432 msgid "Failed to fetch some archives." msgstr "No s'ha pogut baixar alguns arxius." -#: cmdline/apt-get.cc:2523 +#: cmdline/apt-get.cc:2462 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "S'està ometent el desempaquetament de les fonts que ja ho estan en %s\n" -#: cmdline/apt-get.cc:2535 +#: cmdline/apt-get.cc:2474 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "L'ordre de desempaquetar «%s» ha fallat.\n" -#: cmdline/apt-get.cc:2536 +#: cmdline/apt-get.cc:2475 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" -msgstr "Comproveu si el paquet «dpkgdev» està instal·lat.\n" +msgstr "Comproveu si el paquet «dpkgdev» està instaŀlat.\n" -#: cmdline/apt-get.cc:2553 +#: cmdline/apt-get.cc:2492 #, c-format msgid "Build command '%s' failed.\n" msgstr "L'ordre de construir «%s» ha fallat.\n" -#: cmdline/apt-get.cc:2573 +#: cmdline/apt-get.cc:2512 msgid "Child process failed" msgstr "Ha fallat el procés fill" -#: cmdline/apt-get.cc:2589 +#: cmdline/apt-get.cc:2528 msgid "Must specify at least one package to check builddeps for" msgstr "" "S'ha d'especificar un paquet per a verificar les dependències de construcció " "per a" -#: cmdline/apt-get.cc:2620 +#: cmdline/apt-get.cc:2559 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" "No es pot obtenir informació sobre les dependències de construcció per a %s" -#: cmdline/apt-get.cc:2640 +#: cmdline/apt-get.cc:2579 #, c-format msgid "%s has no build depends.\n" msgstr "%s no té dependències de construcció.\n" -#: cmdline/apt-get.cc:2691 +#: cmdline/apt-get.cc:2630 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1313,7 +1341,7 @@ msgstr "" "La dependència %s en %s no es pot satisfer per que no es pot trobar el " "paquet %s" -#: cmdline/apt-get.cc:2744 +#: cmdline/apt-get.cc:2683 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1322,38 +1350,76 @@ msgstr "" "La dependència %s per a %s no es pot satisfer per que cap versió del paquet " "%s pot satisfer els requeriments de versions" -#: cmdline/apt-get.cc:2780 +#: cmdline/apt-get.cc:2719 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -"No s'ha pogut satisfer la dependència %s per a %s: El paquet instal·lat %s " -"és massa nou" +"No s'ha pogut satisfer la dependència %s per a %s: El paquet instaŀlat %s és " +"massa nou" -#: cmdline/apt-get.cc:2807 +#: cmdline/apt-get.cc:2746 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "No s'ha pogut satisfer la dependència %s per a %s: %s" -#: cmdline/apt-get.cc:2823 +#: cmdline/apt-get.cc:2762 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "No s'han pogut satisfer les dependències de construcció per a %s" -#: cmdline/apt-get.cc:2828 +#: cmdline/apt-get.cc:2767 msgid "Failed to process build dependencies" msgstr "No es poden processar les dependències de construcció" -#: cmdline/apt-get.cc:2921 cmdline/apt-get.cc:2933 -#, fuzzy, c-format -msgid "Changelog for %s (%s)" -msgstr "S'està connectant amb %s (%s)" - -#: cmdline/apt-get.cc:3052 +#: cmdline/apt-get.cc:2798 msgid "Supported modules:" msgstr "Mòduls suportats:" -#: cmdline/apt-get.cc:3093 +#: cmdline/apt-get.cc:2839 #, fuzzy +#| msgid "" +#| "Usage: apt-get [options] command\n" +#| " apt-get [options] install|remove pkg1 [pkg2 ...]\n" +#| " apt-get [options] source pkg1 [pkg2 ...]\n" +#| "\n" +#| "apt-get is a simple command line interface for downloading and\n" +#| "installing packages. The most frequently used commands are update\n" +#| "and install.\n" +#| "\n" +#| "Commands:\n" +#| " update - Retrieve new lists of packages\n" +#| " upgrade - Perform an upgrade\n" +#| " install - Install new packages (pkg is libc6 not libc6.deb)\n" +#| " remove - Remove packages\n" +#| " autoremove - Remove automatically all unused packages\n" +#| " purge - Remove packages and config files\n" +#| " source - Download source archives\n" +#| " build-dep - Configure build-dependencies for source packages\n" +#| " dist-upgrade - Distribution upgrade, see apt-get(8)\n" +#| " dselect-upgrade - Follow dselect selections\n" +#| " clean - Erase downloaded archive files\n" +#| " autoclean - Erase old downloaded archive files\n" +#| " check - Verify that there are no broken dependencies\n" +#| " changelog - Download and display the changelog for the given package\n" +#| " download - Download the binary package into the current directory\n" +#| "\n" +#| "Options:\n" +#| " -h This help text.\n" +#| " -q Loggable output - no progress indicator\n" +#| " -qq No output except for errors\n" +#| " -d Download only - do NOT install or unpack archives\n" +#| " -s No-act. Perform ordering simulation\n" +#| " -y Assume Yes to all queries and do not prompt\n" +#| " -f Attempt to correct a system with broken dependencies in place\n" +#| " -m Attempt to continue if archives are unlocatable\n" +#| " -u Show a list of upgraded packages as well\n" +#| " -b Build the source package after fetching it\n" +#| " -V Show verbose version numbers\n" +#| " -c=? Read this configuration file\n" +#| " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#| "See the apt-get(8), sources.list(5) and apt.conf(5) manual\n" +#| "pages for more information and options.\n" +#| " This APT has Super Cow Powers.\n" msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1379,8 +1445,6 @@ msgid "" " check - Verify that there are no broken dependencies\n" " markauto - Mark the given packages as automatically installed\n" " unmarkauto - Mark the given packages as manually installed\n" -" changelog - Download and display the changelog for the given package\n" -" download - Download the binary package into the current directory\n" "\n" "Options:\n" " -h This help text.\n" @@ -1401,17 +1465,17 @@ msgid "" " This APT has Super Cow Powers.\n" msgstr "" "Forma d'ús: apt-get [opcions] ordre\n" -" apt-get [opcions] install|remove paq1 [paq2 ...]\n" -" apt-get [opcions] source paq1 [paq2 ...]\n" +" apt-get [opcions] install|remove paq1 [paq2 …]\n" +" apt-get [opcions] source paq1 [paq2 …]\n" "\n" -"apt-get és una simple interfície de línia d'ordres per a\n" -"baixar i instal·lar paquets. Les ordres més freqüents\n" -"són update i install.\n" +"apt-get és una interfície de línia d'ordres simple per\n" +"baixar i instaŀlar paquets. Les ordres més freqüents són\n" +"«update» i «install».\n" "\n" "Ordres:\n" -" update - Obté llistes noves dels paquets\n" +" update - Obtén llistes noves dels paquets\n" " upgrade - Realitza una actualització\n" -" install - Instal·la nous paquets (el paquet és libc6 no libc6.deb)\n" +" install - Instaŀla nous paquets (el paquet és libc6, no libc6.deb)\n" " remove - Suprimeix paquets\n" " autoremove - Suprimeix automàticament tots els paquets en desús\n" " purge - Suprimeix i purga paquets\n" @@ -1419,32 +1483,32 @@ msgstr "" " build-dep - Configura dependències de construcció pels paquets font\n" " dist-upgrade - Actualitza la distribució, vegeu apt-get(8)\n" " dselect-upgrade - Segueix les seleccions del dselect\n" -" clean - Esborra els fitxers d'arxiu baixats\n" -" autoclean - Esborra els fitxers d'arxiu antics baixats\n" +" clean - Suprimeix els fitxers d'arxiu baixats\n" +" autoclean - Suprimeix els fitxers d'arxiu antics baixats\n" " check - Verifica que no hi hagi dependències trencades\n" -" markauto - Marca els paquets donats com a instal·lats automàticament\n" -" unmarkauto - Marca els paquets donats com a instal·lats manualment\n" +" changelog - Baixa i mostra el registre de canvis del paquet\n" +" download - Baixa el paquet binari al directori actual\n" "\n" "Opcions:\n" -" -h Aquest text d'ajuda.\n" +" -h Aquest text d'ajuda\n" " -q Sortida enregistrable - sense indicador de progrés\n" " -qq Sense sortida, llevat dels errors\n" -" -d Només baixa - NO instal·les o desempaquetes arxius\n" +" -d Només baixa - NO instaŀles o desempaquetes arxius\n" " -s No actues. Realitza les ordres en mode de simulació\n" -" -y Assumeix que Sí per a totes les preguntes, sense interrupcions\n" +" -y Assumeix «Sí» per a totes les preguntes i no preguntes\n" " -f Intenta corregir un sistema amb dependències trencades\n" -" -m Intenta continuar si no es treben els arxius\n" +" -m Intenta continuar si no es troben els arxius\n" " -u Mostra també una llista dels paquets actualitzats\n" " -b Construeix el paquet font després de baixar-lo\n" " -V Mostra els números de versió detallats\n" " -c=? Llegeix aquest fitxer de configuració\n" -" -o=? Estableix una opció de configuració arbitrària, p.ex.\n" +" -o=? Estableix una opció de configuració arbitrària, p. ex.\n" " -o dir::cache=/tmp\n" -"Vegeu els manuals apt-get(8), sources.list(5) i apt.conf(5)\n" +"Vegeu les pàgines de manual apt-get(8), sources.list(5) i apt.conf(5)\n" "per a obtenir més informació i opcions.\n" -" Aquest APT té superpoders bovins\n" +" Aquest APT té superpoders bovins.\n" -#: cmdline/apt-get.cc:3254 +#: cmdline/apt-get.cc:2995 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1475,7 +1539,7 @@ msgstr "Err " #: cmdline/acqprogress.cc:137 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "%sB baixats en %s (%sB/s)\n" +msgstr "S'ha baixat %sB en %s (%sB/s)\n" #: cmdline/acqprogress.cc:227 #, c-format @@ -1510,20 +1574,20 @@ msgid "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Forma d'ús: apt-sortpkgs [opcions] fitxer1 [fitxer2 ...]\n" +"Forma d'ús: apt-sortpkgs [opcions] fitxer1 [fitxer2 …]\n" "\n" -"apt-sortpkgs és una simple eina per a ordenar fitxers de paquets.\n" +"apt-sortpkgs és una eina simple per ordenar fitxers de paquets.\n" "L'opció -s s'usa per a indicar quin tipus de fitxer és.\n" "\n" "Opcions:\n" " -h Aquest text d'ajuda.\n" " -s Empra l'ordenació de fitxers font\n" " -c=? Llegeix aquest fitxer de configuració\n" -" -o=? Estableix una opció de configuració, p.ex: -o dir::cache=/tmp\n" +" -o=? Estableix una opció de configuració, p. ex: -o dir::cache=/tmp\n" #: dselect/install:32 msgid "Bad default setting!" -msgstr "Paràmetre establert incorrecte!" +msgstr "Paràmetre per defecte incorrecte!" #: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 #: dselect/install:105 dselect/update:45 @@ -1537,8 +1601,7 @@ msgstr "Voleu suprimir els paquets .deb baixats prèviament?" #: dselect/install:101 msgid "Some errors occurred while unpacking. Packages that were installed" msgstr "" -"S'han produït alguns errors en desempaquetar. Els paquets que s'han " -"instal·lat" +"S'han produït alguns errors en desempaquetar. Els paquets que s'han instaŀlat" #: dselect/install:102 msgid "will be configured. This may result in duplicate errors" @@ -1554,8 +1617,8 @@ msgstr "" msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" -"anteriors a aquest missatge són importants. Arregleu-los i torneu a executar " -"[I]nstal·la una altra vegada" +"anteriors a aquest missatge són importants. Corregiu-los i torneu a executar " +"[I]nstaŀla una altra vegada" #: dselect/update:30 msgid "Merging available information" @@ -1569,7 +1632,7 @@ msgstr "No es poden crear els conductes" msgid "Failed to exec gzip " msgstr "No es pot executar el gzip " -#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:208 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "Arxiu corromput" @@ -1577,7 +1640,7 @@ msgstr "Arxiu corromput" msgid "Tar checksum failed, archive corrupted" msgstr "La suma de comprovació de tar ha fallat, arxiu corromput" -#: apt-inst/contrib/extracttar.cc:300 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Capçalera TAR desconeguda del tipus %u, membre %s" @@ -1685,28 +1748,28 @@ msgstr "No s'ha trobat el node dins de la taula" msgid "The path is too long" msgstr "La ruta és massa llarga" -#: apt-inst/extract.cc:412 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "S'està sobreescrivint el corresponent paquet sense versió per a %s" -#: apt-inst/extract.cc:429 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "El fitxer %s/%s sobreescriu al que està en el paquet %s" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:462 apt-pkg/contrib/cdromutl.cc:179 -#: apt-pkg/contrib/fileutl.cc:334 apt-pkg/sourcelist.cc:204 -#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:103 -#: apt-pkg/init.cc:111 apt-pkg/clean.cc:33 apt-pkg/policy.cc:309 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:179 +#: apt-pkg/contrib/fileutl.cc:329 apt-pkg/sourcelist.cc:204 +#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:100 +#: apt-pkg/init.cc:108 apt-pkg/clean.cc:33 apt-pkg/policy.cc:307 #: methods/mirror.cc:87 #, c-format msgid "Unable to read %s" msgstr "No es pot llegir %s" -#: apt-inst/extract.cc:489 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "No es pot veure l'estat de %s" @@ -1732,9 +1795,9 @@ msgstr "" "La info i els directoris temp necessiten estar en el mateix sistema de " "fitxers" -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1074 -#: apt-pkg/pkgcachegen.cc:1178 apt-pkg/pkgcachegen.cc:1184 -#: apt-pkg/pkgcachegen.cc:1330 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1070 +#: apt-pkg/pkgcachegen.cc:1174 apt-pkg/pkgcachegen.cc:1180 +#: apt-pkg/pkgcachegen.cc:1326 msgid "Reading package lists" msgstr "S'està llegint la llista de paquets" @@ -1760,7 +1823,7 @@ msgid "" "package!" msgstr "" "No s'ha pogut obrir la llista del fitxer «%sinfo/%s». Si no podeu restaurar " -"aquest fitxer, creeu-lo buit i torneu a instal·lar immediatament la mateixa " +"aquest fitxer, creeu-lo buit i torneu a instaŀlar immediatament la mateixa " "versió del paquet!" #: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 @@ -1837,28 +1900,24 @@ msgstr "No s'ha trobat un fitxer de control vàlid" msgid "Unparsable control file" msgstr "El fitxer de control no es pot analitzar" -#: methods/bzip2.cc:60 methods/gzip.cc:52 -msgid "Empty files can't be valid archives" -msgstr "" - -#: methods/bzip2.cc:64 +#: methods/bzip2.cc:65 #, c-format msgid "Couldn't open pipe for %s" msgstr "No s'ha pogut obrir un conducte per a %s" -#: methods/bzip2.cc:108 +#: methods/bzip2.cc:109 #, c-format msgid "Read error from %s process" msgstr "S'ha produït un error en llegir des del procés %s" -#: methods/bzip2.cc:140 methods/bzip2.cc:149 methods/copy.cc:43 -#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:524 -#: methods/rred.cc:533 +#: methods/bzip2.cc:141 methods/bzip2.cc:150 methods/copy.cc:43 +#: methods/gzip.cc:93 methods/gzip.cc:102 methods/rred.cc:486 +#: methods/rred.cc:495 msgid "Failed to stat" msgstr "L'estat ha fallat" -#: methods/bzip2.cc:146 methods/copy.cc:80 methods/gzip.cc:98 -#: methods/rred.cc:530 +#: methods/bzip2.cc:147 methods/copy.cc:80 methods/gzip.cc:99 +#: methods/rred.cc:492 msgid "Failed to set modification time" msgstr "No s'ha pogut establir el temps de modificació" @@ -1935,7 +1994,7 @@ msgstr "" #: methods/ftp.cc:271 #, c-format msgid "Login script command '%s' failed, server said: %s" -msgstr "L'ordre '%s' de l'script d'accés ha fallat, el servidor ha dit: %s" +msgstr "L'ordre «%s» de l'script d'accés ha fallat, el servidor ha dit: %s" #: methods/ftp.cc:297 #, c-format @@ -1950,19 +2009,19 @@ msgstr "Temps de connexió finalitzat" msgid "Server closed the connection" msgstr "El servidor ha tancat la connexió" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:811 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:802 methods/rsh.cc:190 msgid "Read error" msgstr "Error de lectura" #: methods/ftp.cc:351 methods/rsh.cc:197 msgid "A response overflowed the buffer." -msgstr "Una resposta ha desbordat la memòria temporal." +msgstr "Una resposta ha desbordat la memòria intermèdia." #: methods/ftp.cc:368 methods/ftp.cc:380 msgid "Protocol corruption" msgstr "Protocol corromput" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:853 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:844 methods/rsh.cc:232 msgid "Write error" msgstr "Error d'escriptura" @@ -1985,7 +2044,7 @@ msgstr "gettaddrinfo no es pot obtenir un sòcol que escolte" # abastar? huh? jm #: methods/ftp.cc:741 msgid "Could not bind a socket" -msgstr "No s'ha pogut abastar un connector" +msgstr "No s'ha pogut vincular a un connector" #: methods/ftp.cc:745 msgid "Could not listen on the socket" @@ -2024,7 +2083,7 @@ msgstr "Problema escollint el fitxer" #: methods/ftp.cc:882 #, c-format msgid "Unable to fetch file, server said '%s'" -msgstr "No és possible reprendre el fitxer, el servidor ha dit '%s'" +msgstr "No és possible obtenir el fitxer, el servidor ha dit '%s'" #: methods/ftp.cc:897 methods/rsh.cc:321 msgid "Data socket timed out" @@ -2105,7 +2164,7 @@ msgstr "No es pot connectar amb %s:%s:" #: methods/gpgv.cc:71 #, c-format msgid "No keyring installed in %s." -msgstr "No s'ha instal·lat cap clauer a %s." +msgstr "No s'ha instaŀlat cap clauer a %s." #: methods/gpgv.cc:163 msgid "" @@ -2121,8 +2180,8 @@ msgstr "S'ha trobat almenys una signatura invàlida." #: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" -"No s'ha pogut executar 'gpgv' per a verificar la firma (està instal·lat el " -"gpgv?)" +"No s'ha pogut executar «gpgv» per a verificar la signatura (està instaŀlat " +"el gpgv?)" #: methods/gpgv.cc:177 msgid "Unknown error executing gpgv" @@ -2202,7 +2261,7 @@ msgstr "" msgid "Error reading from server" msgstr "S'ha produït un error en llegir des del servidor" -#: methods/http.cc:991 apt-pkg/contrib/mmap.cc:283 +#: methods/http.cc:991 apt-pkg/contrib/mmap.cc:281 msgid "Failed to truncate file" msgstr "No s'ha pogut truncar el fitxer %s" @@ -2240,7 +2299,7 @@ msgstr "No es pot tancar el mmap" msgid "Unable to synchronize mmap" msgstr "No es pot sincronitzar el mmap" -#: apt-pkg/contrib/mmap.cc:302 +#: apt-pkg/contrib/mmap.cc:300 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " @@ -2249,7 +2308,7 @@ msgstr "" "No hi ha espai per al «Dynamic MMap». Incrementeu la mida d'APT::Cache-" "Limit. Valor actual: %lu. (man 5 apt.conf)" -#: apt-pkg/contrib/mmap.cc:401 +#: apt-pkg/contrib/mmap.cc:399 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " @@ -2258,7 +2317,7 @@ msgstr "" "No s'ha pogut incrementar la mida del MMap ja que el limit de %lu bytes ja " "s'ha superat." -#: apt-pkg/contrib/mmap.cc:404 +#: apt-pkg/contrib/mmap.cc:402 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2289,7 +2348,7 @@ msgstr "%limin %lis" msgid "%lis" msgstr "%lis" -#: apt-pkg/contrib/strutl.cc:1136 +#: apt-pkg/contrib/strutl.cc:1119 #, c-format msgid "Selection %s not found" msgstr "No s'ha trobat la selecció %s" @@ -2354,12 +2413,12 @@ msgstr "Error sintàctic %s:%u: Text extra al final del fitxer" #: apt-pkg/contrib/progress.cc:153 #, c-format msgid "%c%s... Error!" -msgstr "%c%s... Error!" +msgstr "%c%s… Error!" #: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Done" -msgstr "%c%s... Fet" +msgstr "%c%s… Fet" #: apt-pkg/contrib/cmndline.cc:77 #, c-format @@ -2423,114 +2482,98 @@ msgstr "No es pot canviar a %s" msgid "Failed to stat the cdrom" msgstr "No s'ha pogut fer «stat» del cdrom" -#: apt-pkg/contrib/fileutl.cc:159 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" "No s'empren blocats per a llegir el fitxer de blocat de sols lectura %s" -#: apt-pkg/contrib/fileutl.cc:164 +#: apt-pkg/contrib/fileutl.cc:159 #, c-format msgid "Could not open lock file %s" msgstr "No es pot resoldre el fitxer de blocat %s" -#: apt-pkg/contrib/fileutl.cc:182 +#: apt-pkg/contrib/fileutl.cc:177 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "No s'empren blocats per al fitxer de blocat %s de muntar nfs" -#: apt-pkg/contrib/fileutl.cc:186 +#: apt-pkg/contrib/fileutl.cc:181 #, c-format msgid "Could not get lock %s" msgstr "No s'ha pogut blocar %s" -#: apt-pkg/contrib/fileutl.cc:326 +#: apt-pkg/contrib/fileutl.cc:321 #, c-format msgid "List of files can't be created as '%s' is not a directory" -msgstr "" - -#: apt-pkg/contrib/fileutl.cc:353 -#, c-format -msgid "Ignoring '%s' in directory '%s' as it is not a regular file" -msgstr "" - -#: apt-pkg/contrib/fileutl.cc:371 -#, c-format -msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" -msgstr "" - -#: apt-pkg/contrib/fileutl.cc:380 -#, c-format -msgid "" -"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" -msgstr "" +msgstr "No es pot crear la llista de fitxers perquè «%s» no és un directori" -#: apt-pkg/contrib/fileutl.cc:670 +#: apt-pkg/contrib/fileutl.cc:661 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Esperava %s però no hi era" -#: apt-pkg/contrib/fileutl.cc:682 +#: apt-pkg/contrib/fileutl.cc:673 #, c-format msgid "Sub-process %s received a segmentation fault." -msgstr "Sub-procés %s ha rebut una violació de segment." +msgstr "El sub-procés %s ha rebut una violació de segment." -#: apt-pkg/contrib/fileutl.cc:684 +#: apt-pkg/contrib/fileutl.cc:675 #, c-format msgid "Sub-process %s received signal %u." -msgstr "Sub-procés %s ha rebut una senyal %u." +msgstr "El sub-procés %s ha rebut un senyal %u." -#: apt-pkg/contrib/fileutl.cc:688 +#: apt-pkg/contrib/fileutl.cc:679 #, c-format msgid "Sub-process %s returned an error code (%u)" -msgstr "Sub-procés %s ha retornat un codi d'error (%u)" +msgstr "El sub-procés %s ha retornat un codi d'error (%u)" -#: apt-pkg/contrib/fileutl.cc:690 +#: apt-pkg/contrib/fileutl.cc:681 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "El sub-procés %s ha sortit inesperadament" -#: apt-pkg/contrib/fileutl.cc:755 +#: apt-pkg/contrib/fileutl.cc:746 #, c-format msgid "Could not open file %s" msgstr "No s'ha pogut obrir el fitxer %s" -#: apt-pkg/contrib/fileutl.cc:772 +#: apt-pkg/contrib/fileutl.cc:763 #, c-format msgid "Could not open file descriptor %d" msgstr "No s'ha pogut obrir el descriptor del fitxer %d" -#: apt-pkg/contrib/fileutl.cc:832 +#: apt-pkg/contrib/fileutl.cc:823 #, c-format msgid "read, still have %lu to read but none left" msgstr "llegits, falten %lu per llegir, però no queda res" -#: apt-pkg/contrib/fileutl.cc:865 +#: apt-pkg/contrib/fileutl.cc:856 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "escrits, falten %lu per escriure però no s'ha pogut" -#: apt-pkg/contrib/fileutl.cc:1001 +#: apt-pkg/contrib/fileutl.cc:985 #, c-format msgid "Problem closing the gzip file %s" msgstr "Ha hagut un problema en tancar el fitxer gzip %s" -#: apt-pkg/contrib/fileutl.cc:1004 +#: apt-pkg/contrib/fileutl.cc:988 #, c-format msgid "Problem closing the file %s" msgstr "Ha hagut un problema en tancar el fitxer %s" -#: apt-pkg/contrib/fileutl.cc:1009 +#: apt-pkg/contrib/fileutl.cc:993 #, c-format msgid "Problem renaming the file %s to %s" msgstr "Ha hagut un problema en reanomenar el fitxer %s a %s" -#: apt-pkg/contrib/fileutl.cc:1020 +#: apt-pkg/contrib/fileutl.cc:1004 #, c-format msgid "Problem unlinking the file %s" msgstr "Ha hagut un problema en desenllaçar el fitxer %s" -#: apt-pkg/contrib/fileutl.cc:1033 +#: apt-pkg/contrib/fileutl.cc:1017 msgid "Problem syncing the file" msgstr "Ha hagut un problema en sincronitzar el fitxer" @@ -2642,7 +2685,7 @@ msgstr "No s'ha pogut escriure el fitxer d'estat temporal %s" msgid "Internal error, group '%s' has no installable pseudo package" msgstr "" "S'ha produït un error intern, el grup '%s' no disposa d'un pseudopaquet " -"instal·lable" +"instaŀlable" #: apt-pkg/tagfile.cc:102 #, c-format @@ -2743,7 +2786,7 @@ msgid "" "package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " "you really want to do it, activate the APT::Force-LoopBreak option." msgstr "" -"Aquesta instal·lació requereix suprimir temporalment el paquet essencial %s " +"Aquesta instaŀlació requereix suprimir temporalment el paquet essencial %s " "per qüestió d'un bucle de Conflictes/Pre-dependències. Això sol ser una cosa " "dolenta, però si realment desitgeu fer-la, activeu l'opció APT::Force-" "LoopBreak." @@ -2762,14 +2805,14 @@ msgstr "" msgid "Index file type '%s' is not supported" msgstr "El tipus de fitxer índex «%s» no està suportat" -#: apt-pkg/algorithms.cc:313 +#: apt-pkg/algorithms.cc:292 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" -"El paquet %s necessita ser reinstal·lat, però no se li pot trobar un arxiu." +"El paquet %s necessita ser reinstaŀlat, però no se li pot trobar un arxiu." -#: apt-pkg/algorithms.cc:1239 +#: apt-pkg/algorithms.cc:1218 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2777,20 +2820,23 @@ msgstr "" "Error, pkgProblemResolver::Resolve ha generat pauses, això pot haver estat " "causat per paquets retinguts." -#: apt-pkg/algorithms.cc:1241 +#: apt-pkg/algorithms.cc:1220 msgid "Unable to correct problems, you have held broken packages." msgstr "" "No es poden corregir els problemes, teniu paquets retinguts que estan " "trencats." -#: apt-pkg/algorithms.cc:1517 apt-pkg/algorithms.cc:1519 +#: apt-pkg/algorithms.cc:1496 apt-pkg/algorithms.cc:1498 #, fuzzy +#| msgid "" +#| "Some index files failed to download. They have been ignored, or old ones " +#| "used instead." msgid "" -"Some index files failed to download. They have been ignored, or old ones " +"Some index files failed to download, they have been ignored, or old ones " "used instead." msgstr "" -"No es poden baixar alguns fitxers índex, s'han ignorat o en el seu lloc " -"s'han emprat els antics." +"Alguns índex no s'han pogut baixar. S'han descartat, o en el seu lloc s'han " +"emprat els antics." #: apt-pkg/acquire.cc:79 #, c-format @@ -2834,12 +2880,12 @@ msgstr "El mètode %s no s'ha iniciat correctament" msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Inseriu el disc amb l'etiqueta: «%s» en la unitat «%s» i premeu Intro." -#: apt-pkg/init.cc:146 +#: apt-pkg/init.cc:143 #, c-format msgid "Packaging system '%s' is not supported" msgstr "El sistema d'empaquetament «%s» no està suportat" -#: apt-pkg/init.cc:162 +#: apt-pkg/init.cc:159 msgid "Unable to determine a suitable packaging system type" msgstr "No es pot determinar un tipus de sistema d'empaquetament adequat." @@ -2866,17 +2912,17 @@ msgstr "" msgid "The list of sources could not be read." msgstr "No s'ha pogut llegir la llista de les fonts." -#: apt-pkg/policy.cc:346 +#: apt-pkg/policy.cc:344 #, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "Registre no vàlid al fitxer de preferències %s, paquet sense capçalera" -#: apt-pkg/policy.cc:368 +#: apt-pkg/policy.cc:366 #, c-format msgid "Did not understand pin type %s" msgstr "No s'ha entès el pin de tipus %s" -#: apt-pkg/policy.cc:376 +#: apt-pkg/policy.cc:374 msgid "No priority (or zero) specified for pin" msgstr "No hi ha prioritat especificada per al pin (o és zero)" @@ -2964,16 +3010,16 @@ msgid "Package %s %s was not found while processing file dependencies" msgstr "" "No s'ha trobat el paquet %s %s en processar les dependències del fitxer" -#: apt-pkg/pkgcachegen.cc:986 +#: apt-pkg/pkgcachegen.cc:982 #, c-format msgid "Couldn't stat source package list %s" msgstr "No s'ha pogut llegir la llista de paquets font %s" -#: apt-pkg/pkgcachegen.cc:1091 +#: apt-pkg/pkgcachegen.cc:1087 msgid "Collecting File Provides" msgstr "S'estan recollint els fitxers que proveeixen" -#: apt-pkg/pkgcachegen.cc:1269 apt-pkg/pkgcachegen.cc:1276 +#: apt-pkg/pkgcachegen.cc:1265 apt-pkg/pkgcachegen.cc:1272 msgid "IO Error saving source cache" msgstr "Error d'E/S en desar la memòria cau de la font" @@ -2982,60 +3028,48 @@ msgstr "Error d'E/S en desar la memòria cau de la font" msgid "rename failed, %s (%s -> %s)." msgstr "no s'ha pogut canviar el nom, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:629 +#: apt-pkg/acquire-item.cc:484 msgid "MD5Sum mismatch" msgstr "La suma MD5 no concorda" -#: apt-pkg/acquire-item.cc:887 apt-pkg/acquire-item.cc:1781 -#: apt-pkg/acquire-item.cc:1924 +#: apt-pkg/acquire-item.cc:746 apt-pkg/acquire-item.cc:1574 +#: apt-pkg/acquire-item.cc:1717 msgid "Hash Sum mismatch" msgstr "La suma resum no concorda" -#: apt-pkg/acquire-item.cc:1341 -#, c-format -msgid "" -"Unable to find expected entry '%s' in Release file (Wrong sources.list entry " -"or malformed file)" -msgstr "" - -#: apt-pkg/acquire-item.cc:1356 -#, fuzzy, c-format -msgid "Unable to find hash sum for '%s' in Release file" -msgstr "No es pot analitzar el fitxer Release %s" - -#: apt-pkg/acquire-item.cc:1415 +#: apt-pkg/acquire-item.cc:1244 msgid "There is no public key available for the following key IDs:\n" msgstr "No hi ha cap clau pública disponible per als següents ID de clau:\n" #. TRANSLATOR: The first %s is the URL of the bad Release file, the second is #. the time since then the file is invalid - formated in the same way as in #. the download progress display (e.g. 7d 3h 42min 1s) -#: apt-pkg/acquire-item.cc:1452 +#: apt-pkg/acquire-item.cc:1281 #, c-format msgid "Release file expired, ignoring %s (invalid since %s)" msgstr "El fitxer Release ha caducat, s'està ignorant %s (invàlid des de %s)" -#: apt-pkg/acquire-item.cc:1473 +#: apt-pkg/acquire-item.cc:1302 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Distribució en conflicte: %s (s'esperava %s però s'ha obtingut %s)" -#: apt-pkg/acquire-item.cc:1506 +#: apt-pkg/acquire-item.cc:1328 #, c-format msgid "" "A error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" -"S'ha produït un error durant la verificació de la firma. El repositori no " -"està actualitzat i serà utilitzat el fitxer d'índex anterior. error GPG: %s: " +"S'ha produït un error durant la verificació de la signatura. El dipòsit no " +"està actualitzat i s'emprarà el fitxer d'índex anterior. Error del GPG: %s: " "%s\n" -#: apt-pkg/acquire-item.cc:1515 +#: apt-pkg/acquire-item.cc:1337 #, c-format msgid "GPG error: %s: %s" msgstr "S'ha produït un error amb el GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1572 +#: apt-pkg/acquire-item.cc:1365 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3045,7 +3079,7 @@ msgstr "" "significar que haureu d'arreglar aquest paquet manualment (segons " "arquitectura)." -#: apt-pkg/acquire-item.cc:1631 +#: apt-pkg/acquire-item.cc:1424 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3054,7 +3088,7 @@ msgstr "" "No s'ha trobat un fitxer pel paquet %s. Això podria significar que haureu " "d'arreglar aquest paquet manualment." -#: apt-pkg/acquire-item.cc:1686 +#: apt-pkg/acquire-item.cc:1479 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3062,7 +3096,7 @@ msgstr "" "L'índex dels fitxers en el paquet està corromput. Fitxer no existent: camp " "per al paquet %s." -#: apt-pkg/acquire-item.cc:1773 +#: apt-pkg/acquire-item.cc:1566 msgid "Size mismatch" msgstr "La mida no concorda" @@ -3071,22 +3105,22 @@ msgstr "La mida no concorda" msgid "Unable to parse Release file %s" msgstr "No es pot analitzar el fitxer Release %s" -#: apt-pkg/indexrecords.cc:63 +#: apt-pkg/indexrecords.cc:60 #, c-format msgid "No sections in Release file %s" msgstr "No hi ha seccions al fitxer Release %s" -#: apt-pkg/indexrecords.cc:97 +#: apt-pkg/indexrecords.cc:94 #, c-format msgid "No Hash entry in Release file %s" msgstr "No hi ha una entrada Hash al fitxer Release %s" -#: apt-pkg/indexrecords.cc:110 +#: apt-pkg/indexrecords.cc:107 #, c-format msgid "Invalid 'Valid-Until' entry in Release file %s" msgstr "No hi ha una entrada 'Valid-Until' vàlida al fitxer Release %s" -#: apt-pkg/indexrecords.cc:125 +#: apt-pkg/indexrecords.cc:122 #, c-format msgid "Invalid 'Date' entry in Release file %s" msgstr "No hi ha una entrada 'date' al fitxer Release %s" @@ -3107,7 +3141,7 @@ msgstr "" #: apt-pkg/cdrom.cc:527 apt-pkg/cdrom.cc:615 msgid "Identifying.. " -msgstr "S'està identificant..." +msgstr "S'està identificant…" #: apt-pkg/cdrom.cc:552 #, c-format @@ -3116,7 +3150,7 @@ msgstr "S'ha emmagatzemat l'etiqueta: %s\n" #: apt-pkg/cdrom.cc:559 apt-pkg/cdrom.cc:827 msgid "Unmounting CD-ROM...\n" -msgstr "S'esta desmuntant el CD-ROM...\n" +msgstr "S'esta desmuntant el CD-ROM…\n" #: apt-pkg/cdrom.cc:578 #, c-format @@ -3129,16 +3163,16 @@ msgstr "S'està desmuntant el CD-ROM\n" #: apt-pkg/cdrom.cc:600 msgid "Waiting for disc...\n" -msgstr "S'està esperant al disc...\n" +msgstr "S'està esperant al disc…\n" #. Mount the new CDROM #: apt-pkg/cdrom.cc:608 msgid "Mounting CD-ROM...\n" -msgstr "S'està muntant el CD-ROM...\n" +msgstr "S'està muntant el CD-ROM…\n" #: apt-pkg/cdrom.cc:626 msgid "Scanning disc for index files..\n" -msgstr "S'està analitzant el disc per a fitxers d'índex...\n" +msgstr "S'està analitzant el disc per a fitxers d'índex…\n" #: apt-pkg/cdrom.cc:666 #, c-format @@ -3177,7 +3211,7 @@ msgstr "" #: apt-pkg/cdrom.cc:752 msgid "Copying package lists..." -msgstr "S'estan copiant les llistes de paquets..." +msgstr "S'estan copiant les llistes de paquets…" #: apt-pkg/cdrom.cc:778 msgid "Writing new source list\n" @@ -3187,22 +3221,22 @@ msgstr "S'està escrivint una nova llista de fonts\n" msgid "Source list entries for this disc are:\n" msgstr "Les entrades de la llista de fonts per a aquest disc són:\n" -#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:909 +#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:908 #, c-format msgid "Wrote %i records.\n" msgstr "S'han escrit %i registres.\n" -#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:911 +#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:910 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "S'han escrit %i registres, on falten %i fitxers.\n" -#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:914 +#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:913 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "S'han escrit %i registres, on hi ha %i fitxers no coincidents\n" -#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:917 +#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:916 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3237,18 +3271,18 @@ msgstr "No s'ha trobat la versió «%s» per a «%s»" #: apt-pkg/cacheset.cc:447 #, c-format msgid "Couldn't find task '%s'" -msgstr "No s'ha pogut trobar la tasca '%s'" +msgstr "No s'ha pogut trobar la tasca «%s»" #: apt-pkg/cacheset.cc:454 #, c-format msgid "Couldn't find any package by regex '%s'" -msgstr "No s'ha pogut trobar el paquet a través de l'expressió regular '%s'" +msgstr "No s'ha pogut trobar el paquet a través de l'expressió regular «%s»" #: apt-pkg/cacheset.cc:467 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -"No s'han pogut seleccionar les versions del paquet '%s' ja que és purament " +"No s'han pogut seleccionar les versions del paquet «%s» ja que és purament " "virtual" #: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483 @@ -3257,14 +3291,14 @@ msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -"No s'han pogut seleccionar la versió instal·lada ni la candidata del paquet " -"'%s' ja que no estan disponibles cap de les dues" +"No s'han pogut seleccionar la versió instaŀlada ni la candidata del paquet " +"«%s» ja que no estan disponibles cap de les dues" #: apt-pkg/cacheset.cc:491 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -"No s'ha pogut seleccionar la versió més nova del paquet '%s' ja que és " +"No s'ha pogut seleccionar la versió més nova del paquet «%s» ja que és " "purament virtual" #: apt-pkg/cacheset.cc:499 @@ -3278,20 +3312,20 @@ msgstr "" #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" -"No s'ha pogut seleccionar la versió instal·lada del paquet %s ja que no està " -"instal·lada" +"No s'ha pogut seleccionar la versió instaŀlada del paquet %s ja que no està " +"instaŀlada" #: apt-pkg/deb/dpkgpm.cc:52 #, c-format msgid "Installing %s" -msgstr "S'està instal·lant %s" +msgstr "S'està instaŀlant %s" -#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:819 +#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:823 #, c-format msgid "Configuring %s" msgstr "S'està configurant el paquet %s" -#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:826 +#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:830 #, c-format msgid "Removing %s" msgstr "S'està suprimint el paquet %s" @@ -3309,79 +3343,79 @@ msgstr "Anotant la desaparició de %s" #: apt-pkg/deb/dpkgpm.cc:57 #, c-format msgid "Running post-installation trigger %s" -msgstr "S'està executant l'activador de postinstal·lació %s" +msgstr "S'està executant l'activador de postinstaŀlació %s" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:642 +#: apt-pkg/deb/dpkgpm.cc:646 #, c-format msgid "Directory '%s' missing" msgstr "Manca el directori «%s»" -#: apt-pkg/deb/dpkgpm.cc:657 apt-pkg/deb/dpkgpm.cc:671 +#: apt-pkg/deb/dpkgpm.cc:661 apt-pkg/deb/dpkgpm.cc:675 #, c-format msgid "Could not open file '%s'" -msgstr "No s'ha pogut obrir el fitxer '%s'" +msgstr "No s'ha pogut obrir el fitxer «%s»" -#: apt-pkg/deb/dpkgpm.cc:812 +#: apt-pkg/deb/dpkgpm.cc:816 #, c-format msgid "Preparing %s" msgstr "S'està preparant el paquet %s" -#: apt-pkg/deb/dpkgpm.cc:813 +#: apt-pkg/deb/dpkgpm.cc:817 #, c-format msgid "Unpacking %s" msgstr "S'està desempaquetant %s" -#: apt-pkg/deb/dpkgpm.cc:818 +#: apt-pkg/deb/dpkgpm.cc:822 #, c-format msgid "Preparing to configure %s" msgstr "S'està preparant per a configurar el paquet %s" -#: apt-pkg/deb/dpkgpm.cc:820 +#: apt-pkg/deb/dpkgpm.cc:824 #, c-format msgid "Installed %s" -msgstr "S'ha instal·lat el paquet %s" +msgstr "S'ha instaŀlat el paquet %s" -#: apt-pkg/deb/dpkgpm.cc:825 +#: apt-pkg/deb/dpkgpm.cc:829 #, c-format msgid "Preparing for removal of %s" msgstr "S'està preparant per a la supressió del paquet %s" -#: apt-pkg/deb/dpkgpm.cc:827 +#: apt-pkg/deb/dpkgpm.cc:831 #, c-format msgid "Removed %s" msgstr "S'ha suprimit el paquet %s" -#: apt-pkg/deb/dpkgpm.cc:832 +#: apt-pkg/deb/dpkgpm.cc:836 #, c-format msgid "Preparing to completely remove %s" msgstr "S'està preparant per a suprimir completament el paquet %s" -#: apt-pkg/deb/dpkgpm.cc:833 +#: apt-pkg/deb/dpkgpm.cc:837 #, c-format msgid "Completely removed %s" msgstr "S'ha suprimit completament el paquet %s" -#: apt-pkg/deb/dpkgpm.cc:1039 +#: apt-pkg/deb/dpkgpm.cc:1043 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" "No es pot escriure el registre, ha fallat openpty() (no s'ha muntat /dev/" "pts?)\n" -#: apt-pkg/deb/dpkgpm.cc:1070 +#: apt-pkg/deb/dpkgpm.cc:1074 msgid "Running dpkg" msgstr "S'està executant dpkg" -#: apt-pkg/deb/dpkgpm.cc:1273 +#: apt-pkg/deb/dpkgpm.cc:1277 msgid "No apport report written because MaxReports is reached already" msgstr "No s'ha escrit cap informe perquè ja s'ha superat MaxReports" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1278 +#: apt-pkg/deb/dpkgpm.cc:1282 msgid "dependency problems - leaving unconfigured" msgstr "S'han produït problemes de depències, es deixa sense configurar" -#: apt-pkg/deb/dpkgpm.cc:1280 +#: apt-pkg/deb/dpkgpm.cc:1284 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." @@ -3389,7 +3423,7 @@ msgstr "" "No s'ha escrit cap informe perquè el missatge d'error indica que és un error " "consequent de una fallida anterior." -#: apt-pkg/deb/dpkgpm.cc:1286 +#: apt-pkg/deb/dpkgpm.cc:1290 msgid "" "No apport report written because the error message indicates a disk full " "error" @@ -3397,7 +3431,7 @@ msgstr "" "No s'ha escrit cap informe perquè el missatge d'error indica una fallida per " "disc ple" -#: apt-pkg/deb/dpkgpm.cc:1292 +#: apt-pkg/deb/dpkgpm.cc:1296 msgid "" "No apport report written because the error message indicates a out of memory " "error" @@ -3405,7 +3439,7 @@ msgstr "" "No s'ha escrit cap informe perquè el missatge d'error indica una fallida per " "falta de memòria" -#: apt-pkg/deb/dpkgpm.cc:1299 +#: apt-pkg/deb/dpkgpm.cc:1303 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -3433,7 +3467,7 @@ msgstr "No es pot blocar el directori d'administració (%s), sou root?" msgid "" "dpkg was interrupted, you must manually run '%s' to correct the problem. " msgstr "" -"S'ha interromput el dpkg, harieu d'executar manualment '%s' per a corregir " +"S'ha interromput el dpkg, harieu d'executar manualment «%s» per a corregir " "el problema." #: apt-pkg/deb/debsystem.cc:106 @@ -3445,14 +3479,14 @@ msgstr "No blocat" #: methods/mirror.cc:200 #, c-format msgid "No mirror file '%s' found " -msgstr "No s'ha trobat el fitxer rèplica '%s'" +msgstr "No s'ha trobat el fitxer rèplica «%s»" #: methods/mirror.cc:343 #, c-format msgid "[Mirror: %s]" msgstr "[Rèplica: %s]" -#: methods/rred.cc:503 +#: methods/rred.cc:465 #, c-format msgid "" "Could not patch %s with mmap and with file operation usage - the patch seems " @@ -3461,7 +3495,7 @@ msgstr "" "No s'ha pogut apedaçar %s amb el mmap ni amb la utilització de la operació " "del fitxer - el pedaç sembla ser incorrecte" -#: methods/rred.cc:508 +#: methods/rred.cc:470 #, c-format msgid "" "Could not patch %s with mmap (but no mmap specific fail) - the patch seems " @@ -3474,6 +3508,121 @@ msgstr "" msgid "Connection closed prematurely" msgstr "La connexió s'ha tancat prematurament" +#~ msgid "This command is deprecated. Please use 'apt-mark showauto' instead." +#~ msgstr "" +#~ "Aquesta ordre és desfasada. Empreu «apt-mark showauto» en el seu lloc." + +#~ msgid "" +#~ "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark " +#~ "manual' instead." +#~ msgstr "" +#~ "Aquesta ordre és desfasada. Empreu «apt-mark auto» i «apt-mark manual» en " +#~ "el seu lloc." + +#~ msgid "Downloading %s %s" +#~ msgstr "S'està baixant %s %s" + +#~ msgid "Changelog for %s (%s)" +#~ msgstr "Registre de canvis per a %s (%s)" + +#~ msgid "%s can not be marked as it is not installed.\n" +#~ msgstr "%s no es pot marcar perquè no està instaŀlat.\n" + +#~ msgid "%s was already set to manually installed.\n" +#~ msgstr "%s ja estava marcat com instaŀlat manualment.\n" + +#~ msgid "%s was already set to automatically installed.\n" +#~ msgstr "%s ja estava marcat com instaŀlat automàticament.\n" + +#~ msgid "%s was already set on hold.\n" +#~ msgstr "%s ja estava mantingut.\n" + +#~ msgid "%s was already not hold.\n" +#~ msgstr "%s ja estava sense marcar com a mantingut.\n" + +#~ msgid "%s set on hold.\n" +#~ msgstr "S'ha establert %s com a mantingut.\n" + +#~ msgid "Canceled hold on %s.\n" +#~ msgstr "S'ha canceŀlat la marca com a mantingut de %s.\n" + +#~ msgid "Executing dpkg failed. Are you root?" +#~ msgstr "Ha fallat l'execució del dpkg. Sou el superusuari?" + +#~ msgid "" +#~ "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" +#~ "\n" +#~ "apt-mark is a simple command line interface for marking packages\n" +#~ "as manual or automatical installed. It can also list marks.\n" +#~ "\n" +#~ "Commands:\n" +#~ " auto - Mark the given packages as automatically installed\n" +#~ " manual - Mark the given packages as manually installed\n" +#~ "\n" +#~ "Options:\n" +#~ " -h This help text.\n" +#~ " -q Loggable output - no progress indicator\n" +#~ " -qq No output except for errors\n" +#~ " -s No-act. Just prints what would be done.\n" +#~ " -f read/write auto/manual marking in the given file\n" +#~ " -c=? Read this configuration file\n" +#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information." +#~ msgstr "" +#~ "Forma d'ús: apt-mark [opcions] {auto|manual} paq1 [paq2 …]\n" +#~ "\n" +#~ "apt-mark és una interfície simple de la línia d'ordres per a marcar\n" +#~ "paquets com a instaŀlats automàticament o manual. També pot llistar\n" +#~ "les marques.\n" +#~ "\n" +#~ "Ordres:\n" +#~ "\n" +#~ " auto - Marca els paquets donats com a instaŀlats automàticament\n" +#~ " manual - Marca els paquets donats com a instaŀlats manualment\n" +#~ "\n" +#~ "Opcions:\n" +#~ " -h Aquest text d'ajuda.\n" +#~ " -q Sortida enregistrable - sense indicador de progrés\n" +#~ " -qq Sense sortida, llevat dels errors\n" +#~ " -s No actues. Mostra només què es faria.\n" +#~ " -f Llegeix/escriu les marques auto/manual emprant el fitxer donat\n" +#~ " -c=? Llegeix aquest fitxer de configuració\n" +#~ " -o=? Estableix una opció de configuració, p. ex: -o dir::cache=/tmp\n" +#~ "Vegeu les pàgines de manual apt-mark(8) i apt.conf(5) per a més " +#~ "informació." + +#~ msgid "Empty files can't be valid archives" +#~ msgstr "Els fitxers buits no poden ser arxius vàlids" + +#~ msgid "Ignoring '%s' in directory '%s' as it is not a regular file" +#~ msgstr "" +#~ "S'està descartant «%s» al directori «%s» perquè no és un fitxer normal" + +#~ msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" +#~ msgstr "" +#~ "S'està descartant «%s» al directori «%s» perquè no té extensió del nom de " +#~ "fitxer" + +#~ msgid "" +#~ "Ignoring file '%s' in directory '%s' as it has an invalid filename " +#~ "extension" +#~ msgstr "" +#~ "S'està descartant «%s» al directori «%s» perquè té una extensió del nom " +#~ "de fitxer invàlida" + +#~ msgid "" +#~ "Unable to find expected entry '%s' in Release file (Wrong sources.list " +#~ "entry or malformed file)" +#~ msgstr "" +#~ "No s'ha trobat l'entrada «%s» esperada, al fitxer Release (entrada " +#~ "errònia al sources.list o fitxer malformat)" + +#~ msgid "Unable to find hash sum for '%s' in Release file" +#~ msgstr "No s'ha trobat la suma de comprovació per a «%s» al fitxer Release" + +#~ msgid "Can not read mirror file '%s'" +#~ msgstr "No s'ha pogut llegir el fitxer rèplica «%s»" + #~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." #~ msgstr "" #~ "E: La llista d'arguments d'Acquire::gpgv::Options és massa llarga. S'està " @@ -3513,7 +3662,7 @@ msgstr "La connexió s'ha tancat prematurament" #~ "that package should be filed." #~ msgstr "" #~ "Degut a que només heu requerit una única operació, serà molt\n" -#~ "probable que el paquet no sigui instal·lable i que s'hagi d'emetre\n" +#~ "probable que el paquet no sigui instaŀlable i que s'hagi d'emetre\n" #~ "un informe d'error en contra d'aquest per a arxivar-lo." #~ msgid "File date has changed %s" @@ -9,14 +9,16 @@ msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011-01-12 17:42+0100\n" -"PO-Revision-Date: 2011-02-21 18:35+0100\n" +"PO-Revision-Date: 2011-05-16 21:38+0200\n" "Last-Translator: Milo Casagrande <milo@ubuntu.com>\n" "Language-Team: Italian <tp@lists.linux.it>\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8-bit\n" +"Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Launchpad-Export-Date: 2011-02-21 18:00+0000\n" +"X-Generator: Launchpad (build 12406)\n" #: cmdline/apt-cache.cc:156 #, c-format @@ -1907,8 +1909,10 @@ msgid "Couldn't change to %s" msgstr "Impossibile passare a %s" #: apt-inst/deb/debfile.cc:140 +#, fuzzy +#| msgid "Internal error, could not locate member %s" msgid "Internal error, could not locate member" -msgstr "Errore interno, impossibile localizzare il membro" +msgstr "Errore interno, impossibile trovare il membro %s" #: apt-inst/deb/debfile.cc:173 msgid "Failed to locate a valid control file" @@ -2710,7 +2714,6 @@ msgstr "Scrittura del file temporaneo di stato %s non riuscita" #, c-format msgid "Internal error, group '%s' has no installable pseudo package" msgstr "" -"Errore interno, il gruppo \"%s\" non ha uno pseudo pacchetto installabile" #: apt-pkg/tagfile.cc:102 #, c-format @@ -3113,7 +3116,10 @@ msgstr "" "sistemare manualmente questo pacchetto (a causa dell'architettura mancante)." #: apt-pkg/acquire-item.cc:1424 -#, c-format +#, fuzzy, c-format +#| msgid "" +#| "I wasn't able to locate file for the %s package. This might mean you need " +#| "to manually fix this package." msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package." @@ -3581,3 +3587,6 @@ msgstr "Connessione chiusa prematuramente" #~ msgid "Unable to find hash sum for '%s' in Release file" #~ msgstr "Impossibile trovare la somma hash per \"%s\" nel file Release" + +#~ msgid "Can not read mirror file '%s'" +#~ msgstr "Impossibile leggere il file mirror \"%s\"" diff --git a/test/integration/test-bug-611729-mark-as-manual b/test/integration/test-bug-611729-mark-as-manual index 4e3e2fa0b..9cf01610c 100755 --- a/test/integration/test-bug-611729-mark-as-manual +++ b/test/integration/test-bug-611729-mark-as-manual @@ -48,11 +48,17 @@ b is already the newest version. 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget install b -d testmarkedauto 'b' +rm rootdir/var/log/apt/history.log + aptget install b --reinstall -y -qq 2>&1 > /dev/null testdpkgnotinstalled a testdpkginstalled b c testmarkedauto 'b' +sed -i rootdir/var/log/apt/history.log -e '/^Commandline: / d' -e '/^Start-Date: / d' -e '/^End-Date: / d' +testfileequal 'rootdir/var/log/apt/history.log' ' +Reinstall: b:i386 (1.0)' + testequal 'Reading package lists... Building dependency tree... Reading state information... |