From 6d3176fbe8483df9995e639a49aaf5f6f6fd52ee Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 25 Nov 2009 20:22:36 +0100 Subject: use long instead of short for {Ver,Desc}File size in pkgcache.h patch from Víctor Manuel Jáquez Leal, thanks! (Closes: #538917) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debian/changelog | 3 +++ 1 file changed, 3 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index fb82eedd4..3e637bcef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -54,6 +54,9 @@ apt (0.7.25) UNRELEASED; urgency=low (Closes: #463354) which should speed up a bit. Thanks! * apt-pkg/contrib/mmap.{cc,h}: - extend it to have a growable flag - unused now but maybe... + * apt-pkg/pkgcache.h: + - use long instead of short for {Ver,Desc}File size, + patch from Víctor Manuel Jáquez Leal, thanks! (Closes: #538917) [ Chris Leick ] * doc/ various manpages: -- cgit v1.2.3-70-g09d2 From 8a3207f42741ce9ccf68f9a0e6528622f8f6e6c2 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 25 Nov 2009 21:57:51 +0100 Subject: allow also to skip the last patch if target is reached in acquire-item.cc, thanks Bernhard R. Link! (Closes: #545699) --- apt-pkg/acquire-item.cc | 14 +++++++++++--- apt-pkg/acquire-item.h | 5 +++++ debian/changelog | 3 +++ 3 files changed, 19 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index afb3daad3..10e80eb56 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -274,7 +274,7 @@ bool pkgAcqDiffIndex::ParseDiffIndex(string IndexDiffFile) /*{{{*/ if(last_space != string::npos) Description.erase(last_space, Description.size()-last_space); new pkgAcqIndexDiffs(Owner, RealURI, Description, Desc.ShortDesc, - ExpectedHash, available_patches); + ExpectedHash, ServerSha1, available_patches); Complete = false; Status = StatDone; Dequeue(); @@ -342,9 +342,10 @@ void pkgAcqDiffIndex::Done(string Message,unsigned long Size,string Md5Hash, /*{ pkgAcqIndexDiffs::pkgAcqIndexDiffs(pkgAcquire *Owner, string URI,string URIDesc,string ShortDesc, HashString ExpectedHash, + string ServerSha1, vector diffs) : Item(Owner), RealURI(URI), ExpectedHash(ExpectedHash), - available_patches(diffs) + available_patches(diffs), ServerSha1(ServerSha1) { DestFile = _config->FindDir("Dir::State::lists") + "partial/"; @@ -430,6 +431,13 @@ bool pkgAcqIndexDiffs::QueueNextDiff() /*{{{*/ std::clog << "QueueNextDiff: " << FinalFile << " (" << local_sha1 << ")"<::iterator I=available_patches.begin(); @@ -527,7 +535,7 @@ void pkgAcqIndexDiffs::Done(string Message,unsigned long Size,string Md5Hash, /* // see if there is more to download if(available_patches.size() > 0) { new pkgAcqIndexDiffs(Owner, RealURI, Description, Desc.ShortDesc, - ExpectedHash, available_patches); + ExpectedHash, ServerSha1, available_patches); return Finish(); } else return Finish(true); diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h index 3f073de5b..d862d0fdd 100644 --- a/apt-pkg/acquire-item.h +++ b/apt-pkg/acquire-item.h @@ -422,6 +422,10 @@ class pkgAcqIndexDiffs : public pkgAcquire::Item * off the front? */ vector available_patches; + + /** Stop applying patches when reaching that sha1 */ + string ServerSha1; + /** The current status of this patch. */ enum DiffState { @@ -475,6 +479,7 @@ class pkgAcqIndexDiffs : public pkgAcquire::Item */ pkgAcqIndexDiffs(pkgAcquire *Owner,string URI,string URIDesc, string ShortDesc, HashString ExpectedHash, + string ServerSha1, vector diffs=vector()); }; /*}}}*/ diff --git a/debian/changelog b/debian/changelog index 3e637bcef..4ac6eed27 100644 --- a/debian/changelog +++ b/debian/changelog @@ -57,6 +57,9 @@ apt (0.7.25) UNRELEASED; urgency=low * apt-pkg/pkgcache.h: - use long instead of short for {Ver,Desc}File size, patch from Víctor Manuel Jáquez Leal, thanks! (Closes: #538917) + * apt-pkg/acquire-item.cc: + - allow also to skip the last patch if target is reached, + thanks Bernhard R. Link! (Closes: #545699) [ Chris Leick ] * doc/ various manpages: -- cgit v1.2.3-70-g09d2 From d8c6a87aef1f76647d424c6b05641ac0ff53a6a8 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 25 Nov 2009 22:47:45 +0100 Subject: print an error if a new state file can't be created in apt-mark, thanks Carl Chenet! (Closes: #521289) --- cmdline/apt-mark | 8 ++++++-- debian/changelog | 3 +++ 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/cmdline/apt-mark b/cmdline/apt-mark index 226d2079b..c44ce7038 100755 --- a/cmdline/apt-mark +++ b/cmdline/apt-mark @@ -31,8 +31,12 @@ def mark_unmark_automatic(filename, action, pkgs): " mark or unmark automatic flag" # open the statefile if os.path.exists(STATE_FILE): - tagfile = apt_pkg.ParseTagFile(open(STATE_FILE)) - outfile = open(STATE_FILE+".tmp","w") + try: + tagfile = apt_pkg.ParseTagFile(open(STATE_FILE)) + outfile = open(STATE_FILE+".tmp","w") + except IOError, msg: + print "%s, are you root?" % (msg) + sys.exit(1) while tagfile.Step(): pkgname = tagfile.Section.get("Package") autoInst = tagfile.Section.get("Auto-Installed") diff --git a/debian/changelog b/debian/changelog index 4ac6eed27..51f6cdfa1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -60,6 +60,9 @@ apt (0.7.25) UNRELEASED; urgency=low * apt-pkg/acquire-item.cc: - allow also to skip the last patch if target is reached, thanks Bernhard R. Link! (Closes: #545699) + * cmdline/apt-mark: + - print an error if a new state file can't be created, + thanks Carl Chenet! (Closes: #521289) [ Chris Leick ] * doc/ various manpages: -- cgit v1.2.3-70-g09d2 From 4494239cc6d519b0b6219387ecd684b42b5c2d79 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 25 Nov 2009 23:20:12 +0100 Subject: add config setting for User-Agent in http and https to the Acquire group, thanks Timothy J. Miller! (Closes: #355782) --- debian/changelog | 3 +++ doc/apt.conf.5.xml | 7 ++++++- doc/examples/configure-index | 3 +++ methods/http.cc | 3 ++- methods/https.cc | 5 ++++- 5 files changed, 18 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 51f6cdfa1..ed67aaac2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -63,6 +63,9 @@ apt (0.7.25) UNRELEASED; urgency=low * cmdline/apt-mark: - print an error if a new state file can't be created, thanks Carl Chenet! (Closes: #521289) + * methods/http{,s}.cc + - add config setting for User-Agent to the Acquire group, + thanks Timothy J. Miller! (Closes: #355782) [ Chris Leick ] * doc/ various manpages: diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index e2db9defb..726bca2cc 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -275,7 +275,12 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; The used bandwidth can be limited with Acquire::http::Dl-Limit which accepts integer values in kilobyte. The default value is 0 which deactivates the limit and tries uses as much as possible of the bandwidth (Note that this option implicit - deactivates the download from multiple servers at the same time.) + deactivates the download from multiple servers at the same time.) + + Acquire::http::User-Agent can be used to set a different + User-Agent for the http download method as some proxies allow access for clients + only if the client uses a known identifier. + https diff --git a/doc/examples/configure-index b/doc/examples/configure-index index 27118fb7e..16e864d89 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -191,6 +191,7 @@ Acquire Max-Age "86400"; // 1 Day age on index files No-Store "false"; // Prevent the cache from storing archives Dl-Limit "7"; // 7Kb/sec maximum download rate + User-Agent "Debian APT-HTTP/1.3"; }; // HTTPS method configuration: @@ -204,6 +205,8 @@ Acquire CaPath "/etc/ssl/certs"; Verify-Host" "true"; AllowRedirect "true"; + + User-Agent "Debian APT-CURL/1.0"; }; ftp diff --git a/methods/http.cc b/methods/http.cc index 461a98406..8fcff0b5d 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -728,7 +728,8 @@ void HttpMethod::SendReq(FetchItem *Itm,CircleBuf &Out) Req += string("Authorization: Basic ") + Base64Encode(Uri.User + ":" + Uri.Password) + "\r\n"; - Req += "User-Agent: Debian APT-HTTP/1.3 ("VERSION")\r\n\r\n"; + Req += "User-Agent: " + _config->Find("Acquire::http::User-Agent", + "Debian APT-HTTP/1.3 ("VERSION")") + "\r\n\r\n"; if (Debug == true) cerr << Req << endl; diff --git a/methods/https.cc b/methods/https.cc index 79e6fea3f..e8d7bb5c6 100644 --- a/methods/https.cc +++ b/methods/https.cc @@ -209,7 +209,10 @@ bool HttpsMethod::Fetch(FetchItem *Itm) curl_easy_setopt(curl, CURLOPT_MAX_RECV_SPEED_LARGE, dlLimit); // set header - curl_easy_setopt(curl, CURLOPT_USERAGENT,"Debian APT-CURL/1.0 ("VERSION")"); + curl_easy_setopt(curl, CURLOPT_USERAGENT, + _config->Find("Acquire::https::User-Agent", + _config->Find("Acquire::http::User-Agent", + "Debian APT-CURL/1.0 ("VERSION")"))); // set timeout int timeout = _config->FindI("Acquire::http::Timeout",120); -- cgit v1.2.3-70-g09d2 From c0d438474bac961897f9e9472356222f79350c39 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 25 Nov 2009 23:29:57 +0100 Subject: add https options which default to the ones from http for the https method as this is more sane than using only the http options without a possibility to override these for https. --- debian/changelog | 2 + doc/apt.conf.5.xml | 8 ++-- doc/examples/configure-index | 33 ++++++++++---- methods/https.cc | 100 +++++++++++++++++++------------------------ 4 files changed, 76 insertions(+), 67 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index ed67aaac2..1bd34e522 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,7 @@ apt (0.7.25) UNRELEASED; urgency=low * doc/po4a.conf: activate translation of guide.sgml and offline.sgml * doc/apt.conf.5.xml: - provide a few more details about APT::Immediate-Configure + - briefly document the behaviour of the new https options * doc/sources.list.5.xml: - add note about additional apt-transport-methods * doc/apt-mark.8.xml: @@ -66,6 +67,7 @@ apt (0.7.25) UNRELEASED; urgency=low * methods/http{,s}.cc - add config setting for User-Agent to the Acquire group, thanks Timothy J. Miller! (Closes: #355782) + - add https options which default to http ones (Closes: #557085) [ Chris Leick ] * doc/ various manpages: diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index 726bca2cc..d7ad51cfb 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -284,9 +284,11 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; https - HTTPS URIs. Cache-control and proxy options are the same as for - http method. - Pipeline-Depth option is not supported yet. + HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and + proxy options are the same as for http method and will also + default to the options from the http method if they are not + explicitly set for https. Pipeline-Depth option is not + supported yet. CaInfo suboption specifies place of file that holds info about trusted certificates. diff --git a/doc/examples/configure-index b/doc/examples/configure-index index 16e864d89..7e86b3d4a 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -194,19 +194,34 @@ Acquire User-Agent "Debian APT-HTTP/1.3"; }; - // HTTPS method configuration: - // - uses the http proxy config - // - uses the http cache-control values - // - uses the http Dl-Limit values - https + + + // HTTPS method configuration: uses the http + // - proxy config + // - cache-control values + // - Dl-Limit, Timout, ... values + // if not set explicit for https + // + // see /usr/share/doc/apt/examples/apt-https-method-example.conf.gz + // for more examples + https { Verify-Peer "false"; SslCert "/etc/apt/some.pem"; - CaPath "/etc/ssl/certs"; - Verify-Host" "true"; - AllowRedirect "true"; + CaPath "/etc/ssl/certs"; + Verify-Host" "true"; + AllowRedirect "true"; + + Timeout "120"; + AllowRedirect "true"; + + // Cache Control. Note these do not work with Squid 2.0.2 + No-Cache "false"; + Max-Age "86400"; // 1 Day age on index files + No-Store "false"; // Prevent the cache from storing archives + Dl-Limit "7"; // 7Kb/sec maximum download rate - User-Agent "Debian APT-CURL/1.0"; + User-Agent "Debian APT-CURL/1.0"; }; ftp diff --git a/methods/https.cc b/methods/https.cc index e8d7bb5c6..18ecfd3d2 100644 --- a/methods/https.cc +++ b/methods/https.cc @@ -1,4 +1,4 @@ -// -*- mode: cpp; mode: fold -*- +//-*- mode: cpp; mode: fold -*- // Description /*{{{*/ // $Id: http.cc,v 1.59 2004/05/08 19:42:35 mdz Exp $ /* ###################################################################### @@ -56,54 +56,38 @@ HttpsMethod::progress_callback(void *clientp, double dltotal, double dlnow, return 0; } -void HttpsMethod::SetupProxy() -{ - URI ServerName = Queue->Uri; - - // Determine the proxy setting - string SpecificProxy = _config->Find("Acquire::http::Proxy::" + ServerName.Host); - if (!SpecificProxy.empty()) - { - if (SpecificProxy == "DIRECT") - Proxy = ""; - else - Proxy = SpecificProxy; - } - else - { - string DefProxy = _config->Find("Acquire::http::Proxy"); - if (!DefProxy.empty()) - { - Proxy = DefProxy; - } - else - { - char* result = getenv("http_proxy"); - Proxy = result ? result : ""; - } - } - - // Parse no_proxy, a , separated list of domains - if (getenv("no_proxy") != 0) - { - if (CheckDomainList(ServerName.Host,getenv("no_proxy")) == true) - Proxy = ""; - } - - // Determine what host and port to use based on the proxy settings - string Host; - if (Proxy.empty() == true || Proxy.Host.empty() == true) - { - } - else - { - if (Proxy.Port != 0) - curl_easy_setopt(curl, CURLOPT_PROXYPORT, Proxy.Port); - curl_easy_setopt(curl, CURLOPT_PROXY, Proxy.Host.c_str()); - } -} - - +void HttpsMethod::SetupProxy() { /*{{{*/ + URI ServerName = Queue->Uri; + + // Determine the proxy setting - try https first, fallback to http and use env at last + string UseProxy = _config->Find("Acquire::https::Proxy::" + ServerName.Host, + _config->Find("Acquire::http::Proxy::" + ServerName.Host)); + + if (UseProxy.empty() == true) + UseProxy = _config->Find("Acquire::https::Proxy", _config->Find("Acquire::http::Proxy")); + + // User want to use NO proxy, so nothing to setup + if (UseProxy == "DIRECT") + return; + + if (UseProxy.empty() == false) { + // Parse no_proxy, a comma (,) separated list of domains we don't want to use + // a proxy for so we stop right here if it is in the list + if (getenv("no_proxy") != 0 && CheckDomainList(ServerName.Host,getenv("no_proxy")) == true) + return; + } else { + const char* result = getenv("http_proxy"); + UseProxy = result == NULL ? "" : result; + } + + // Determine what host and port to use based on the proxy settings + if (UseProxy.empty() == false) { + Proxy = UseProxy; + if (Proxy.Port != 1) + curl_easy_setopt(curl, CURLOPT_PROXYPORT, Proxy.Port); + curl_easy_setopt(curl, CURLOPT_PROXY, Proxy.Host.c_str()); + } +} /*}}}*/ // HttpsMethod::Fetch - Fetch an item /*{{{*/ // --------------------------------------------------------------------- /* This adds an item to the pipeline. We keep the pipeline at a fixed @@ -189,12 +173,15 @@ bool HttpsMethod::Fetch(FetchItem *Itm) curl_easy_setopt(curl, CURLOPT_SSLVERSION, final_version); // cache-control - if(_config->FindB("Acquire::http::No-Cache",false) == false) + if(_config->FindB("Acquire::https::No-Cache", + _config->FindB("Acquire::http::No-Cache",false)) == false) { // cache enabled - if (_config->FindB("Acquire::http::No-Store",false) == true) + if (_config->FindB("Acquire::https::No-Store", + _config->FindB("Acquire::http::No-Store",false)) == true) headers = curl_slist_append(headers,"Cache-Control: no-store"); - ioprintf(ss, "Cache-Control: max-age=%u", _config->FindI("Acquire::http::Max-Age",0)); + ioprintf(ss, "Cache-Control: max-age=%u", _config->FindI("Acquire::https::Max-Age", + _config->FindI("Acquire::http::Max-Age",0))); headers = curl_slist_append(headers, ss.str().c_str()); } else { // cache disabled by user @@ -204,7 +191,8 @@ bool HttpsMethod::Fetch(FetchItem *Itm) curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers); // speed limit - int dlLimit = _config->FindI("Acquire::http::Dl-Limit",0)*1024; + int dlLimit = _config->FindI("Acquire::https::Dl-Limit", + _config->FindI("Acquire::http::Dl-Limit",0))*1024; if (dlLimit > 0) curl_easy_setopt(curl, CURLOPT_MAX_RECV_SPEED_LARGE, dlLimit); @@ -215,12 +203,14 @@ bool HttpsMethod::Fetch(FetchItem *Itm) "Debian APT-CURL/1.0 ("VERSION")"))); // set timeout - int timeout = _config->FindI("Acquire::http::Timeout",120); + int timeout = _config->FindI("Acquire::https::Timeout", + _config->FindI("Acquire::http::Timeout",120)); curl_easy_setopt(curl, CURLOPT_TIMEOUT, timeout); curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, timeout); // set redirect options and default to 10 redirects - bool AllowRedirect = _config->FindI("Acquire::https::AllowRedirect", true); + bool AllowRedirect = _config->FindB("Acquire::https::AllowRedirect", + _config->FindB("Acquire::http::AllowRedirect",true)); curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, AllowRedirect); curl_easy_setopt(curl, CURLOPT_MAXREDIRS, 10); -- cgit v1.2.3-70-g09d2 From 32e994d9c891ba379af7b292eeb81b4402d3f2af Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 25 Nov 2009 23:40:36 +0100 Subject: print an error and exit if python-apt is not installed for apt-mark, thanks Carl Chenet! (Closes: #521284) --- cmdline/apt-mark | 7 ++++--- debian/changelog | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/cmdline/apt-mark b/cmdline/apt-mark index c44ce7038..3a818a3db 100755 --- a/cmdline/apt-mark +++ b/cmdline/apt-mark @@ -2,13 +2,14 @@ from optparse import OptionParser +import sys +import os.path + try: import apt_pkg except ImportError: print "Error importing apt_pkg, is python-apt installed?" - -import sys -import os.path + sys.exit(1) actions = { "markauto" : 1, "unmarkauto": 0 diff --git a/debian/changelog b/debian/changelog index 1bd34e522..0cfb5ff30 100644 --- a/debian/changelog +++ b/debian/changelog @@ -64,6 +64,8 @@ apt (0.7.25) UNRELEASED; urgency=low * cmdline/apt-mark: - print an error if a new state file can't be created, thanks Carl Chenet! (Closes: #521289) + - print an error and exit if python-apt is not installed, + thanks Carl Chenet! (Closes: #521284) * methods/http{,s}.cc - add config setting for User-Agent to the Acquire group, thanks Timothy J. Miller! (Closes: #355782) -- cgit v1.2.3-70-g09d2 From 45df0ad2aab7d019cec855ba2cfe7ecdd0f8c7c8 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 26 Nov 2009 22:23:08 +0100 Subject: [BREAK] add possibility to download and use multiply Translation files, configurable with Acquire::Languages accessable with APT::Configuration::getLanguages() and as always with documentation in apt.conf. The commit also includes a very very simple testapp. --- apt-pkg/aptconfiguration.cc | 136 +++++++++++++++++++++++++++++++++++++++ apt-pkg/aptconfiguration.h | 27 ++++++++ apt-pkg/deb/debindexfile.cc | 29 +++++---- apt-pkg/deb/debindexfile.h | 5 +- apt-pkg/deb/deblistparser.cc | 17 ++++- apt-pkg/deb/debmetaindex.cc | 17 ++++- apt-pkg/deb/debrecords.cc | 12 +++- apt-pkg/indexfile.cc | 61 ++++++------------ apt-pkg/pkgcache.cc | 26 +++++--- debian/changelog | 2 + doc/apt.conf.5.xml | 24 ++++++- doc/examples/configure-index | 9 +++ test/libapt/getlanguages_test.cc | 91 ++++++++++++++++++++++++++ test/libapt/makefile | 13 ++++ 14 files changed, 391 insertions(+), 78 deletions(-) create mode 100644 test/libapt/getlanguages_test.cc create mode 100644 test/libapt/makefile (limited to 'debian') diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc index 45ae9bed5..899004d9f 100644 --- a/apt-pkg/aptconfiguration.cc +++ b/apt-pkg/aptconfiguration.cc @@ -87,4 +87,140 @@ const Configuration::getCompressionTypes(bool const &Cached) { return types; } /*}}}*/ +// GetLanguages - Return Vector of Language Codes /*{{{*/ +// --------------------------------------------------------------------- +/* return a vector of language codes in the prefered order. + the special word "environment" will be replaced with the long and the short + code of the local settings and it will be insured that this will not add + duplicates. So in an german local the setting "environment, de_DE, en, de" + will result in "de_DE, de, en". + The special word "none" is the stopcode for the not-All code vector */ +std::vector const Configuration::getLanguages(bool const &All, + bool const &Cached, char const * const Locale) { + using std::string; + + // The detection is boring and has a lot of cornercases, + // so we cache the results to calculated it only once. + std::vector static allCodes; + std::vector static codes; + + // we have something in the cache + if (codes.empty() == false || allCodes.empty() == false) { + if (Cached == true) { + if(All == true && allCodes.empty() == false) + return allCodes; + else + return codes; + } else { + allCodes.clear(); + codes.clear(); + } + } + + // get the environment language code + // we extract both, a long and a short code and then we will + // check if we actually need both (rare) or if the short is enough + string const envMsg = string(Locale == 0 ? std::setlocale(LC_MESSAGES, NULL) : Locale); + size_t const lenShort = (envMsg.find('_') != string::npos) ? envMsg.find('_') : 2; + size_t const lenLong = (envMsg.find('.') != string::npos) ? envMsg.find('.') : (lenShort + 3); + + string envLong = envMsg.substr(0,lenLong); + string const envShort = envLong.substr(0,lenShort); + bool envLongIncluded = true, envShortIncluded = false; + + // first cornercase: LANG=C, so we use only "en" Translation + if (envLong == "C") { + codes.push_back("en"); + return codes; + } + + if (envLong != envShort) { + // to save the servers from unneeded queries, we only try also long codes + // for languages it is realistic to have a long code translation file... + char const *needLong[] = { "cs", "en", "pt", "sv", "zh", NULL }; + for (char const **l = needLong; *l != NULL; l++) + if (envShort.compare(*l) == 0) { + envLongIncluded = false; + break; + } + } + + // we don't add the long code, but we allow the user to do so + if (envLongIncluded == true) + envLong.clear(); + + // FIXME: Remove support for the old APT::Acquire::Translation + // it was undocumented and so it should be not very widthly used + string const oldAcquire = _config->Find("APT::Acquire::Translation",""); + if (oldAcquire.empty() == false && oldAcquire != "environment") { + if (oldAcquire != "none") + codes.push_back(oldAcquire); + return codes; + } + + // Support settings like Acquire::Translation=none on the command line to + // override the configuration settings vector of languages. + string const forceLang = _config->Find("Acquire::Languages",""); + if (forceLang.empty() == false) { + if (forceLang == "environment") { + if (envLongIncluded == false) + codes.push_back(envLong); + if (envShortIncluded == false) + codes.push_back(envShort); + return codes; + } else if (forceLang != "none") + codes.push_back(forceLang); + return codes; + } + + std::vector const lang = _config->FindVector("Acquire::Languages"); + // the default setting -> "environment, en" + if (lang.empty() == true) { + if (envLongIncluded == false) + codes.push_back(envLong); + if (envShortIncluded == false) + codes.push_back(envShort); + if (envShort != "en") + codes.push_back("en"); + return codes; + } + + // the configs define the order, so add the environment + // then needed and ensure the codes are not listed twice. + bool noneSeen = false; + for (std::vector::const_iterator l = lang.begin(); + l != lang.end(); l++) { + if (*l == "environment") { + if (envLongIncluded == true && envShortIncluded == true) + continue; + if (envLongIncluded == false) { + envLongIncluded = true; + if (noneSeen == false) + codes.push_back(envLong); + allCodes.push_back(envLong); + } + if (envShortIncluded == false) { + envShortIncluded = true; + if (noneSeen == false) + codes.push_back(envShort); + allCodes.push_back(envShort); + } + continue; + } else if (*l == "none") { + noneSeen = true; + continue; + } else if ((envLongIncluded == true && *l == envLong) || + (envShortIncluded == true && *l == envShort)) + continue; + + if (noneSeen == false) + codes.push_back(*l); + allCodes.push_back(*l); + } + if (All == true) + return allCodes; + else + return codes; +} + /*}}}*/ } diff --git a/apt-pkg/aptconfiguration.h b/apt-pkg/aptconfiguration.h index 6a123adce..f2f04a39b 100644 --- a/apt-pkg/aptconfiguration.h +++ b/apt-pkg/aptconfiguration.h @@ -39,6 +39,33 @@ public: /*{{{*/ * \return a vector of (all) Language Codes in the prefered usage order */ std::vector static const getCompressionTypes(bool const &Cached = true); + + /** \brief Returns a vector of Language Codes + * + * Languages can be defined with their two or five chars long code. + * This methods handles the various ways to set the prefered codes, + * honors the environment and ensures that the codes are not listed twice. + * + * The special word "environment" will be replaced with the long and the short + * code of the local settings and it will be insured that this will not add + * duplicates. So in an german local the setting "environment, de_DE, en, de" + * will result in "de_DE, de, en". + * + * Another special word is "none" which separates the prefered from all codes + * in this setting. So setting and method can be used to get codes the user want + * to see or to get all language codes APT (should) have Translations available. + * + * \param All return all codes or only codes for languages we want to use + * \param Cached saves the result so we need to calculated it only once + * this parameter should ony be used for testing purposes. + * \param Locale don't get the locale from the system but use this one instead + * this parameter should ony be used for testing purposes. + * + * \return a vector of (all) Language Codes in the prefered usage order + */ + std::vector static const getLanguages(bool const &All = false, + bool const &Cached = true, char const * const Locale = 0); + /*}}}*/ }; /*}}}*/ diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc index ed7633803..5beb83665 100644 --- a/apt-pkg/deb/debindexfile.cc +++ b/apt-pkg/deb/debindexfile.cc @@ -319,10 +319,11 @@ pkgCache::PkgFileIterator debPackagesIndex::FindInCache(pkgCache &Cache) const // TranslationsIndex::debTranslationsIndex - Contructor /*{{{*/ // --------------------------------------------------------------------- /* */ -debTranslationsIndex::debTranslationsIndex(string URI,string Dist,string Section) : - pkgIndexFile(true), URI(URI), Dist(Dist), Section(Section) -{ -} +debTranslationsIndex::debTranslationsIndex(string URI,string Dist,string Section, + char const * const Translation) : + pkgIndexFile(true), URI(URI), Dist(Dist), Section(Section), + Language(Translation) +{} /*}}}*/ // TranslationIndex::Trans* - Return the URI to the translation files /*{{{*/ // --------------------------------------------------------------------- @@ -355,8 +356,8 @@ string debTranslationsIndex::IndexURI(const char *Type) const bool debTranslationsIndex::GetIndexes(pkgAcquire *Owner) const { if (TranslationsAvailable()) { - string TranslationFile = "Translation-" + LanguageCode(); - new pkgAcqIndexTrans(Owner, IndexURI(LanguageCode().c_str()), + string const TranslationFile = string("Translation-").append(Language); + new pkgAcqIndexTrans(Owner, IndexURI(Language), Info(TranslationFile.c_str()), TranslationFile); } @@ -375,7 +376,7 @@ string debTranslationsIndex::Describe(bool Short) const snprintf(S,sizeof(S),"%s",Info(TranslationFile().c_str()).c_str()); else snprintf(S,sizeof(S),"%s (%s)",Info(TranslationFile().c_str()).c_str(), - IndexFile(LanguageCode().c_str()).c_str()); + IndexFile(Language).c_str()); return S; } /*}}}*/ @@ -397,20 +398,20 @@ string debTranslationsIndex::Info(const char *Type) const return Info; } /*}}}*/ -bool debTranslationsIndex::HasPackages() const +bool debTranslationsIndex::HasPackages() const /*{{{*/ { if(!TranslationsAvailable()) return false; - return FileExists(IndexFile(LanguageCode().c_str())); + return FileExists(IndexFile(Language)); } - + /*}}}*/ // TranslationsIndex::Exists - Check if the index is available /*{{{*/ // --------------------------------------------------------------------- /* */ bool debTranslationsIndex::Exists() const { - return FileExists(IndexFile(LanguageCode().c_str())); + return FileExists(IndexFile(Language)); } /*}}}*/ // TranslationsIndex::Size - Return the size of the index /*{{{*/ @@ -419,7 +420,7 @@ bool debTranslationsIndex::Exists() const unsigned long debTranslationsIndex::Size() const { struct stat S; - if (stat(IndexFile(LanguageCode().c_str()).c_str(),&S) != 0) + if (stat(IndexFile(Language).c_str(),&S) != 0) return 0; return S.st_size; } @@ -430,7 +431,7 @@ unsigned long debTranslationsIndex::Size() const bool debTranslationsIndex::Merge(pkgCacheGenerator &Gen,OpProgress &Prog) const { // Check the translation file, if in use - string TranslationFile = IndexFile(LanguageCode().c_str()); + string TranslationFile = IndexFile(Language); if (TranslationsAvailable() && FileExists(TranslationFile)) { FileFd Trans(TranslationFile,FileFd::ReadOnly); @@ -462,7 +463,7 @@ bool debTranslationsIndex::Merge(pkgCacheGenerator &Gen,OpProgress &Prog) const /* */ pkgCache::PkgFileIterator debTranslationsIndex::FindInCache(pkgCache &Cache) const { - string FileName = IndexFile(LanguageCode().c_str()); + string FileName = IndexFile(Language); pkgCache::PkgFileIterator File = Cache.FileBegin(); for (; File.end() == false; File++) diff --git a/apt-pkg/deb/debindexfile.h b/apt-pkg/deb/debindexfile.h index b0012c96b..c0e8d7d8e 100644 --- a/apt-pkg/deb/debindexfile.h +++ b/apt-pkg/deb/debindexfile.h @@ -77,12 +77,13 @@ class debTranslationsIndex : public pkgIndexFile string URI; string Dist; string Section; + const char * const Language; string Info(const char *Type) const; string IndexFile(const char *Type) const; string IndexURI(const char *Type) const; - inline string TranslationFile() const {return "Translation-" + LanguageCode();}; + inline string TranslationFile() const {return string("Translation-").append(Language);}; public: @@ -99,7 +100,7 @@ class debTranslationsIndex : public pkgIndexFile virtual bool Merge(pkgCacheGenerator &Gen,OpProgress &Prog) const; virtual pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const; - debTranslationsIndex(string URI,string Dist,string Section); + debTranslationsIndex(string URI,string Dist,string Section, char const * const Language); }; class debSourcesIndex : public pkgIndexFile diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index 517b771a5..16e6ee332 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -129,10 +130,11 @@ bool debListParser::NewVersion(pkgCache::VerIterator Ver) only describe package properties */ string debListParser::Description() { - if (DescriptionLanguage().empty()) + string const lang = DescriptionLanguage(); + if (lang.empty()) return Section.FindS("Description"); else - return Section.FindS(("Description-" + pkgIndexFile::LanguageCode()).c_str()); + return Section.FindS(string("Description-").append(lang).c_str()); } /*}}}*/ // ListParser::DescriptionLanguage - Return the description lang string /*{{{*/ @@ -142,7 +144,16 @@ string debListParser::Description() assumed to describe original description. */ string debListParser::DescriptionLanguage() { - return Section.FindS("Description").empty() ? pkgIndexFile::LanguageCode() : ""; + if (Section.FindS("Description").empty() == false) + return ""; + + std::vector const lang = APT::Configuration::getLanguages(); + for (std::vector::const_iterator l = lang.begin(); + l != lang.end(); l++) + if (Section.FindS(string("Description-").append(*l).c_str()).empty() == false) + return *l; + + return ""; } /*}}}*/ // ListParser::Description - Return the description_md5 MD5SumValue /*{{{*/ diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc index f3ab6960c..8f28f053b 100644 --- a/apt-pkg/deb/debmetaindex.cc +++ b/apt-pkg/deb/debmetaindex.cc @@ -5,6 +5,7 @@ #include #include #include +#include #include using namespace std; @@ -170,13 +171,19 @@ bool debReleaseIndex::GetIndexes(pkgAcquire *Owner, bool GetAll) const new indexRecords (Dist)); // Queue the translations + std::vector const lang = APT::Configuration::getLanguages(true); for (vector::const_iterator I = SectionEntries.begin(); I != SectionEntries.end(); I++) { if((*I)->IsSrc) continue; - debTranslationsIndex i = debTranslationsIndex(URI,Dist,(*I)->Section); - i.GetIndexes(Owner); + + for (vector::const_iterator l = lang.begin(); + l != lang.end(); l++) + { + debTranslationsIndex i = debTranslationsIndex(URI,Dist,(*I)->Section,(*l).c_str()); + i.GetIndexes(Owner); + } } return true; @@ -202,6 +209,7 @@ vector *debReleaseIndex::GetIndexFiles() return Indexes; Indexes = new vector ; + std::vector const lang = APT::Configuration::getLanguages(true); for (vector::const_iterator I = SectionEntries.begin(); I != SectionEntries.end(); I++) { if ((*I)->IsSrc) @@ -209,7 +217,10 @@ vector *debReleaseIndex::GetIndexFiles() else { Indexes->push_back(new debPackagesIndex (URI, Dist, (*I)->Section, IsTrusted())); - Indexes->push_back(new debTranslationsIndex(URI, Dist, (*I)->Section)); + + for (vector::const_iterator l = lang.begin(); + l != lang.end(); l++) + Indexes->push_back(new debTranslationsIndex(URI,Dist,(*I)->Section,(*l).c_str())); } } diff --git a/apt-pkg/deb/debrecords.cc b/apt-pkg/deb/debrecords.cc index 8ed0bb7eb..5b8538a46 100644 --- a/apt-pkg/deb/debrecords.cc +++ b/apt-pkg/deb/debrecords.cc @@ -11,6 +11,7 @@ #include #include #include +#include #include /*}}}*/ @@ -109,13 +110,18 @@ string debRecordParser::ShortDesc() string debRecordParser::LongDesc() { string orig, dest; - char *codeset = nl_langinfo(CODESET); if (!Section.FindS("Description").empty()) orig = Section.FindS("Description").c_str(); - else - orig = Section.FindS(("Description-" + pkgIndexFile::LanguageCode()).c_str()).c_str(); + else + { + vector const lang = APT::Configuration::getLanguages(); + for (vector::const_iterator l = lang.begin(); + orig.empty() && l != lang.end(); l++) + orig = Section.FindS(string("Description-").append(*l).c_str()); + } + char const * const codeset = nl_langinfo(CODESET); if (strcmp(codeset,"UTF-8") != 0) { UTF8ToCodeset(codeset, orig, &dest); orig = dest; diff --git a/apt-pkg/indexfile.cc b/apt-pkg/indexfile.cc index 08f71feb0..37be87055 100644 --- a/apt-pkg/indexfile.cc +++ b/apt-pkg/indexfile.cc @@ -8,9 +8,9 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ -#include #include #include +#include #include #include @@ -66,28 +66,20 @@ string pkgIndexFile::SourceInfo(pkgSrcRecords::Parser const &Record, return string(); } /*}}}*/ -// IndexFile::TranslationsAvailable - Check if will use Translation /*{{{*/ +// IndexFile::TranslationsAvailable - Check if will use Translation /*{{{*/ // --------------------------------------------------------------------- /* */ -bool pkgIndexFile::TranslationsAvailable() -{ - const string Translation = _config->Find("APT::Acquire::Translation"); - - if (Translation.compare("none") != 0) - return CheckLanguageCode(LanguageCode().c_str()); - else - return false; +bool pkgIndexFile::TranslationsAvailable() { + return (APT::Configuration::getLanguages().empty() != true); } /*}}}*/ -// IndexFile::CheckLanguageCode - Check the Language Code /*{{{*/ +// IndexFile::CheckLanguageCode - Check the Language Code /*{{{*/ // --------------------------------------------------------------------- -/* */ -/* common cases: de_DE, de_DE@euro, de_DE.UTF-8, de_DE.UTF-8@euro, - de_DE.ISO8859-1, tig_ER - more in /etc/gdm/locale.conf -*/ - -bool pkgIndexFile::CheckLanguageCode(const char *Lang) +/* No intern need for this method anymore as the check for correctness + is already done in getLanguages(). Note also that this check is + rather bad (doesn't take three character like ast into account). + TODO: Remove method with next API break */ +__attribute__ ((deprecated)) bool pkgIndexFile::CheckLanguageCode(const char *Lang) { if (strlen(Lang) == 2 || (strlen(Lang) == 5 && Lang[2] == '_')) return true; @@ -98,31 +90,14 @@ bool pkgIndexFile::CheckLanguageCode(const char *Lang) return false; } /*}}}*/ -// IndexFile::LanguageCode - Return the Language Code /*{{{*/ +// IndexFile::LanguageCode - Return the Language Code /*{{{*/ // --------------------------------------------------------------------- -/* return the language code */ -string pkgIndexFile::LanguageCode() -{ - const string Translation = _config->Find("APT::Acquire::Translation"); - - if (Translation.compare("environment") == 0) - { - string lang = std::setlocale(LC_MESSAGES,NULL); - - // we have a mapping of the language codes that contains all the language - // codes that need the country code as well - // (like pt_BR, pt_PT, sv_SE, zh_*, en_*) - const char *need_full_langcode[] = { "pt","sv","zh","en", NULL }; - for(const char **s = need_full_langcode;*s != NULL; s++) - if(lang.find(*s) == 0) - return lang.substr(0,5); - - if(lang.size() > 2) - return lang.substr(0,2); - else - return lang; - } - else - return Translation; +/* As we have now possibly more than one LanguageCode this method is + supersided by a) private classmembers or b) getLanguages(). + TODO: Remove method with next API break */ +__attribute__ ((deprecated)) string pkgIndexFile::LanguageCode() { + if (TranslationsAvailable() == false) + return ""; + return APT::Configuration::getLanguages()[0]; } /*}}}*/ diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index b0ce6e598..997ff51fe 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -22,11 +22,11 @@ // Include Files /*{{{*/ #include #include -#include #include #include #include #include +#include #include @@ -674,14 +674,22 @@ string pkgCache::PkgFileIterator::RelStr() */ pkgCache::DescIterator pkgCache::VerIterator::TranslatedDescription() const { - pkgCache::DescIterator DescDefault = DescriptionList(); - pkgCache::DescIterator Desc = DescDefault; - for (; Desc.end() == false; Desc++) - if (pkgIndexFile::LanguageCode() == Desc.LanguageCode()) - break; - if (Desc.end() == true) - Desc = DescDefault; - return Desc; + std::vector const lang = APT::Configuration::getLanguages(); + for (std::vector::const_iterator l = lang.begin(); + l != lang.end(); l++) + { + pkgCache::DescIterator DescDefault = DescriptionList(); + pkgCache::DescIterator Desc = DescDefault; + + for (; Desc.end() == false; Desc++) + if (*l == Desc.LanguageCode()) + break; + if (Desc.end() == true) + Desc = DescDefault; + return Desc; + } + + return DescriptionList(); }; /*}}}*/ diff --git a/debian/changelog b/debian/changelog index 0cfb5ff30..07d9c0303 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,8 @@ apt (0.7.25) UNRELEASED; urgency=low Closes: #552606 [ David Kalnischkies ] + * [BREAK] add possibility to download and use multiply + Translation files, configurable with Acquire::Translation * apt-pkg/packagemanager.cc: - better debug output for ImmediateAdd with depth and why - improve the message shown for failing immediate configuration diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index d7ad51cfb..777630e14 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -142,7 +142,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; Default release to install packages from if more than one version available. Contains release name, codename or release version. Examples: 'stable', 'testing', 'unstable', 'lenny', 'squeeze', '4.0', '5.0*'. See also &apt-preferences;. - + Ignore-Hold Ignore Held packages; This global option causes the problem resolver to ignore held packages in its decision making. @@ -392,6 +392,27 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; these warnings are most of the time false negatives. Future versions will maybe include a way to really prefer uncompressed files to support the usage of local mirrors. + + Languages + The Languages subsection controls which Translation files are downloaded + and in which order APT tries to display the Description-Translations. APT will try to display the first + available Description for the Language which is listed at first. Languages can be defined with their + short or long Languagecodes. Note that not all archives provide Translation + files for every Language - especially the long Languagecodes are rare, so please + inform you which ones are available before you set here impossible values. + The default list includes "environment" and "en". "environment" has a special meaning here: + It will be replaced at runtime with the languagecodes extracted from the LC_MESSAGES enviroment variable. + It will also ensure that these codes are not included twice in the list. If LC_MESSAGES + is set to "C" only the Translation-en file (if available) will be used. + To force apt to use no Translation file use the setting Acquire::Languages=none. "none" + is another special meaning code which will stop the search for a fitting Translation file. + This can be used by the system administrator to let APT know that it should download also this files without + actually use them if not the environment specifies this languages. So the following example configuration will + result in the order "en, de" in an english and in "de, en" in a german localization. Note that "fr" is downloaded, + but not used if APT is not used in a french localization, in such an environment the order would be "fr, de, en". + Acquire::Languages { "environment"; "de"; "en"; "none"; "fr"; }; + + @@ -983,6 +1004,7 @@ is commented. --> + diff --git a/doc/examples/configure-index b/doc/examples/configure-index index 7e86b3d4a..05826feaa 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -273,6 +273,15 @@ Acquire Order { "gz"; "lzma"; "bz2"; }; }; + + Languages + { + "environment"; + "de"; + "en"; + "none"; + "fr"; + }; }; // Directory layout diff --git a/test/libapt/getlanguages_test.cc b/test/libapt/getlanguages_test.cc new file mode 100644 index 000000000..f3629df68 --- /dev/null +++ b/test/libapt/getlanguages_test.cc @@ -0,0 +1,91 @@ +#include +#include + +#include +#include +#include + +#include + +// simple helper to quickly output a vector of strings +void dumpVector(std::vector vec) { + for (std::vector::const_iterator v = vec.begin(); + v != vec.end(); v++) + std::cout << *v << std::endl; +} + +int main(int argc,char *argv[]) +{ + std::vector vec = APT::Configuration::getLanguages(false, false, "de_DE.UTF-8"); + assert(vec.size() == 2); + assert(vec[0] == "de"); + assert(vec[1] == "en"); + + // Special: Check if the cache is actually in use + vec = APT::Configuration::getLanguages(false, true, "en_GB.UTF-8"); + assert(vec.size() == 2); + assert(vec[0] == "de"); + assert(vec[1] == "en"); + + vec = APT::Configuration::getLanguages(false, false, "en_GB.UTF-8"); + assert(vec.size() == 2); + assert(vec[0] == "en_GB"); + assert(vec[1] == "en"); + + vec = APT::Configuration::getLanguages(false, false, "pt_PR.UTF-8"); + assert(vec.size() == 3); + assert(vec[0] == "pt_PR"); + assert(vec[1] == "pt"); + assert(vec[2] == "en"); + + vec = APT::Configuration::getLanguages(false, false, "ast_DE.UTF-8"); // bogus, but syntactical correct + assert(vec.size() == 2); + assert(vec[0] == "ast"); + assert(vec[1] == "en"); + + vec = APT::Configuration::getLanguages(false, false, "C"); + assert(vec.size() == 1); + assert(vec[0] == "en"); + + _config->Set("Acquire::Languages::1", "environment"); + _config->Set("Acquire::Languages::2", "en"); + vec = APT::Configuration::getLanguages(false, false, "de_DE.UTF-8"); + assert(vec.size() == 2); + assert(vec[0] == "de"); + assert(vec[1] == "en"); + + _config->Set("Acquire::Languages::3", "de"); + vec = APT::Configuration::getLanguages(false, false, "de_DE.UTF-8"); + assert(vec.size() == 2); + assert(vec[0] == "de"); + assert(vec[1] == "en"); + + _config->Set("Acquire::Languages::1", "none"); + vec = APT::Configuration::getLanguages(false, false, "de_DE.UTF-8"); + assert(vec.size() == 0); + vec = APT::Configuration::getLanguages(true, false, "de_DE.UTF-8"); + assert(vec[0] == "en"); + assert(vec[1] == "de"); + + _config->Set("Acquire::Languages::1", "fr"); + _config->Set("Acquire::Languages", "de_DE"); + vec = APT::Configuration::getLanguages(false, false, "de_DE.UTF-8"); + assert(vec.size() == 1); + assert(vec[0] == "de_DE"); + + _config->Set("Acquire::Languages", "none"); + vec = APT::Configuration::getLanguages(true, false, "de_DE.UTF-8"); + assert(vec.size() == 0); + + _config->Set("Acquire::Languages", ""); + //FIXME: Remove support for this deprecated setting + _config->Set("APT::Acquire::Translation", "ast_DE"); + vec = APT::Configuration::getLanguages(true, false, "de_DE.UTF-8"); + assert(vec.size() == 1); + assert(vec[0] == "ast_DE"); + _config->Set("APT::Acquire::Translation", "none"); + vec = APT::Configuration::getLanguages(true, false, "de_DE.UTF-8"); + assert(vec.size() == 0); + + return 0; +} diff --git a/test/libapt/makefile b/test/libapt/makefile new file mode 100644 index 000000000..f61a95f3d --- /dev/null +++ b/test/libapt/makefile @@ -0,0 +1,13 @@ +# -*- make -*- +BASE=../.. +SUBDIR=test/libapt +BASENAME=_libapt_test + +# Bring in the default rules +include ../../buildlib/defaults.mak + +# Program for testing getLanguageCode +PROGRAM = getLanguages${BASENAME} +SLIBS = -lapt-pkg +SOURCE = getlanguages_test.cc +include $(PROGRAM_H) -- cgit v1.2.3-70-g09d2 From 9c24493fabefe1a2549eaab81770dbe6f24916d9 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 26 Nov 2009 23:46:49 +0100 Subject: Add APT::FTPArchive::LongDescription to disable the inclusion of the LongDescriptions in the generated Packages file. --- debian/changelog | 2 ++ doc/apt-ftparchive.1.xml | 13 +++++++++++-- ftparchive/writer.cc | 21 +++++++++++++++++++-- ftparchive/writer.h | 1 + 4 files changed, 33 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 07d9c0303..7315dc571 100644 --- a/debian/changelog +++ b/debian/changelog @@ -72,6 +72,8 @@ apt (0.7.25) UNRELEASED; urgency=low - add config setting for User-Agent to the Acquire group, thanks Timothy J. Miller! (Closes: #355782) - add https options which default to http ones (Closes: #557085) + * ftparchive/writer.{cc,h}: + - add APT::FTPArchive::LongDescription to be able to disable them [ Chris Leick ] * doc/ various manpages: diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml index d4d77c68e..d47df957a 100644 --- a/doc/apt-ftparchive.1.xml +++ b/doc/apt-ftparchive.1.xml @@ -15,7 +15,7 @@ &apt-email; &apt-product; - 29 February 2004 + 17 August 2009 @@ -543,7 +543,16 @@ for i in Sections do Make the caching databases read only. Configuration Item: APT::FTPArchive::ReadOnlyDB. - + + + + This configuration option defaults to "true" and should only be set to + "false" if the Archive generated with &apt-ftparchive; also provides + Translation files. Note that it is currently not possible to create these + files with apt-ftparchive. + + + &apt-commonoptions; diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc index 293e851f5..b2ebdca8a 100644 --- a/ftparchive/writer.cc +++ b/ftparchive/writer.cc @@ -308,6 +308,7 @@ PackagesWriter::PackagesWriter(string DB,string Overrides,string ExtOverrides, DoSHA256 = _config->FindB("APT::FTPArchive::SHA256",true); DoContents = _config->FindB("APT::FTPArchive::Contents",true); NoOverride = _config->FindB("APT::FTPArchive::NoOverrideMsg",false); + LongDescription = _config->FindB("APT::FTPArchive::LongDescription",true); if (Db.Loaded() == false) DoContents = false; @@ -414,10 +415,18 @@ bool PackagesWriter::DoPackage(string FileName) NewFileName = FileName; if (PathPrefix.empty() == false) NewFileName = flCombine(PathPrefix,NewFileName); - + + /* Configuration says we don't want to include the long Description + in the package file - instead we want to ship a separated file */ + string desc; + if (LongDescription == false) { + desc = Tags.FindS("Description").append("\n"); + OverItem->FieldOverride["Description"] = desc.substr(0, desc.find('\n')).c_str(); + } + // This lists all the changes to the fields we are going to make. // (7 hardcoded + maintainer + suggests + end marker) - TFRewriteData Changes[6+2+OverItem->FieldOverride.size()+1]; + TFRewriteData Changes[6+2+OverItem->FieldOverride.size()+1+1]; unsigned int End = 0; SetTFRewriteData(Changes[End++], "Size", Size); @@ -429,6 +438,14 @@ bool PackagesWriter::DoPackage(string FileName) SetTFRewriteData(Changes[End++], "Status", 0); SetTFRewriteData(Changes[End++], "Optional", 0); + string DescriptionMd5; + if (LongDescription == false) { + MD5Summation descmd5; + descmd5.Add(desc.c_str()); + DescriptionMd5 = descmd5.Result().Value(); + SetTFRewriteData(Changes[End++], "Description-md5", DescriptionMd5.c_str()); + } + // Rewrite the maintainer field if necessary bool MaintFailed; string NewMaint = OverItem->SwapMaint(Tags.FindS("Maintainer"),MaintFailed); diff --git a/ftparchive/writer.h b/ftparchive/writer.h index 6e161c752..e76438900 100644 --- a/ftparchive/writer.h +++ b/ftparchive/writer.h @@ -86,6 +86,7 @@ class PackagesWriter : public FTWScanner bool DoSHA256; bool NoOverride; bool DoContents; + bool LongDescription; // General options string PathPrefix; -- cgit v1.2.3-70-g09d2 From 4647b1b3e5f94faae48c8b78b2d85124929b9362 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 26 Nov 2009 23:59:41 +0100 Subject: add a few closes tags to Acquire::Translation changelog --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 7315dc571..30da07d93 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,7 @@ apt (0.7.25) UNRELEASED; urgency=low [ David Kalnischkies ] * [BREAK] add possibility to download and use multiply Translation files, configurable with Acquire::Translation + (Closes: #444222, #448216, #550564) * apt-pkg/packagemanager.cc: - better debug output for ImmediateAdd with depth and why - improve the message shown for failing immediate configuration -- cgit v1.2.3-70-g09d2 From fb1e7ecf359510b263bc4acd23659024b54c17c9 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 27 Nov 2009 10:02:27 +0100 Subject: add --debian-only as alias for --diff-only for all source v3 lovers --- cmdline/apt-get.cc | 1 + debian/changelog | 1 + po/apt-all.pot | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 49fde7466..7325bbf22 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -2799,6 +2799,7 @@ int main(int argc,const char *argv[]) /*{{{*/ {0,"force-yes","APT::Get::force-yes",0}, {0,"print-uris","APT::Get::Print-URIs",0}, {0,"diff-only","APT::Get::Diff-Only",0}, + {0,"debian-only","APT::Get::Diff-Only",0}, {0,"tar-only","APT::Get::Tar-Only",0}, {0,"dsc-only","APT::Get::Dsc-Only",0}, {0,"purge","APT::Get::Purge",0}, diff --git a/debian/changelog b/debian/changelog index 8d7461b95..1de0193cf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -39,6 +39,7 @@ apt (0.7.25) UNRELEASED; urgency=low - source doesn't need the complete version for match (Closes: #245250) - source ignores versions/releases if not available (Closes: #377424) - only warn if (free) space overflows (Closes: #522238) + - add --debian-only as alias for --diff-only * methods/connect.cc: - display also strerror of "wicked" getaddrinfo errors * buildlib/configure.mak, buildlib/config.{sub,guess}: diff --git a/po/apt-all.pot b/po/apt-all.pot index 9b731cfcd..3cb5ba379 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: 2009-11-27 00:15+0100\n" +"POT-Creation-Date: 2009-11-27 09:49+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1175,7 +1175,7 @@ msgid "" " This APT has Super Cow Powers.\n" msgstr "" -#: cmdline/apt-get.cc:2866 +#: cmdline/apt-get.cc:2867 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" -- cgit v1.2.3-70-g09d2 From 164994f54fbb2283a0ad320fe34009ee9cd06f8e Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 27 Nov 2009 10:10:55 +0100 Subject: use "diff" filetype for .debian.tar.* files (Closes: #554898) in apt-pkg/deb/debsrcrecords.cc as source format v3 uses this name scheme for their "diff" files. --- apt-pkg/deb/debsrcrecords.cc | 8 +++++++- debian/changelog | 2 ++ 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/apt-pkg/deb/debsrcrecords.cc b/apt-pkg/deb/debsrcrecords.cc index 2f87c767b..bde10aa6d 100644 --- a/apt-pkg/deb/debsrcrecords.cc +++ b/apt-pkg/deb/debsrcrecords.cc @@ -135,9 +135,15 @@ bool debSrcRecordParser::Files(vector &List) string::size_type Tmp = F.Path.rfind('.',Pos); if (Tmp == string::npos) break; + if (F.Type == "tar") { + // source v3 has extension 'debian.tar.*' instead of 'diff.*' + if (string(F.Path, Tmp+1, Pos-Tmp) == "debian") + F.Type = "diff"; + break; + } F.Type = string(F.Path,Tmp+1,Pos-Tmp); - if (F.Type == "gz" || F.Type == "bz2" || F.Type == "lzma") + if (F.Type == "gz" || F.Type == "bz2" || F.Type == "lzma" || F.Type == "tar") { Pos = Tmp-1; continue; diff --git a/debian/changelog b/debian/changelog index 1de0193cf..e865671f1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -78,6 +78,8 @@ apt (0.7.25) UNRELEASED; urgency=low - add https options which default to http ones (Closes: #557085) * ftparchive/writer.{cc,h}: - add APT::FTPArchive::LongDescription to be able to disable them + * apt-pkg/deb/debsrcrecords.cc: + - use "diff" filetype for .debian.tar.* files (Closes: #554898) [ Chris Leick ] * doc/ various manpages: -- cgit v1.2.3-70-g09d2 From 1df14bc5a7011c2da0ecd1e89911c64627119883 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 28 Nov 2009 00:53:53 +0100 Subject: add AI_ADDRCONFIG to ai_flags in connect.cc as suggested by Aurelien Jarno in his response to Bernhard R. Link's patch, thanks! (Closes: #505020) --- debian/changelog | 2 ++ methods/connect.cc | 1 + 2 files changed, 3 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index e865671f1..fdd7bd24b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -42,6 +42,8 @@ apt (0.7.25) UNRELEASED; urgency=low - add --debian-only as alias for --diff-only * methods/connect.cc: - display also strerror of "wicked" getaddrinfo errors + - add AI_ADDRCONFIG to ai_flags as suggested by Aurelien Jarno + in response to Bernhard R. Link, thanks! (Closes: #505020) * buildlib/configure.mak, buildlib/config.{sub,guess}: - remove (outdated) config.{sub,guess} and use the ones provided by the new added build-dependency autotools-dev instead diff --git a/methods/connect.cc b/methods/connect.cc index 74e670ebd..adb16a199 100644 --- a/methods/connect.cc +++ b/methods/connect.cc @@ -158,6 +158,7 @@ bool Connect(string Host,int Port,const char *Service,int DefPort,int &Fd, struct addrinfo Hints; memset(&Hints,0,sizeof(Hints)); Hints.ai_socktype = SOCK_STREAM; + Hints.ai_flags = AI_ADDRCONFIG; Hints.ai_protocol = 0; // if we couldn't resolve the host before, we don't try now -- cgit v1.2.3-70-g09d2 From ff574e76beb97c101924c2d4746b5a2dbb862f19 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 28 Nov 2009 02:12:36 +0100 Subject: add APT::FTPArchive::AlwaysStat to disable the too aggressive caching if versions are build multiply times (not recommend) Patch by Christoph Goehre, thanks! (Closes: #463260) --- debian/changelog | 3 +++ doc/apt-ftparchive.1.xml | 12 ++++++++++++ doc/po/apt-doc.pot | 39 +++++++++++++++++++++++++++++---------- ftparchive/cachedb.cc | 14 +++++++++----- ftparchive/cachedb.h | 4 ++-- ftparchive/writer.cc | 5 +++-- ftparchive/writer.h | 1 + po/apt-all.pot | 24 ++++++++++++------------ 8 files changed, 71 insertions(+), 31 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index fdd7bd24b..85ee97713 100644 --- a/debian/changelog +++ b/debian/changelog @@ -80,6 +80,9 @@ apt (0.7.25) UNRELEASED; urgency=low - add https options which default to http ones (Closes: #557085) * ftparchive/writer.{cc,h}: - add APT::FTPArchive::LongDescription to be able to disable them + - add APT::FTPArchive::AlwaysStat to disable the too aggressive + caching if versions are build multiply times (not recommend) + Patch by Christoph Goehre, thanks! (Closes: #463260) * apt-pkg/deb/debsrcrecords.cc: - use "diff" filetype for .debian.tar.* files (Closes: #554898) diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml index d47df957a..e2eab0fb2 100644 --- a/doc/apt-ftparchive.1.xml +++ b/doc/apt-ftparchive.1.xml @@ -544,6 +544,18 @@ for i in Sections do Configuration Item: APT::FTPArchive::ReadOnlyDB. + + + &apt-ftparchive; caches as much as possible of metadata in it is cachedb. If packages + are recompiled and/or republished with the same version again, this will lead to problems + as the now outdated cached metadata like size and checksums will be used. With this option + enabled this will no longer happen as it will be checked if the file was changed. + Note that this option is set to "false" by default as it is not recommend + to upload multiply versions/builds of a package with the same versionnumber, so in theory + nobody will have these problems and therefore all these extra checks are useless. + + + This configuration option defaults to "true" and should only be set to diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index 46febf8ca..5172f7f84 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: 2009-11-27 00:18+0100\n" +"POT-Creation-Date: 2009-11-28 02:08+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1411,7 +1411,7 @@ msgid "" msgstr "" #. type: Content of: -#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98 apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:556 apt-get.8.xml:554 apt-sortpkgs.1.xml:64 +#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98 apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:568 apt-get.8.xml:554 apt-sortpkgs.1.xml:64 msgid "&apt-commonoptions;" msgstr "" @@ -1426,7 +1426,7 @@ msgid "&file-sourceslist; &file-statelists;" msgstr "" #. type: Content of: -#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:572 apt-get.8.xml:569 apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181 apt-sortpkgs.1.xml:69 apt.conf.5.xml:1023 apt_preferences.5.xml:622 sources.list.5.xml:233 +#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569 apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181 apt-sortpkgs.1.xml:69 apt.conf.5.xml:1023 apt_preferences.5.xml:622 sources.list.5.xml:233 msgid "See Also" msgstr "" @@ -1436,7 +1436,7 @@ msgid "&apt-conf;, &sources-list;, &apt-get;" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:576 apt-get.8.xml:575 apt-mark.8.xml:137 apt-sortpkgs.1.xml:73 +#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:588 apt-get.8.xml:575 apt-mark.8.xml:137 apt-sortpkgs.1.xml:73 msgid "Diagnostics" msgstr "" @@ -1735,7 +1735,7 @@ msgid "Just show the contents of the configuration space." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:573 apt-sortpkgs.1.xml:70 +#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:585 apt-sortpkgs.1.xml:70 msgid "&apt-conf;" msgstr "" @@ -2690,12 +2690,31 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-ftparchive.1.xml:547 -msgid "<option>APT::FTPArchive::LongDescription</option>" +msgid "<option>APT::FTPArchive::AlwaysStat</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:549 msgid "" +"&apt-ftparchive; caches as much as possible of metadata in it is cachedb. If " +"packages are recompiled and/or republished with the same version again, this " +"will lead to problems as the now outdated cached metadata like size and " +"checksums will be used. With this option enabled this will no longer happen " +"as it will be checked if the file was changed. Note that this option is set " +"to \"<literal>false</literal>\" by default as it is not recommend to upload " +"multiply versions/builds of a package with the same versionnumber, so in " +"theory nobody will have these problems and therefore all these extra checks " +"are useless." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:559 +msgid "<option>APT::FTPArchive::LongDescription</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:561 +msgid "" "This configuration option defaults to \"<literal>true</literal>\" and should " "only be set to <literal>\"false\"</literal> if the Archive generated with " "&apt-ftparchive; also provides <filename>Translation</filename> files. Note " @@ -2704,12 +2723,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:561 apt.conf.5.xml:1011 apt_preferences.5.xml:462 sources.list.5.xml:193 +#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1011 apt_preferences.5.xml:462 sources.list.5.xml:193 msgid "Examples" msgstr "" #. type: Content of: <refentry><refsect1><para><programlisting> -#: apt-ftparchive.1.xml:567 +#: apt-ftparchive.1.xml:579 #, no-wrap msgid "" "<command>apt-ftparchive</command> packages " @@ -2718,14 +2737,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:563 +#: apt-ftparchive.1.xml:575 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:577 +#: apt-ftparchive.1.xml:589 msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." diff --git a/ftparchive/cachedb.cc b/ftparchive/cachedb.cc index dfda827b6..c352aa53c 100644 --- a/ftparchive/cachedb.cc +++ b/ftparchive/cachedb.cc @@ -102,9 +102,9 @@ bool CacheDB::OpenFile() // --------------------------------------------------------------------- /* This gets the size from the database if it's there. If we need * to look at the file, also get the mtime from the file. */ -bool CacheDB::GetFileStat() +bool CacheDB::GetFileStat(bool const &doStat) { - if ((CurStat.Flags & FlSize) == FlSize) + if ((CurStat.Flags & FlSize) == FlSize && doStat == false) { /* Already worked out the file size */ } @@ -162,7 +162,7 @@ bool CacheDB::GetCurStat() // --------------------------------------------------------------------- bool CacheDB::GetFileInfo(string FileName, bool DoControl, bool DoContents, bool GenContentsOnly, - bool DoMD5, bool DoSHA1, bool DoSHA256) + bool DoMD5, bool DoSHA1, bool DoSHA256, bool const &checkMtime) { this->FileName = FileName; @@ -171,14 +171,18 @@ bool CacheDB::GetFileInfo(string FileName, bool DoControl, bool DoContents, return false; } OldStat = CurStat; - - if (GetFileStat() == false) + + if (GetFileStat(checkMtime) == false) { delete Fd; Fd = NULL; return false; } + /* if mtime changed, update CurStat from disk */ + if (checkMtime == true && OldStat.mtime != CurStat.mtime) + CurStat.Flags = FlSize; + Stats.Bytes += CurStat.FileSize; Stats.Packages++; diff --git a/ftparchive/cachedb.h b/ftparchive/cachedb.h index c10f41ecc..15add459c 100644 --- a/ftparchive/cachedb.h +++ b/ftparchive/cachedb.h @@ -63,7 +63,7 @@ class CacheDB return true; } bool OpenFile(); - bool GetFileStat(); + bool GetFileStat(bool const &doStat = false); bool GetCurStat(); bool LoadControl(); bool LoadContents(bool GenOnly); @@ -125,7 +125,7 @@ class CacheDB bool SetFile(string FileName,struct stat St,FileFd *Fd); bool GetFileInfo(string FileName, bool DoControl, bool DoContents, - bool GenContentsOnly, bool DoMD5, bool DoSHA1, bool DoSHA256); + bool GenContentsOnly, bool DoMD5, bool DoSHA1, bool DoSHA256, bool const &checkMtime = false); bool Finish(); bool Clean(); diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc index b2ebdca8a..6756021f8 100644 --- a/ftparchive/writer.cc +++ b/ftparchive/writer.cc @@ -306,6 +306,7 @@ PackagesWriter::PackagesWriter(string DB,string Overrides,string ExtOverrides, DoMD5 = _config->FindB("APT::FTPArchive::MD5",true); DoSHA1 = _config->FindB("APT::FTPArchive::SHA1",true); DoSHA256 = _config->FindB("APT::FTPArchive::SHA256",true); + DoAlwaysStat = _config->FindB("APT::FTPArchive::AlwaysStat", false); DoContents = _config->FindB("APT::FTPArchive::Contents",true); NoOverride = _config->FindB("APT::FTPArchive::NoOverrideMsg",false); LongDescription = _config->FindB("APT::FTPArchive::LongDescription",true); @@ -360,7 +361,7 @@ bool FTWScanner::SetExts(string Vals) bool PackagesWriter::DoPackage(string FileName) { // Pull all the data we need form the DB - if (Db.GetFileInfo(FileName, true, DoContents, true, DoMD5, DoSHA1, DoSHA256) + if (Db.GetFileInfo(FileName, true, DoContents, true, DoMD5, DoSHA1, DoSHA256, DoAlwaysStat) == false) { return false; @@ -753,7 +754,7 @@ ContentsWriter::ContentsWriter(string DB) : determine what the package name is. */ bool ContentsWriter::DoPackage(string FileName,string Package) { - if (!Db.GetFileInfo(FileName, Package.empty(), true, false, false, false, false)) + if (!Db.GetFileInfo(FileName, Package.empty(), true, false, false, false, false, false)) { return false; } diff --git a/ftparchive/writer.h b/ftparchive/writer.h index e76438900..8864461d5 100644 --- a/ftparchive/writer.h +++ b/ftparchive/writer.h @@ -84,6 +84,7 @@ class PackagesWriter : public FTWScanner bool DoMD5; bool DoSHA1; bool DoSHA256; + bool DoAlwaysStat; bool NoOverride; bool DoContents; bool LongDescription; diff --git a/po/apt-all.pot b/po/apt-all.pot index 3cb5ba379..b6610a191 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: 2009-11-27 09:49+0100\n" +"POT-Creation-Date: 2009-11-28 02:10+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" @@ -357,11 +357,11 @@ msgstr "" msgid "Failed to stat %s" msgstr "" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "" @@ -426,26 +426,26 @@ msgstr "" msgid " DeLink limit of %sB hit.\n" msgstr "" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr "" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr "" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, c-format msgid " %s has no source override entry\n" msgstr "" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, c-format msgid " %s has no binary override entry either\n" msgstr "" @@ -1764,22 +1764,22 @@ msgstr "" msgid "Connecting to %s" msgstr "" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, c-format msgid "Unable to connect to %s:%s:" msgstr "" -- cgit v1.2.3-70-g09d2 From 2c4b9b0b9e504a9bdfdcb8080bbc3587c11de299 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 28 Nov 2009 03:46:39 +0100 Subject: check cache size even if we do nothing else otherwise in apt.cron.daily, thanks Francesco Poli for patch(s) and patience! (Closes: #459344) --- debian/apt.cron.daily | 6 +++++- debian/changelog | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index b6099ee75..e59b05ee4 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -401,12 +401,16 @@ eval $(apt-config shell BackupArchiveInterval APT::Periodic::BackupArchiveInterv Debdelta=1 eval $(apt-config shell Debdelta APT::Periodic::Download-Upgradeable-Packages-Debdelta) -# check if we actually have to do anything +# check if we actually have to do anything that requires locking the cache if [ $UpdateInterval -eq 0 ] && [ $DownloadUpgradeableInterval -eq 0 ] && [ $UnattendedUpgradeInterval -eq 0 ] && [ $BackupArchiveInterval -eq 0 ] && [ $AutocleanInterval -eq 0 ]; then + + # check cache size + check_size_constraints + exit 0 fi diff --git a/debian/changelog b/debian/changelog index 85ee97713..03411832c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -85,6 +85,9 @@ apt (0.7.25) UNRELEASED; urgency=low Patch by Christoph Goehre, thanks! (Closes: #463260) * apt-pkg/deb/debsrcrecords.cc: - use "diff" filetype for .debian.tar.* files (Closes: #554898) + * debian/apt.cron.daily: + - check cache size even if we do nothing else otherwise, thanks + Francesco Poli for patch(s) and patience! (Closes: #459344) [ Chris Leick ] * doc/ various manpages: -- cgit v1.2.3-70-g09d2 From 41c81fd85d43ed747375d8f1ee7a9b71fb3c7016 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sun, 29 Nov 2009 00:23:26 +0100 Subject: Ignore :qualifiers after package name in build dependencies for now as long we don't understand them (Closes: #558103) --- apt-pkg/deb/deblistparser.cc | 12 +++- apt-pkg/deb/deblistparser.h | 3 +- apt-pkg/deb/debsrcrecords.cc | 5 +- apt-pkg/deb/debsrcrecords.h | 6 +- apt-pkg/srcrecords.cc | 4 +- apt-pkg/srcrecords.h | 8 +-- debian/changelog | 8 ++- test/libapt/makefile | 6 ++ test/libapt/parsedepends_test.cc | 128 +++++++++++++++++++++++++++++++++++++++ 9 files changed, 163 insertions(+), 17 deletions(-) create mode 100644 test/libapt/parsedepends_test.cc (limited to 'debian') diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index 16e6ee332..25a1df3f9 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -395,7 +395,8 @@ const char *debListParser::ConvertRelation(const char *I,unsigned int &Op) bit by bit. */ const char *debListParser::ParseDepends(const char *Start,const char *Stop, string &Package,string &Ver, - unsigned int &Op, bool ParseArchFlags) + unsigned int &Op, bool const &ParseArchFlags, + bool const &StripMultiArch) { // Strip off leading space for (;Start != Stop && isspace(*Start) != 0; Start++); @@ -414,7 +415,14 @@ const char *debListParser::ParseDepends(const char *Start,const char *Stop, // Stash the package name Package.assign(Start,I - Start); - + + // We don't want to confuse library users which can't handle MultiArch + if (StripMultiArch == true) { + size_t const found = Package.rfind(':'); + if (found != string::npos) + Package = Package.substr(0,found); + } + // Skip white space to the '(' for (;I != Stop && isspace(*I) != 0 ; I++); diff --git a/apt-pkg/deb/deblistparser.h b/apt-pkg/deb/deblistparser.h index 34bb29c72..1c709229f 100644 --- a/apt-pkg/deb/deblistparser.h +++ b/apt-pkg/deb/deblistparser.h @@ -64,7 +64,8 @@ class debListParser : public pkgCacheGenerator::ListParser static const char *ParseDepends(const char *Start,const char *Stop, string &Package,string &Ver,unsigned int &Op, - bool ParseArchFlags = false); + bool const &ParseArchFlags = false, + bool const &StripMultiArch = false); static const char *ConvertRelation(const char *I,unsigned int &Op); debListParser(FileFd *File); diff --git a/apt-pkg/deb/debsrcrecords.cc b/apt-pkg/deb/debsrcrecords.cc index bde10aa6d..21336e1af 100644 --- a/apt-pkg/deb/debsrcrecords.cc +++ b/apt-pkg/deb/debsrcrecords.cc @@ -54,7 +54,8 @@ const char **debSrcRecordParser::Binaries() package/version records representing the build dependency. The returned array need not be freed and will be reused by the next call to this function */ -bool debSrcRecordParser::BuildDepends(vector<pkgSrcRecords::Parser::BuildDepRec> &BuildDeps, bool ArchOnly) +bool debSrcRecordParser::BuildDepends(vector<pkgSrcRecords::Parser::BuildDepRec> &BuildDeps, + bool const &ArchOnly, bool const &StripMultiArch) { unsigned int I; const char *Start, *Stop; @@ -77,7 +78,7 @@ bool debSrcRecordParser::BuildDepends(vector<pkgSrcRecords::Parser::BuildDepRec> while (1) { Start = debListParser::ParseDepends(Start, Stop, - rec.Package,rec.Version,rec.Op,true); + rec.Package,rec.Version,rec.Op,true, StripMultiArch); if (Start == 0) return _error->Error("Problem parsing dependency: %s", fields[I]); diff --git a/apt-pkg/deb/debsrcrecords.h b/apt-pkg/deb/debsrcrecords.h index a3b5a8286..c39d78bae 100644 --- a/apt-pkg/deb/debsrcrecords.h +++ b/apt-pkg/deb/debsrcrecords.h @@ -30,14 +30,14 @@ class debSrcRecordParser : public pkgSrcRecords::Parser virtual bool Restart() {return Tags.Jump(Sect,0);}; virtual bool Step() {iOffset = Tags.Offset(); return Tags.Step(Sect);}; - virtual bool Jump(unsigned long Off) {iOffset = Off; return Tags.Jump(Sect,Off);}; + virtual bool Jump(unsigned long const &Off) {iOffset = Off; return Tags.Jump(Sect,Off);}; virtual string Package() const {return Sect.FindS("Package");}; virtual string Version() const {return Sect.FindS("Version");}; virtual string Maintainer() const {return Sect.FindS("Maintainer");}; virtual string Section() const {return Sect.FindS("Section");}; virtual const char **Binaries(); - virtual bool BuildDepends(vector<BuildDepRec> &BuildDeps, bool ArchOnly); + virtual bool BuildDepends(vector<BuildDepRec> &BuildDeps, bool const &ArchOnly, bool const &StripMultiArch = true); virtual unsigned long Offset() {return iOffset;}; virtual string AsStr() { @@ -47,7 +47,7 @@ class debSrcRecordParser : public pkgSrcRecords::Parser }; virtual bool Files(vector<pkgSrcRecords::File> &F); - debSrcRecordParser(string File,pkgIndexFile const *Index) + debSrcRecordParser(string const &File,pkgIndexFile const *Index) : Parser(Index), Fd(File,FileFd::ReadOnly), Tags(&Fd,102400), Buffer(0), BufSize(0) {} ~debSrcRecordParser(); diff --git a/apt-pkg/srcrecords.cc b/apt-pkg/srcrecords.cc index 5e40ae624..46a02b55c 100644 --- a/apt-pkg/srcrecords.cc +++ b/apt-pkg/srcrecords.cc @@ -77,7 +77,7 @@ bool pkgSrcRecords::Restart() /* This searches on both source package names and output binary names and returns the first found. A 'cursor' like system is used to allow this function to be called multiple times to get successive entries */ -pkgSrcRecords::Parser *pkgSrcRecords::Find(const char *Package,bool SrcOnly) +pkgSrcRecords::Parser *pkgSrcRecords::Find(const char *Package,bool const &SrcOnly) { if (Current == Files.end()) return 0; @@ -116,7 +116,7 @@ pkgSrcRecords::Parser *pkgSrcRecords::Find(const char *Package,bool SrcOnly) // Parser::BuildDepType - Convert a build dep to a string /*{{{*/ // --------------------------------------------------------------------- /* */ -const char *pkgSrcRecords::Parser::BuildDepType(unsigned char Type) +const char *pkgSrcRecords::Parser::BuildDepType(unsigned char const &Type) { const char *fields[] = {"Build-Depends", "Build-Depends-Indep", diff --git a/apt-pkg/srcrecords.h b/apt-pkg/srcrecords.h index 99cbc6060..a49533864 100644 --- a/apt-pkg/srcrecords.h +++ b/apt-pkg/srcrecords.h @@ -59,7 +59,7 @@ class pkgSrcRecords virtual bool Restart() = 0; virtual bool Step() = 0; - virtual bool Jump(unsigned long Off) = 0; + virtual bool Jump(unsigned long const &Off) = 0; virtual unsigned long Offset() = 0; virtual string AsStr() = 0; @@ -69,8 +69,8 @@ class pkgSrcRecords virtual string Section() const = 0; virtual const char **Binaries() = 0; // Ownership does not transfer - virtual bool BuildDepends(vector<BuildDepRec> &BuildDeps, bool ArchOnly) = 0; - static const char *BuildDepType(unsigned char Type); + virtual bool BuildDepends(vector<BuildDepRec> &BuildDeps, bool const &ArchOnly, bool const &StripMultiArch = true) = 0; + static const char *BuildDepType(unsigned char const &Type); virtual bool Files(vector<pkgSrcRecords::File> &F) = 0; @@ -90,7 +90,7 @@ class pkgSrcRecords bool Restart(); // Locate a package by name - Parser *Find(const char *Package,bool SrcOnly = false); + Parser *Find(const char *Package,bool const &SrcOnly = false); pkgSrcRecords(pkgSourceList &List); ~pkgSrcRecords(); diff --git a/debian/changelog b/debian/changelog index 03411832c..056e5c1f7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,9 +19,11 @@ apt (0.7.25) UNRELEASED; urgency=low Closes: #555797 [ David Kalnischkies ] - * [BREAK] add possibility to download and use multiply - Translation files, configurable with Acquire::Translation - (Closes: #444222, #448216, #550564) + * [BREAK] add possibility to download and use multiply + Translation files, configurable with Acquire::Translation + (Closes: #444222, #448216, #550564) + * Ignore :qualifiers after package name in build dependencies + for now as long we don't understand them (Closes: #558103) * apt-pkg/packagemanager.cc: - better debug output for ImmediateAdd with depth and why - improve the message shown for failing immediate configuration diff --git a/test/libapt/makefile b/test/libapt/makefile index f61a95f3d..5712c025a 100644 --- a/test/libapt/makefile +++ b/test/libapt/makefile @@ -11,3 +11,9 @@ PROGRAM = getLanguages${BASENAME} SLIBS = -lapt-pkg SOURCE = getlanguages_test.cc include $(PROGRAM_H) + +# Program for testing ParseDepends +PROGRAM = ParseDepends${BASENAME} +SLIBS = -lapt-pkg +SOURCE = parsedepends_test.cc +include $(PROGRAM_H) diff --git a/test/libapt/parsedepends_test.cc b/test/libapt/parsedepends_test.cc new file mode 100644 index 000000000..b7befa561 --- /dev/null +++ b/test/libapt/parsedepends_test.cc @@ -0,0 +1,128 @@ +#include <apt-pkg/deblistparser.h> +#include <apt-pkg/configuration.h> + +#include "assert.h" + +int main(int argc,char *argv[]) { + string Package; + string Version; + unsigned int Op = 5; + unsigned int Null = 0; + bool StripMultiArch = true; + bool ParseArchFlags = false; + _config->Set("APT::Architecture","dsk"); + + const char* Depends = + "debhelper:any (>= 5.0), " + "libdb-dev:any, " + "gettext:native (<= 0.12), " + "libcurl4-gnutls-dev:native | libcurl3-gnutls-dev (>> 7.15.5), " + "debiandoc-sgml, " + "apt (>= 0.7.25), " + "not-for-me [ !dsk ], " + "only-for-me [ dsk ], " + "overlord-dev:any (= 7.15.3~) | overlord-dev:native (>> 7.15.5), " + ; + + unsigned short runner = 0; +test: +// std::clog << (StripMultiArch ? "NO-Multi" : "Multi") << " " << (ParseArchFlags ? "Flags" : "NO-Flags") << std::endl; + + // Stripping MultiArch is currently the default setting to not confuse + // non-MultiArch capable users of the library with "strange" extensions. + const char* Start = Depends; + const char* End = Depends + strlen(Depends); + + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch); + if (StripMultiArch == true) + equals("debhelper", Package); + else + equals("debhelper:any", Package); + equals("5.0", Version); + equals(Null | pkgCache::Dep::GreaterEq, Op); + + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch); + if (StripMultiArch == true) + equals("libdb-dev", Package); + else + equals("libdb-dev:any", Package); + equals("", Version); + equals(Null | pkgCache::Dep::NoOp, Op); + + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch); + if (StripMultiArch == true) + equals("gettext", Package); + else + equals("gettext:native", Package); + equals("0.12", Version); + equals(Null | pkgCache::Dep::LessEq, Op); + + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch); + if (StripMultiArch == true) + equals("libcurl4-gnutls-dev", Package); + else + equals("libcurl4-gnutls-dev:native", Package); + equals("", Version); + equals(Null | pkgCache::Dep::Or, Op); + + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch); + equals("libcurl3-gnutls-dev", Package); + equals("7.15.5", Version); + equals(Null | pkgCache::Dep::Greater, Op); + + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch); + equals("debiandoc-sgml", Package); + equals("", Version); + equals(Null | pkgCache::Dep::NoOp, Op); + + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch); + equals("apt", Package); + equals("0.7.25", Version); + equals(Null | pkgCache::Dep::GreaterEq, Op); + + if (ParseArchFlags == true) { + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch); + equals("", Package); // not-for-me + } else { + equals(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch)); + Start = strstr(Start, ","); + Start++; + } + + if (ParseArchFlags == true) { + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch); + equals("only-for-me", Package); + equals("", Version); + equals(Null | pkgCache::Dep::NoOp, Op); + } else { + equals(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch)); + Start = strstr(Start, ","); + Start++; + } + + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch); + if (StripMultiArch == true) + equals("overlord-dev", Package); + else + equals("overlord-dev:any", Package); + equals("7.15.3~", Version); + equals(Null | pkgCache::Dep::Equals | pkgCache::Dep::Or, Op); + + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch); + if (StripMultiArch == true) + equals("overlord-dev", Package); + else + equals("overlord-dev:native", Package); + equals("7.15.5", Version); + equals(Null | pkgCache::Dep::Greater, Op); + + if (StripMultiArch == false) + ParseArchFlags = true; + StripMultiArch = !StripMultiArch; + + runner++; + if (runner < 4) + goto test; // this is the prove: tests are really evil ;) + + return 0; +} -- cgit v1.2.3-70-g09d2 From c6474fb6ff482b0457674986a82afab0a3749af2 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Tue, 1 Dec 2009 00:28:26 +0100 Subject: fix a few typos in strings, comments and manpage of apt-ftparchive thanks Karl Goetz! (Closes: #558757) --- debian/changelog | 3 +++ doc/apt-ftparchive.1.xml | 2 +- ftparchive/apt-ftparchive.cc | 4 ++-- ftparchive/cachedb.cc | 6 +++--- ftparchive/contents.cc | 2 +- ftparchive/multicompress.cc | 2 +- ftparchive/writer.cc | 2 +- 7 files changed, 12 insertions(+), 9 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 056e5c1f7..26b3e8c1e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -85,6 +85,9 @@ apt (0.7.25) UNRELEASED; urgency=low - add APT::FTPArchive::AlwaysStat to disable the too aggressive caching if versions are build multiply times (not recommend) Patch by Christoph Goehre, thanks! (Closes: #463260) + * ftparchive/*: + - fix a few typos in strings, comments and manpage, + thanks Karl Goetz! (Closes: #558757) * apt-pkg/deb/debsrcrecords.cc: - use "diff" filetype for .debian.tar.* files (Closes: #554898) * debian/apt.cron.daily: diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml index e2eab0fb2..5d538c2c6 100644 --- a/doc/apt-ftparchive.1.xml +++ b/doc/apt-ftparchive.1.xml @@ -285,7 +285,7 @@ <varlistentry><term>Sources</term> <listitem><para> - Sets the output Packages file. Defaults to + Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/source/Sources</filename></para></listitem> </varlistentry> diff --git a/ftparchive/apt-ftparchive.cc b/ftparchive/apt-ftparchive.cc index d0dea7768..5b6b3940c 100644 --- a/ftparchive/apt-ftparchive.cc +++ b/ftparchive/apt-ftparchive.cc @@ -3,7 +3,7 @@ // $Id: apt-ftparchive.cc,v 1.8.2.3 2004/01/02 22:01:48 mdz Exp $ /* ###################################################################### - apt-scanpackages - Efficient work-alike for dpkg-scanpackages + apt-ftparchive - Efficient work-alike for dpkg-scanpackages Let contents be disabled from the conf @@ -792,7 +792,7 @@ bool Generate(CommandLine &CmdL) if (_config->FindB("APT::FTPArchive::Contents",true) == false) return true; - c1out << "Done Packages, Starting contents." << endl; + c1out << "Packages done, Starting contents." << endl; // Sort the contents file list by date string ArchiveDir = Setup.FindDir("Dir::ArchiveDir"); diff --git a/ftparchive/cachedb.cc b/ftparchive/cachedb.cc index 64638459a..b04244347 100644 --- a/ftparchive/cachedb.cc +++ b/ftparchive/cachedb.cc @@ -69,7 +69,7 @@ bool CacheDB::ReadyDB(string const &DB) // apt 0.6.44 if (err == EINVAL) { - _error->Error(_("DB format is invalid. If you upgraded from a older version of apt, please remove and re-create the database.")); + _error->Error(_("DB format is invalid. If you upgraded from an older version of apt, please remove and re-create the database.")); } if (err) { @@ -83,7 +83,7 @@ bool CacheDB::ReadyDB(string const &DB) return true; } /*}}}*/ -// CacheDB::OpenFile - Open the filei /*{{{*/ +// CacheDB::OpenFile - Open the file /*{{{*/ // --------------------------------------------------------------------- /* */ bool CacheDB::OpenFile() @@ -139,7 +139,7 @@ bool CacheDB::GetCurStat() if (DBLoaded) { - /* First see if thre is anything about it + /* First see if there is anything about it in the database */ /* Get the flags (and mtime) */ diff --git a/ftparchive/contents.cc b/ftparchive/contents.cc index 693c36f9a..b761d9204 100644 --- a/ftparchive/contents.cc +++ b/ftparchive/contents.cc @@ -13,7 +13,7 @@ removing the massive sort time overhead. By breaking all the pathnames into components and storing them - separately a space savings is realized by not duplicating the string + separately a space saving is realized by not duplicating the string over and over again. Ultimately this saving is sacrificed to storage of the tree structure itself but the tree structure yields a speed gain in the sorting and processing. Ultimately it takes about 5 seconds to diff --git a/ftparchive/multicompress.cc b/ftparchive/multicompress.cc index 7c91d34fe..bb4beedf9 100644 --- a/ftparchive/multicompress.cc +++ b/ftparchive/multicompress.cc @@ -365,7 +365,7 @@ bool MultiCompress::CloseOld(int Fd,pid_t Proc) // MultiCompress::Child - The writer child /*{{{*/ // --------------------------------------------------------------------- /* The child process forks a bunch of compression children and takes - input on FD and passes it to all the compressor childer. On the way it + input on FD and passes it to all the compressor child. On the way it computes the MD5 of the raw data. After this the raw data in the original files is compared to see if this data is new. If the data is new then the temp files are renamed, otherwise they are erased. */ diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc index bf6e9f617..5547c6aa5 100644 --- a/ftparchive/writer.cc +++ b/ftparchive/writer.cc @@ -464,7 +464,7 @@ bool PackagesWriter::DoPackage(string FileName) SetTFRewriteData(Changes[End++], "Maintainer", NewMaint.c_str()); /* Get rid of the Optional tag. This is an ugly, ugly, ugly hack that - dpkg-scanpackages does.. Well sort of. dpkg-scanpackages just does renaming + dpkg-scanpackages does. Well sort of. dpkg-scanpackages just does renaming but dpkg does this append bit. So we do the append bit, at least that way the status file and package file will remain similar. There are other transforms but optional is the only legacy one still in use for some lazy reason. */ -- cgit v1.2.3-70-g09d2 From d456bf5a0a30402b7c1aaf13d220f2319f879fe5 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Fri, 1 Jan 2010 12:54:13 +0100 Subject: Chris Leick spot & fix various typos in all manpages --- debian/changelog | 3 +++ doc/apt.conf.5.xml | 10 +++++----- doc/guide.sgml | 6 +++--- doc/offline.sgml | 8 ++++---- doc/sources.list.5.xml | 2 +- 5 files changed, 16 insertions(+), 13 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 9f5f25d8e..648d7ed3e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ apt (0.7.26) UNRELEASED; urgency=low [ Christian Perrier ] * French manpage translation update + [Chris Leick] + * spot & fix various typos in all manpages + [ David Kalnischkies ] * [BREAK] add possibility to download and use multiply Translation files, configurable with Acquire::Translation diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index 777630e14..734ae1fe7 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -166,10 +166,10 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; longer guaranteed to work as their dependency on A is not longer satisfied. The immediate configuration marker is also applied to all dependencies which can generate a problem if the dependencies e.g. form a circle as a dependency with the immediate flag is comparable with a Pre-Dependency. So in theory it is possible - that APT encounters a situation in which it is unable to perform immediate configuration, error out and - refers to this option so the user can deactivate the immediate configuration temporary to be able to perform + that APT encounters a situation in which it is unable to perform immediate configuration, errors out and + refers to this option so the user can deactivate the immediate configuration temporarily to be able to perform an install/upgrade again. Note the use of the word "theory" here as this problem was only encountered by now - in real world a few times in non-stable distribution versions and caused by wrong dependencies of the package + in real world a few times in non-stable distribution versions and was caused by wrong dependencies of the package in question or by a system in an already broken state, so you should not blindly disable this option as the mentioned scenario above is not the only problem immediate configuration can help to prevent in the first place. Before a big operation like <literal>dist-upgrade</literal> is run with this option disabled it should be tried to @@ -396,7 +396,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; <varlistentry><term>Languages</term> <listitem><para>The Languages subsection controls which <filename>Translation</filename> files are downloaded and in which order APT tries to display the Description-Translations. APT will try to display the first - available Description for the Language which is listed at first. Languages can be defined with their + available Description in the Language which is listed at first. Languages can be defined with their short or long Languagecodes. Note that not all archives provide <filename>Translation</filename> files for every Language - especially the long Languagecodes are rare, so please inform you which ones are available before you set here impossible values.</para> @@ -407,7 +407,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; To force apt to use no Translation file use the setting <literal>Acquire::Languages=none</literal>. "<literal>none</literal>" is another special meaning code which will stop the search for a fitting <filename>Translation</filename> file. This can be used by the system administrator to let APT know that it should download also this files without - actually use them if not the environment specifies this languages. So the following example configuration will + actually use them if the environment doesn't specify this languages. So the following example configuration will result in the order "en, de" in an english and in "de, en" in a german localization. Note that "fr" is downloaded, but not used if APT is not used in a french localization, in such an environment the order would be "fr, de, en". <programlisting>Acquire::Languages { "environment"; "de"; "en"; "none"; "fr"; };</programlisting></para></listitem> diff --git a/doc/guide.sgml b/doc/guide.sgml index 1b7e1d8f3..ff727f6ca 100644 --- a/doc/guide.sgml +++ b/doc/guide.sgml @@ -56,7 +56,7 @@ requires another package to be installed at the same time to work properly. <p> For instance, mailcrypt is an emacs extension that aids in encrypting email -with GPG. Without GPGP installed mail-crypt is useless, so mailcrypt has a +with GPG. Without GPGP installed mailcrypt is useless, so mailcrypt has a simple dependency on GPG. Also, because it is an emacs extension it has a simple dependency on emacs, without emacs it is completely useless. @@ -171,7 +171,7 @@ the <prgn>dselect</> package selection GUI. <prgn>dselect</> is used to select the packages to be installed or removed and APT actually installs them. <p> -To enable the APT method you need to to select [A]ccess in <prgn>dselect</> +To enable the APT method you need to select [A]ccess in <prgn>dselect</> and then choose the APT method. You will be prompted for a set of <em>Sources</> which are places to fetch archives from. These can be remote Internet sites, local Debian mirrors or CDROMs. Each source can provide @@ -239,7 +239,7 @@ prompt until you have specified all that you want. <p> Before starting to use <prgn>dselect</> it is necessary to update the -available list by selecting [U]pdate from the menu. This is a super-set of +available list by selecting [U]pdate from the menu. This is a superset of <tt>apt-get update</> that makes the fetched information available to <prgn>dselect</>. [U]pdate must be performed even if <tt>apt-get update</> has been run before. diff --git a/doc/offline.sgml b/doc/offline.sgml index 99e260bc3..e7ede14de 100644 --- a/doc/offline.sgml +++ b/doc/offline.sgml @@ -50,7 +50,7 @@ no connection. <p> This is achieved by creatively manipulating the APT configuration file. The -essential premis to tell APT to look on a disc for it's archive files. Note +essential premise to tell APT to look on a disc for it's archive files. Note that the disc should be formated with a filesystem that can handle long file names such as ext2, fat32 or vfat. @@ -129,7 +129,7 @@ configuration file in <em>/usr/share/doc/apt/examples/apt.conf</em>. <p> On the target machine the first thing to do is mount the disc and copy <em>/var/lib/dpkg/status</em> to it. You will also need to create the directories -outlined in the Overview, <em>archives/partial/</em> and <em>lists/partial/</em> +outlined in the Overview, <em>archives/partial/</em> and <em>lists/partial/</em>. Then take the disc to the remote machine and configure the sources.list. On the remote machine execute the following: @@ -141,9 +141,9 @@ On the remote machine execute the following: [ APT fetches all the packages needed to upgrade the target machine ] </example> -The dist-upgrade command can be replaced with any-other standard APT commands, +The dist-upgrade command can be replaced with any other standard APT commands, particularly dselect-upgrade. You can even use an APT front end such as -<em>dselect</em> However this presents a problem in communicating your +<em>dselect</em>. However this presents a problem in communicating your selections back to the local computer. <p> diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml index e2993db2c..c71ae6bdd 100644 --- a/doc/sources.list.5.xml +++ b/doc/sources.list.5.xml @@ -180,7 +180,7 @@ deb http://http.us.debian.org/debian dists/stable-updates/ APT can be extended with more methods shipped in other optional packages which should follow the nameing scheme <literal>apt-transport-<replaceable>method</replaceable></literal>. The APT team e.g. maintains also the <literal>apt-transport-https</literal> package which - provides access methods for https-URIs with features similiar to the http method, but other + provides access methods for https-URIs with features similar to the http method, but other methods for using e.g. debtorrent are also available, see <citerefentry> <refentrytitle><filename>apt-transport-debtorrent</filename></refentrytitle> <manvolnum>1</manvolnum></citerefentry>. -- cgit v1.2.3-70-g09d2 From 739f45cd83e22d9f5713218f0cd5b0dedba5a4a5 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Fri, 1 Jan 2010 19:10:14 +0100 Subject: update german manpage translation by Chris Leick --- debian/changelog | 1 + doc/po/de.po | 1147 +++++++++++++++++++++++++++++++++++------------------- 2 files changed, 747 insertions(+), 401 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 648d7ed3e..acc53b037 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ apt (0.7.26) UNRELEASED; urgency=low [Chris Leick] * spot & fix various typos in all manpages + * German manpage translation update [ David Kalnischkies ] * [BREAK] add possibility to download and use multiply diff --git a/doc/po/de.po b/doc/po/de.po index 3ec7c4a5b..00ebf7b3d 100644 --- a/doc/po/de.po +++ b/doc/po/de.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: apt-doc 0.7.24\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" "POT-Creation-Date: 2009-11-27 00:05+0100\n" -"PO-Revision-Date: 2009-10-28 23:51+GMT\n" +"PO-Revision-Date: 2009-12-31 17:41+GMT\n" "Last-Translator: Chris Leick <c.leick@vollbio.de>\n" "Language-Team: German <debian-l10n-german@lists.debian.org>\n" "MIME-Version: 1.0\n" @@ -42,7 +42,7 @@ msgstr "NAME" #. type: Plain text #: apt.8:20 msgid "apt - Advanced Package Tool" -msgstr "apt - Fortschrittliches Paketierungswerkzeug (Advanced Package Tool)" +msgstr "apt - Fortschrittliches Paketwerkzeug (Advanced Package Tool)" #. type: SH #: apt.8:20 @@ -350,13 +350,7 @@ msgstr "" #. type: Plain text #: apt.ent:84 -#, fuzzy, no-wrap -#| msgid "" -#| "<!ENTITY dpkg \"<citerefentry>\n" -#| " <refentrytitle><command>dpkg</command></refentrytitle>\n" -#| " <manvolnum>8</manvolnum>\n" -#| " </citerefentry>\"\n" -#| ">\n" +#, no-wrap msgid "" "<!ENTITY dpkg \"<citerefentry>\n" " <refentrytitle><command>dpkg</command></refentrytitle>\n" @@ -366,7 +360,7 @@ msgid "" msgstr "" "<!ENTITY dpkg \"<citerefentry>\n" " <refentrytitle><command>dpkg</command></refentrytitle>\n" -" <manvolnum>8</manvolnum>\n" +" <manvolnum>1</manvolnum>\n" " </citerefentry>\"\n" ">\n" @@ -404,13 +398,7 @@ msgstr "" #. type: Plain text #: apt.ent:102 -#, fuzzy, no-wrap -#| msgid "" -#| "<!ENTITY dpkg-scanpackages \"<citerefentry>\n" -#| " <refentrytitle><command>dpkg-scanpackages</command></refentrytitle>\n" -#| " <manvolnum>8</manvolnum>\n" -#| " </citerefentry>\"\n" -#| ">\n" +#, no-wrap msgid "" "<!ENTITY dpkg-scanpackages \"<citerefentry>\n" " <refentrytitle><command>dpkg-scanpackages</command></refentrytitle>\n" @@ -420,19 +408,13 @@ msgid "" msgstr "" "<!ENTITY dpkg-scanpackages \"<citerefentry>\n" " <refentrytitle><command>dpkg-scanpackages</command></refentrytitle>\n" -" <manvolnum>8</manvolnum>\n" +" <manvolnum>1</manvolnum>\n" " </citerefentry>\"\n" ">\n" #. type: Plain text #: apt.ent:108 -#, fuzzy, no-wrap -#| msgid "" -#| "<!ENTITY dpkg-scansources \"<citerefentry>\n" -#| " <refentrytitle><command>dpkg-scansources</command></refentrytitle>\n" -#| " <manvolnum>8</manvolnum>\n" -#| " </citerefentry>\"\n" -#| ">\n" +#, no-wrap msgid "" "<!ENTITY dpkg-scansources \"<citerefentry>\n" " <refentrytitle><command>dpkg-scansources</command></refentrytitle>\n" @@ -442,19 +424,13 @@ msgid "" msgstr "" "<!ENTITY dpkg-scansources \"<citerefentry>\n" " <refentrytitle><command>dpkg-scansources</command></refentrytitle>\n" -" <manvolnum>8</manvolnum>\n" +" <manvolnum>1</manvolnum>\n" " </citerefentry>\"\n" ">\n" #. type: Plain text #: apt.ent:114 -#, fuzzy, no-wrap -#| msgid "" -#| "<!ENTITY dselect \"<citerefentry>\n" -#| " <refentrytitle><command>dselect</command></refentrytitle>\n" -#| " <manvolnum>8</manvolnum>\n" -#| " </citerefentry>\"\n" -#| ">\n" +#, no-wrap msgid "" "<!ENTITY dselect \"<citerefentry>\n" " <refentrytitle><command>dselect</command></refentrytitle>\n" @@ -464,7 +440,7 @@ msgid "" msgstr "" "<!ENTITY dselect \"<citerefentry>\n" " <refentrytitle><command>dselect</command></refentrytitle>\n" -" <manvolnum>8</manvolnum>\n" +" <manvolnum>1</manvolnum>\n" " </citerefentry>\"\n" ">\n" @@ -1375,13 +1351,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> #: apt-cache.8.xml:152 -#, fuzzy -#| msgid "" -#| "<literal>Missing</literal> is the number of package names that were " -#| "referenced in a dependency but were not provided by any package. Missing " -#| "packages may be in evidence if a full distribution is not accessed, or if " -#| "a package (real or virtual) has been dropped from the distribution. " -#| "Usually they are referenced from Conflicts or Breaks statements." msgid "" "<literal>Missing</literal> is the number of package names that were " "referenced in a dependency but were not provided by any package. Missing " @@ -1408,8 +1377,9 @@ msgstr "" "<literal>Total distinct</literal> Versionen ist die Anzahl der im " "Zwischenspeicher gefundenen Paketversionen. Dieser Wert ist daher meistens " "gleich der Anzahl der gesamten Paketnamen. Wenn auf mehr als eine " -"Distribution (zum Beispiel »stable« und »unstable« zusammen) zugegriffen wird, " -"kann dieser Wert deutlich größer als die gesamte Anzahl der Paketnamen sein." +"Distribution (zum Beispiel »stable« und »unstable« zusammen) zugegriffen " +"wird, kann dieser Wert deutlich größer als die gesamte Anzahl der " +"Paketnamen sein." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> #: apt-cache.8.xml:166 @@ -1584,11 +1554,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:234 -#, fuzzy -#| msgid "" -#| "Note that a package which APT knows of is not nessasarily available to " -#| "download, installable or installed, e.g. virtual packages are also listed " -#| "in the generated list." msgid "" "Note that a package which APT knows of is not necessarily available to " "download, installable or installed, e.g. virtual packages are also listed in " @@ -2017,7 +1982,7 @@ msgid "" "<arg>add</arg> <arg>ident</arg> </group>" msgstr "" "<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> " -"<arg><option>-d=<replaceable>CDROM-Einhängepunkt</replaceable></option></" +"<arg><option>-d=<replaceable>CD-ROM-Einhängepunkt</replaceable></option></" "arg><arg><option>-o=<replaceable>Konfigurationszeichenkette</replaceable></" "option></arg><arg><option>-c=<replaceable>Datei</replaceable></option></" "arg><group><arg>hinzufügen</arg><arg>Identifikation</arg></group>" @@ -2030,7 +1995,7 @@ msgid "" "the structure of the disc as well as correcting for several possible mis-" "burns and verifying the index files." msgstr "" -"<command>apt-cdrom</command> wird benutzt, um eine neue CDROM zu APTs Liste " +"<command>apt-cdrom</command> wird benutzt, um eine neue CD-ROM zu APTs Liste " "der verfügbaren Quellen hinzuzufügen. <command>apt-cdrom</command> kümmert " "sich um die festgestellte Struktur des Mediums, sowie die Korrektur für " "mehrere mögliche Fehlbrennungen und prüft die Indexdateien." @@ -2062,7 +2027,7 @@ msgid "" "title." msgstr "" "<literal>add</literal> wird benutzt, um ein neues Medium zur Quellenliste " -"hinzuzufügen. Es wird das CDROM-Gerät aushängen, verlangen, dass ein Medium " +"hinzuzufügen. Es wird das CD-ROM-Gerät aushängen, verlangen, dass ein Medium " "eingelegt wird und dann mit den Einlesen und Kopieren der Indexdateien " "fortfahren. Wenn das Medium kein angemessenes <filename>disk</filename>-" "Verzeichnis hat, werden Sie nach einem aussagekräftigen Titel gefragt." @@ -2074,7 +2039,7 @@ msgid "" "maintains a database of these IDs in <filename>&statedir;/cdroms.list</" "filename>" msgstr "" -"APT benutzt eine CDROM-ID, um nachzuverfolgen, welches Medium gerade im " +"APT benutzt eine CD-ROM-ID, um nachzuverfolgen, welches Medium gerade im " "Laufwerk ist und verwaltet eine Datenbank mit diesen IDs in " "<filename>&statedir;/cdroms.list</filename>" @@ -2341,9 +2306,9 @@ msgid "" "names, d returns directories, b returns true or false and i returns an " "integer. Each of the returns is normalized and verified internally." msgstr "" -"An das Konfigurationselement kann /[fdbi] angehängt werden. f gibt " -"Dateinamen zurück, d gibt Verzeichnisse zurück, b gibt true oder false " -"zurück und i gibt eine Ganzzahl zurück. Jede Rückgabe ist normiert und " +"An das Konfigurationselement kann /[fdbi] angehängt werden. »f« gibt " +"Dateinamen zurück, »d« gibt Verzeichnisse zurück, »b« gibt true oder false " +"zurück und »i« gibt eine Ganzzahl zurück. Jede Rückgabe ist normiert und " "intern geprüft." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> @@ -2426,10 +2391,10 @@ msgid "" "XXXX</filename> and <filename>package.config.XXXX</filename>" msgstr "" "Schablonendatei und Konfigurationsskript werden in das temporäre Verzeichnis " -"geschrieben, das durch -t oder --tempdir (<literal>APT::ExtractTemplates::" -"TempDir</literal>) Verzeichnis mit Dateinamen der Form <filename>package." -"template.XXXX</filename> und <filename>package.config.XXXX</filename> " -"angegeben wurde" +"geschrieben, das durch »-t« oder »--tempdir« " +"(<literal>APT::ExtractTemplates::TempDir</literal>) Verzeichnis mit " +"Dateinamen der Form <filename>package. template.XXXX</filename> und " +"<filename>package.config.XXXX</filename> angegeben wurde" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-extracttemplates.1.xml:60 apt-get.8.xml:488 @@ -2443,11 +2408,6 @@ msgstr "<option>--tempdir</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-extracttemplates.1.xml:62 -#, fuzzy -#| msgid "" -#| "Temporary directory in which to write extracted debconf template files " -#| "and config scripts Configuration Item: <literal>APT::ExtractTemplates::" -#| "TempDir</literal>" msgid "" "Temporary directory in which to write extracted debconf template files and " "config scripts. Configuration Item: <literal>APT::ExtractTemplates::" @@ -2469,15 +2429,11 @@ msgstr "" #. The last update date #. type: Content of: <refentry><refentryinfo> #: apt-ftparchive.1.xml:13 -#, fuzzy -#| msgid "" -#| "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 " -#| "August 2009</date>" msgid "" "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>17 " "August 2009</date>" msgstr "" -"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9. " +"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>17. " "August 2009</date>" #. type: Content of: <refentry><refnamediv><refname> @@ -2567,9 +2523,9 @@ msgid "" "automatically performs file-change checks and builds the desired compressed " "output files." msgstr "" -"Intern kann <command>apt-ftparchive</command> von Programmdatenbänken " +"Intern kann <command>apt-ftparchive</command> von Programmdatenbanken " "Gebrauch machen, um die Inhalte einer .deb-Datei zwischenzuspeichern und es " -"verlässt sich nicht auf irgendwelche externen Programme, abgesehen von " +"verlasst sich nicht auf irgendwelche externen Programme, abgesehen von " "&gzip;. Wenn eine vollständige Generierung erfolgt, werden automatisch " "Dateiänderungsprüfungen durchgeführt und die gewünschten gepackten " "Ausgabedateien erzeugt." @@ -2587,8 +2543,8 @@ msgid "" "emitting a package record to stdout for each. This command is approximately " "equivalent to &dpkg-scanpackages;." msgstr "" -"Der packages-Befehl generiert eine Paketdatei aus einem Verzeichnisbaum. Er " -"nimmt ein vorgegebenes Verzeichnis und durchsucht es rekursiv nach .deb-" +"Der »packages«-Befehl generiert eine Paketdatei aus einem Verzeichnisbaum. " +"Er nimmt ein vorgegebenes Verzeichnis und durchsucht es rekursiv nach .deb-" "Dateien, wobei es für jede einen Paketdatensatz auf stdout ausgibt.Dieser " "Befehl entspricht etwa &dpkg-scanpackages;." @@ -2626,8 +2582,9 @@ msgid "" "change the source override file that will be used." msgstr "" "Wenn eine Override-Datei angegeben ist, wird nach einer Quellen-Override-" -"Datei mit einer .src-Dateiendung gesucht. Die Option --source-override kann " -"benutzt werden, um die Quellen-Override-Datei, die benutzt wird, zu ändern." +"Datei mit einer .src-Dateiendung gesucht. Die Option »--source-override« " +"kann benutzt werden, um die Quellen-Override-Datei, die benutzt wird, zu " +"ändern." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-ftparchive.1.xml:97 @@ -2766,12 +2723,6 @@ msgstr "Dir-Abschnitt" #. type: Content of: <refentry><refsect1><refsect2><para> #: apt-ftparchive.1.xml:159 -#, fuzzy -#| msgid "" -#| "The <literal>Dir</literal> section defines the standard directories " -#| "needed to locate the files required during the generation process. These " -#| "directories are prepended to certain relative paths defined in later " -#| "sections to produce a complete an absolute path." msgid "" "The <literal>Dir</literal> section defines the standard directories needed " "to locate the files required during the generation process. These " @@ -3212,7 +3163,6 @@ msgstr "" "Wenn ein <literal>Tree</literal>-Abschnitt bearbeitet wird, führt " "<command>apt-ftparchive</command> eine Operation aus, die folgender ähnelt:" -# report, that this string is missing in man page #. type: Content of: <refentry><refsect1><refsect2><para><informalexample><programlisting> #: apt-ftparchive.1.xml:354 #, no-wrap @@ -3489,7 +3439,7 @@ msgid "" "Configuration Item: <literal>APT::FTPArchive::DB</literal>." msgstr "" "Benutzt eine Programmzwischenspeicherdatenbank. Dies hat keine Auswirkung " -"auf den generate-Befehl. Konfigurationselement: <literal>APT::FTPArchive::" +"auf den »generate«-Befehl. Konfigurationselement: <literal>APT::FTPArchive::" "DB</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> @@ -3542,7 +3492,7 @@ msgstr "" "Führt Inhaltsgenerierung durch. Wenn diese Option gesetzt ist und " "Paketindizes mit einer Zwischenspeicherdatenbank generiert werden, dann wird " "die Dateiliste auch extrahiert und für spätere Benutzung in der Datenbank " -"gespeichert. Wenn der generate-Befehl benutzt wird, erlaubt diese Option " +"gespeichert. Wenn der »generate«-Befehl benutzt wird, erlaubt diese Option " "außerdem die Erzeugung beliebiger Contents-Dateien. Die Vorgabe ist an. " "Konfigurationselement: <literal>APT::FTPArchive::Contents</literal>." @@ -3578,10 +3528,8 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-ftparchive.1.xml:547 -#, fuzzy -#| msgid "<option>--version</option>" msgid "<option>APT::FTPArchive::LongDescription</option>" -msgstr "<option>--version</option>" +msgstr "<option>APT::FTPArchive::LongDescription</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:549 @@ -3592,6 +3540,12 @@ msgid "" "that it is currently not possible to create these files with <command>apt-" "ftparchive</command>." msgstr "" +"Diese Konfigurationsoption ist standardmäßig »<literal>true</literal>« und " +"sollte nur auf »<literal>false</literal>« gesetzt werden, wenn das mit " +"&apt-ftparchive; generierte Archiv außerdem " +"<filename>Translation</filename>-Dateien bereitstellt. Beachten Sie, dass " +"es derzeit nicht möglich ist, diese Dateien mit " +"<command>apt-ftparchive</command> zu erstellen." #. type: Content of: <refentry><refsect1><title> #: apt-ftparchive.1.xml:561 apt.conf.5.xml:1011 apt_preferences.5.xml:462 @@ -3612,8 +3566,8 @@ msgid "" "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" "Um eine gepackte Paketdatei für ein Verzeichnis zu erstellen, das " -"Programmpakete (.deb) enthält: <placeholder type=\"programlisting\" id=\"0\"/" -">" +"Programmpakete (.deb) enthält: <placeholder type=\"programlisting\" " +"id=\"0\"/>" #. type: Content of: <refentry><refsect1><para> #: apt-ftparchive.1.xml:577 @@ -3885,8 +3839,8 @@ msgstr "" "ausgewählt werden. Dies bewirkt, dass diese Version gesucht und zum " "Installieren ausgewählt wird. Alternativ kann eine bestimmte Distribution " "durch den Paketnamen gefolgt von einem Schrägstrich und der Version der " -"Distribution oder des Archivnamens (stable, testing, unstable) ausgewählt " -"werden." +"Distribution oder des Archivnamens (»stable«, »testing«, »unstable«) " +"ausgewählt werden." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:210 @@ -3939,13 +3893,13 @@ msgid "" "expression." msgstr "" "Wenn keine Pakete dem angegebenen Ausdruck entsprechen und der Ausdruck " -"entweder ».«,»,«,»?« oder »*« enthält, dann wird vermutet, dass es sich um einen " -"regulären POSIX-Ausdruck handelt und er wird auf alle Paketnamen in der " -"Datenbank angewandt. Jeder Treffer wird dann installiert (oder entfernt). " -"Beachten Sie, dass nach übereinstimmenden Zeichenkettenteilen gesucht wird, " -"so dass »lo.*« auf »how-lo« und »lowest« passt. Wenn dies nicht gewünscht wird, " -"hängen Sie an den regulären Ausdruck ein »^«- oder »$«-Zeichen, um genauere " -"reguläre Ausdruck zu erstellen." +"entweder ».«,»,«,»?« oder »*« enthält, dann wird vermutet, dass es sich um " +"einen regulären POSIX-Ausdruck handelt und er wird auf alle Paketnamen in " +"der Datenbank angewandt. Jeder Treffer wird dann installiert (oder " +"entfernt). Beachten Sie, dass nach übereinstimmenden Zeichenkettenteilen " +"gesucht wird, so dass »lo.*« auf »how-lo« und »lowest« passt. Wenn dies " +"nicht gewünscht wird, hängen Sie an den regulären Ausdruck ein »^«- oder " +"»$«-Zeichen, um genauere reguläre Ausdruck zu erstellen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:237 @@ -3990,15 +3944,6 @@ msgstr "source" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:251 -#, fuzzy -#| msgid "" -#| "<literal>source</literal> causes <command>apt-get</command> to fetch " -#| "source packages. APT will examine the available packages to decide which " -#| "source package to fetch. It will then find and download into the current " -#| "directory the newest available version of that source package while " -#| "respect the default release, set with the option <literal>APT::Default-" -#| "Release</literal>, the <option>-t</option> option or per package with " -#| "with the <literal>pkg/release</literal> syntax, if possible." msgid "" "<literal>source</literal> causes <command>apt-get</command> to fetch source " "packages. APT will examine the available packages to decide which source " @@ -4026,7 +3971,7 @@ msgid "" "from. If you don't do this you will properly get another (newer, older or " "none) source version than the one you have installed or could install." msgstr "" -"Paketquellen werden von Programmpaket getrennt über <literal>deb-src</" +"Paketquellen werden vom Programmpaket getrennt über <literal>deb-src</" "literal>-Typzeilen in der &sources-list;-Datei nachverfolgt. Das bedeutet, " "dass Sie für jedes Depot, aus dem Sie Quellen erhalten wollen, eine solche " "Zeile hinzufügen müssen. Wenn Sie dies nicht tun, werden Sie eine andere als " @@ -4035,12 +3980,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:266 -#, fuzzy -#| msgid "" -#| "If the <option>--compile</option> options is specified then the package " -#| "will be compiled to a binary .deb using <command>dpkg-buildpackage</" -#| "command>, if <option>--download-only</option> is specified then the " -#| "source package will not be unpacked." msgid "" "If the <option>--compile</option> option is specified then the package will " "be compiled to a binary .deb using <command>dpkg-buildpackage</command>, if " @@ -4150,7 +4089,7 @@ msgstr "" "Zwischenspeicher über eine lange Zeitspanne zu betreuen, ohne dass er " "unkontrolliert anwächst. Die Konfigurationsoption <literal>APT::Clean-" "Installed</literal> wird installierte Pakete vor der Löschung bewahren, wenn " -"sie auf off gesetzt ist." +"sie auf »off« gesetzt ist." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:312 @@ -4165,7 +4104,7 @@ msgid "" "are no more needed." msgstr "" "<literal>autoremove</literal> wird benutzt, um Pakete, die automatisch " -"installiert wurden, um Abhängigkeiten für einige Pakete zu erfüllen und und " +"installiert wurden, um Abhängigkeiten für einige Pakete zu erfüllen und " "die nicht mehr benötigt werden, zu entfernen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> @@ -4202,7 +4141,6 @@ msgstr "" msgid "<option>--fix-broken</option>" msgstr "<option>--fix-broken</option>" -# s/Any Package that are specified/Any package that is specified/ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:334 msgid "" @@ -4219,7 +4157,7 @@ msgid "" "Get::Fix-Broken</literal>." msgstr "" "Beheben; Versucht ein System von vorhandenen beschädigten Abhängigkeiten zu " -"korrigieren. Diese Option kann, wenn sie mit install/remove benutzt wird, " +"korrigieren. Diese Option kann, wenn sie mit »install«/»remove« benutzt wird, " "einige Pakete weglassen, um es APT zu erlauben, eine wahrscheinliche Lösung " "herzuleiten. Jedes Paket, das angegeben ist, muss das Problem vollständig " "korrigieren. Die Option ist manchmal nötig, wenn APT zum ersten Mal " @@ -4335,18 +4273,12 @@ msgstr "" "(<literal>Debug::NoLocking</literal>) automatisch deaktivieren. Außerdem " "wird eine Mitteilung angezeigt, die angibt, dass dies nur eine Simulation " "ist, wenn die Option <literal>APT::Get::Show-User-Simulation-Note</literal> " -"gesetzt ist (Vorgabe ist true). Weder NoLocking noch die Mitteilung werden " +"gesetzt ist (Vorgabe ist »true«). Weder NoLocking noch die Mitteilung werden " "ausgelöst, wenn es als root ausgeführt wird (root sollte ohne weitere " "Warnungen von <literal>apt-get</literal> wissen, was er tut)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:392 -#, fuzzy -#| msgid "" -#| "Simulate prints out a series of lines each one representing a dpkg " -#| "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square " -#| "brackets indicate broken packages with and empty set of square brackets " -#| "meaning breaks that are of no consequence (rare)." msgid "" "Simulate prints out a series of lines each one representing a dpkg " "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets " @@ -4558,7 +4490,6 @@ msgstr "" msgid "<option>--purge</option>" msgstr "<option>--purge</option>" -# s/equivalent for/equivalent to the/ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:467 msgid "" @@ -4567,10 +4498,11 @@ msgid "" "<option>remove --purge</option> is equivalent for <option>purge</option> " "command. Configuration Item: <literal>APT::Get::Purge</literal>." msgstr "" -"»remove« »purge« für alles zu entfernende benutzen. Ein Stern (»*«) wird bei " -"Paketen angezeigt, die zum vollständigen Entfernen vorgemerkt sind. " -"<option>remove --purge</option> entspricht dem Befehl <option>purge</" -"option>. Konfigurationselement: <literal>APT::Get::Purge</literal>." +"»purge« anstelle von »remove« für alles zu entfernende benutzen. Ein " +"Stern (»*«) wird bei Paketen angezeigt, die zum vollständigen Entfernen " +"vorgemerkt sind. <option>remove --purge</option> entspricht dem Befehl " +"<option>purge</option>. Konfigurationselement: " +"<literal>APT::Get::Purge</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:474 @@ -4606,8 +4538,8 @@ msgstr "" "<command>apt-get</command> den Inhalt von <filename>&statedir;/lists</" "filename> automatisch verwalten, um sicherzustellen, dass veraltete Dateien " "gelöscht werden. Nur das häufige Ändern der Quelllisten stellt den einzigen " -"Grund zum Ausschalten der Option dar.Konfigurationselement: <literal>APT::" -"Get::List-Cleanup</literal>." +"Grund zum Ausschalten der Option dar. Konfigurationselement: " +"<literal>APT::Get::List-Cleanup</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:489 @@ -5111,15 +5043,11 @@ msgstr "showauto" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-mark.8.xml:82 -#, fuzzy -#| msgid "" -#| "<literal>showauto</literal> is used to print a list of manually 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." msgstr "" -"<literal>showauto</literal> wird benutzt, um eine Liste manuell " +"<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> @@ -5266,14 +5194,6 @@ msgstr "Vertrauenswürdige Archive" #. type: Content of: <refentry><refsect1><para> #: apt-secure.8.xml:67 -#, fuzzy -#| msgid "" -#| "The chain of trust from an apt archive to the end user is made up of " -#| "different steps. <command>apt-secure</command> is the last step in this " -#| "chain, trusting an archive does not mean that the packages that you trust " -#| "it do not contain malicious code but means that you trust the archive " -#| "maintainer. Its the archive maintainer responsibility to ensure that the " -#| "archive integrity is correct." msgid "" "The chain of trust from an apt archive to the end user is made up of " "different steps. <command>apt-secure</command> is the last step in this " @@ -5323,15 +5243,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt-secure.8.xml:92 -#, fuzzy -#| msgid "" -#| "Once the uploaded package is verified and included in the archive, the " -#| "maintainer signature is stripped off, an MD5 sum of the package is " -#| "computed and put in the Packages file. The MD5 sum of all of the packages " -#| "files are then computed and put into the Release file. The Release file " -#| "is then signed by the archive key (which is created once a year and " -#| "distributed through the FTP server. This key is also on the Debian " -#| "keyring." msgid "" "Once the uploaded package is verified and included in the archive, the " "maintainer signature is stripped off, an MD5 sum of the package is computed " @@ -5465,48 +5376,34 @@ msgstr "" #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para> #: apt-secure.8.xml:160 -#, fuzzy -#| msgid "" -#| "<literal>Create a toplevel Release file</literal>. if it does not exist " -#| "already. You can do this by running <command>apt-ftparchive release</" -#| "command> (provided in apt-utils)." msgid "" "<emphasis>Create a toplevel Release file</emphasis>, if it does not exist " "already. You can do this by running <command>apt-ftparchive release</" "command> (provided in apt-utils)." msgstr "" -"<literal>Create a toplevel Release file</literal>, wenn es nicht bereits " -"existiert. Sie können dies tun, indem Sie <command>apt-ftparchive release</" -"command> (aus apt-utils) ausführen." +"<emphasis>Erzeugen einer Release-Datei der obersten Stufe</emphasis>, wenn " +"sie nicht bereits existiert. Sie können dies erledigen, indem Sie " +"<command>apt-ftparchive release</command> (aus apt-utils) ausführen." #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para> #: apt-secure.8.xml:165 -#, fuzzy -#| msgid "" -#| "<literal>Sign it</literal>. 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 -abs -" "o Release.gpg Release</command>." msgstr "" -"<literal>Sign it</literal>. Sie können dies tun, indem Sie <command>gpg -abs " -"-o Release.gpg Release</command> ausführen." +"<emphasis>Es signieren</emphasis>. Sie können dies tun, indem Sie " +"<command>gpg -abs -o Release.gpg Release</command> ausführen." #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para> #: apt-secure.8.xml:168 -#, fuzzy -#| msgid "" -#| "<literal>Publish the key fingerprint</literal>, that way your users will " -#| "know what key they need to import in order to authenticate the files in " -#| "the archive." msgid "" "<emphasis>Publish the key fingerprint</emphasis>, that way your users will " "know what key they need to import in order to authenticate the files in the " "archive." msgstr "" -"<literal>Publish the key fingerprint</literal>, derart, dass Ihre Anwender " -"wissen, welchen Schlüssel sie importieren müssen, um die Dateien im Archiv " -"zu authentifizieren." +"<emphasis>Veröffentlichen Sie den Schlüsselfingerabdruck</emphasis>, damit " +"Ihre Anwender wissen, welchen Schlüssel sie importieren müssen, um die " +"Dateien im Archiv zu authentifizieren." #. type: Content of: <refentry><refsect1><para> #: apt-secure.8.xml:175 @@ -5680,13 +5577,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:50 -#, fuzzy -#| msgid "" -#| "The configuration file is organized in a tree with options organized into " -#| "functional groups. option specification is given with a double colon " -#| "notation, for instance <literal>APT::Get::Assume-Yes</literal> is an " -#| "option within the APT tool group, for the Get tool. options do not " -#| "inherit from their parent groups." msgid "" "The configuration file is organized in a tree with options organized into " "functional groups. Option specification is given with a double colon " @@ -5702,15 +5592,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:56 -#, fuzzy -#| msgid "" -#| "Syntactically the configuration language is modeled after what the ISC " -#| "tools such as bind and dhcp use. Lines starting with <literal>//</" -#| "literal> are treated as comments (ignored), as well as all text between " -#| "<literal>/*</literal> and <literal>*/</literal>, just like C/C++ " -#| "comments. Each line is of the form <literal>APT::Get::Assume-Yes \"true" -#| "\";</literal> The trailing semicolon is required and the quotes are " -#| "optional. A new scope can be opened with curly braces, like:" msgid "" "Syntactically the configuration language is modeled after what the ISC tools " "such as bind and dhcp use. Lines starting with <literal>//</literal> are " @@ -5729,9 +5610,14 @@ msgstr "" "literal> beginnen, werden als Kommentar betrachtet (und ignoriert), ebenso " "wie jeglicher Text zwischen <literal>/*</literal> und <literal>*/</literal>, " "wie bei C/C++-Kommentaren. Jede Zeile hat die Form <literal>APT::Get::Assume-" -"Yes \"true\";</literal>. Das abschließende Semikolon wird benötigt und " -"Klammern sind optional. Ein neuer Geltungsbereich kann mit geschweiften " -"Klammern geöffnet werden, wie:" +"Yes \"true\";</literal>. Das abschließende Semikolon und die " +"Anführungszeichen werden benötigt. Der Wert muss in einer Zeile stehen und " +"es gibt keine Möglichkeit Zeichenketten aneinander zu hängen. Er darf keine " +"inneren Anführungszeichen enthalten. Das Verhalten des Backslashs »\\« " +"und maskierter Zeichen innerhalb eines Wertes ist nicht festgelegt und diese " +"sollten nicht benutzt werden. Ein Optionsname darf alphanumerische Zeichen " +"und die Zeichen »/-:._+« enthalten. Ein neuer Geltungsbereich kann mit " +"geschweiften Klammern geöffnet werden, wie:" #. type: Content of: <refentry><refsect1><informalexample><programlisting> #: apt.conf.5.xml:70 @@ -5808,14 +5694,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:98 -#, fuzzy -#| msgid "" -#| "Two specials are allowed, <literal>#include</literal> and " -#| "<literal>#clear</literal>: <literal>#include</literal> will include the " -#| "given file, unless the filename ends in a slash, then the whole directory " -#| "is included. <literal>#clear</literal> is used to erase a part of the " -#| "configuration tree. The specified element and all its descendants are " -#| "erased. (Note that these lines also need to end with a semicolon.)" msgid "" "Two specials are allowed, <literal>#include</literal> (which is deprecated " "and not supported by alternative implementations) and <literal>#clear</" @@ -5825,13 +5703,15 @@ msgid "" "The specified element and all its descendants are erased. (Note that these " "lines also need to end with a semicolon.)" msgstr "" -"Es sind die beiden Spezialfälle <literal>#include</literal> und " -"<literal>#clear</literal> erlaubt: <literal>#include</literal> wird die " -"angegebene Datei einfügen außer, wenn der Dateiname mit einem Schrägstrich " -"endet, dann wird das ganze Verzeichnis eingefügt. <literal>#clear</literal> " -"wird benutzt, um einen Teil des Konfigurationsbaums zu löschen. Das " -"angegebene Element und alle davon absteigenden Elemente werden gelöscht. " -"(Beachten Sie, dass diese Zeilen auch mit einem Semikolon enden müssen.)" +"Es sind die beiden Spezialfälle <literal>#include</literal> (das " +"missbilligt ist und von alternativen Implementierungen nicht unterstützt " +"wird) und <literal>#clear</literal> erlaubt: <literal>#include</literal> " +"wird die angegebene Datei einfügen außer, wenn der Dateiname mit einem " +"Schrägstrich endet, dann wird das ganze Verzeichnis eingefügt. " +"<literal>#clear</literal> wird benutzt, um einen Teil des " +"Konfigurationsbaums zu löschen. Das angegebene Element und alle davon " +"absteigenden Elemente werden gelöscht. (Beachten Sie, dass diese Zeilen " +"auch mit einem Semikolon enden müssen.)" #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:106 @@ -5944,8 +5824,8 @@ msgid "" msgstr "" "Standard-Release von dem Pakete installiert werden, wenn mehr als eine " "Version verfügbar ist. Enthält Release-Name, Codename oder Release-Version. " -"Beispiele: »stable«, »testing, »unstable«, »lenny«, »squeeze«, »4.0«, »5.0«. Siehe " -"auch &apt-preferences;." +"Beispiele: »stable«, »testing, »unstable«, »lenny«, »squeeze«, »4.0«, »5.0«. " +"Siehe auch &apt-preferences;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:146 @@ -6018,6 +5898,42 @@ msgid "" "distribution and to the APT team with the buglink below so they can work on " "improving or correcting the upgrade process." msgstr "" +"Standardmäßig »on«, wodurch APT veranlasst wird, »essential«- oder " +"»important«-Pakete so schnell wie möglich in der " +"»install«-/»upgrade«-Operation zu installieren. Dies wird getan, um den " +"Effekt eines gescheiterterten &dpkg;-Aufrufs zu begrenzen: Wenn diese " +"Option ausgeschaltet ist, behandelt APT ein »important«-Paket auf die " +"gleiche Weise wie ein »extra«-Paket: Zwischen dem Entpacken des " +"»important«-Pakets A und seiner Konfiguration können dann viele andere " +"Entpack- oder Konfigurationsaufrufe liegen, z.B. für Paket B, das keine " +"Beziehung zu A hat, aber den dpkg-Aufruf zum Scheitern bringt (z.B. weil " +"das Betreuerskript von Paket B Fehler generiert), die als Ergebnis einen " +"Systemstatus haben, in dem Paket A entpackt, aber nicht konfiguriert ist " +"und für kein von A abhängendes Paket länger gewährleistet ist, dass es " +"funktioniert, weil die Abhängigkeit zu A nicht länger befriedigt wird. Das " +"unmittelbare Konfigurationskennzeichen wird außerdem auf alle " +"Abhängigkeiten angewandt, was zu einem Problem führen könnten, falls die " +"Abhängigkeiten z.B. einen Kreis bilden, so dass eine Abhängigkeit mit der " +"Unmittelbarmarkierung mit einer Vorabhängigkeit vergleichbar ist. So ist es " +"theoretisch möglich, dass APT einer Situation begegnet, in der keine " +"unmittelbare Konfiguration durchgeführt, ein Fehler ausgegeben und sich auf " +"diese Option bezogen werden kann, so dass der Anwender die unmittelbare " +"Konfiguration zeitweise deaktivieren kann, um in der Lage zu sein, erneut " +"ein »install«/»upgrade« durchzuführen. Beachten Sie, dass hier das Wort " +"»theoretisch« benutzt wird, denn dieses Problem ist bis jetzt in der " +"Realität nur ein paar mal in unstabilen Distributionsversionen aufgetreten " +"und wurde durch falsche Abhängigkeiten des fraglichen Pakets ausgelöst oder " +"durch ein System in bereits kaputtem Status, so dass Sie diese Option nicht " +"unbesehen abschalten sollten, da das oben erwähnte Szenario nicht das " +"einzige unmittelbare Problem ist, das die Konfiguration überhaupt " +"verhindern sollte. Bevor eine große Operation wie " +"<literal>dist-upgrade</literal> mit dieser ausgeschalteten Option " +"ausgeführt wird, sollte explizit versucht werden, " +"<literal>install</literal> des Pakets durchzuführen. APT ist nicht in der " +"Lage unmittelbar zu konfigurieren, aber stellen Sie sicher, dass Sie Ihr " +"Problem außerdem an Ihre Distribution und an das APT-Team berichten mit " +"nachstehendem Fehlerverweis, so dass es am Verbessern oder Korrigieren des " +"Upgrade-Prozesses arbeiten kann." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:181 @@ -6102,7 +6018,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:209 msgid "CDROM" -msgstr "CDROM" +msgstr "CD-ROM" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:210 @@ -6110,7 +6026,7 @@ msgid "" "The CDROM subsection controls the &apt-cdrom; tool, please see its " "documentation for more information about the options here." msgstr "" -"Der CDROM-Unterabschnitt steuert das &apt-cdrom;-Werkzeug. Lesen Sie bitte " +"Der CD-ROM-Unterabschnitt steuert das &apt-cdrom;-Werkzeug. Lesen Sie bitte " "dessen Dokumentation, um weitere Informationen über die Optionen hier zu " "erhalten." @@ -6246,15 +6162,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:267 -#, fuzzy -#| msgid "" -#| "One setting is provided to control the pipeline depth in cases where the " -#| "remote server is not RFC conforming or buggy (such as Squid 2.0.2) " -#| "<literal>Acquire::http::Pipeline-Depth</literal> can be a value from 0 to " -#| "5 indicating how many outstanding requests APT should send. A value of " -#| "zero MUST be specified if the remote host does not properly linger on TCP " -#| "connections - otherwise data corruption will occur. Hosts which require " -#| "this are in violation of RFC 2068." msgid "" "One setting is provided to control the pipeline depth in cases where the " "remote server is not RFC conforming or buggy (such as Squid 2.0.2). " @@ -6296,6 +6203,10 @@ msgid "" "User-Agent for the http download method as some proxies allow access for " "clients only if the client uses a known identifier." msgstr "" +"<literal>Acquire::http::User-Agent</literal> kann benutzt werden, um einen " +"unterschiedlichen User-Agent für die HTTP-Download-Methode zu setzten, da " +"einige Proxys den Clients nur dann Zugriff gewähren, wenn der Client einen " +"bekannten Bezeichner verwendet." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> #: apt.conf.5.xml:286 @@ -6304,11 +6215,6 @@ msgstr "https" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:287 -#, fuzzy -#| msgid "" -#| "HTTPS URIs. Cache-control and proxy options are the same as for " -#| "<literal>http</literal> method. <literal>Pipeline-Depth</literal> option " -#| "is not supported yet." msgid "" "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy " "options are the same as for <literal>http</literal> method and will also " @@ -6316,9 +6222,12 @@ msgid "" "not explicitly set for https. <literal>Pipeline-Depth</literal> option is " "not supported yet." msgstr "" -"HTTPS-URIs. Zwischenspeichersteuerung und Proxy-Optionen entsprehen denen " -"der <literal>http</literal>-Methode. Die Option <literal>Pipeline-Depth</" -"literal> wird noch nicht unterstützt." +"HTTPS-URIs. Zwischenspeichersteuerung-, Zeitüberschreitung-, AllowRedirect-, " +"Dl-Limit- und Proxy-Optionen entsprechen denen der " +"<literal>http</literal>-Methode und werden auch für die Optionen der " +"Methode <literal>http</literal> vorgegeben, falls sie nicht explizit für " +"HTTPS gesetzt sind. Die Option <literal>Pipeline-Depth</literal> wird noch " +"nicht unterstützt." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:293 @@ -6453,10 +6362,9 @@ msgstr "cdrom" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> #: apt.conf.5.xml:356 -#, fuzzy, no-wrap -#| msgid "\"/cdrom/\"::Mount \"foo\";" +#, no-wrap msgid "/cdrom/::Mount \"foo\";" -msgstr "\"/cdrom/\"::Mount \"foo\";" +msgstr "/cdrom/::Mount \"foo\";" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:351 @@ -6471,12 +6379,12 @@ msgid "" "can be specified using UMount." msgstr "" "CDROM-URIs; Die einzige Einstellung für CDROM-URIs ist der Einhängepunkt " -"<literal>cdrom::Mount</literal>, der der Einhängepunkt des CDROM-Laufwerks " +"<literal>cdrom::Mount</literal>, der der Einhängepunkt des CD-ROM-Laufwerks " "sein muss, wie er in <filename>/etc/fstab</filename> angegeben wurde. Es ist " "möglich alternative Ein- und Aushängebefehle anzugeben, falls Ihr " "Einhängepunkt nicht in der fstab aufgelistet werden kann (so wie beim " "Einhängen per SMB und alten Mount-Paketen). Die Syntax besteht darin, " -"<placeholder type=\"literallayout\" id=\"0\"/> in den CDROM-Block " +"<placeholder type=\"literallayout\" id=\"0\"/> in den CD-ROM-Block " "einzufügen. Der abschließende Schrägstrich ist wichtig. Aushängebefehle " "können per UMount angegeben werden." @@ -6622,7 +6530,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> #: apt.conf.5.xml:396 msgid "Languages" -msgstr "" +msgstr "Sprachen" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:397 @@ -6636,12 +6544,21 @@ msgid "" "long Languagecodes are rare, so please inform you which ones are available " "before you set here impossible values." msgstr "" +"Der Unterabschnitt Languages steuert welche " +"<filename>Translation</filename>-Dateien heruntergeladen werden und in " +"welcher Reihenfolge APT versucht, die Beschreibungsübersetzungen anzuzeigen. " +"APT wird versuchen, die erste verfügbare Beschreibung für die zuerst " +"aufgelistete Sprache anzuzeigen. Sprachen können durch ihre kurzen oder " +"langen Sprachcodes definiert sein. Beachten Sie, dass nicht alle Archive " +"<filename>Translation</filename>-Dateien für jede Sprache bereitstellen, " +"besonders lange Sprachcodes sind selten. Informieren Sie sich deshalb bitte " +"welche verfügbar sind, bevor Sie hier unmögliche Werte einsetzen." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting> #: apt.conf.5.xml:413 #, no-wrap msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" -msgstr "" +msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:403 @@ -6665,6 +6582,26 @@ msgid "" "order would be \"fr, de, en\". <placeholder type=\"programlisting\" id=\"0" "\"/>" msgstr "" +"Die Standardliste beinhaltet »environment« und »en«. " +"»<literal>environment</literal>« hat hier eine besondere Bedeutung: Es wird " +"zur Laufzeit durch die Sprachcodes ersetzt, die aus der Umgebungsvariable " +"<literal>LC_MESSAGES</literal> extrahiert wurden. Es wird außerdem " +"sicherstellen, dass diese Codes nicht zweimal in der Liste enthalten sind. " +"Falls <literal>LC_MESSAGES</literal> auf »C« gesetzt ist, wird nur die " +"Datei <filename>Translation-en</filename> (falls verfügbar) benutzt. Um APT " +"zu zwingen, keine Übersetzungsdatei zu benutzen, benutzen Sie die Einstellung " +"<literal>Acquire::Languages=none</literal>. »<literal>none</literal>« ist " +"ein weiterer Code mit besonderer Bedeutung, der die Suche nach einer " +"passenden <filename>Translation</filename>-Datei stoppen wird. Dies kann " +"vom Systemadministrator benutzt werden, um APT mitzuteilen, dass es auch " +"diese Dateien herunterladen soll ohne sie aktuell zu benutzen, falls die " +"Umgebungsvariable diese Sprachen nicht angibt. Daher wird die folgende " +"Beispielkonfiguration in der Reihenfolge »en,de« zu einer englischen und " +"»de,en« zu einer deutschen Lokalisierung führen. Beachten Sie, dass »fr« " +"heruntergeladen, aber nicht benutzt wird, falls APT nicht in einer " +"französischen Lokalisierung benutzt wird. In einer solchen Umgebung wäre " +"die Reihenfolge »fr, de, en«. <placeholder type=\"programlisting\" id=\"0" +"\"/>" #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:217 @@ -6820,13 +6757,13 @@ msgid "" "for instance). pre-auto performs this action before downloading new " "packages." msgstr "" -"Zwischenspeicherbereinigungsmodus; Dieser Wert kann entweder always, prompt, " -"auto, pre-auto oder never sein. always und prompt werden, nachdem das " -"Upgrade durchgeführt wurde, alle Pakete aus dem Zwischenspeicher entfernen, " -"prompt (die Vorgabe) tut dies bedingt. auto entfernt nur jene Pakete, die " -"nicht länger heruntergeladen werden können (zum Beispiel, weil sie durch " -"eine neue Version ersetzt wurden). pre-auto führt diese Aktion vor dem " -"Herunterladen neuer Pakete durch." +"Zwischenspeicherbereinigungsmodus; Dieser Wert kann entweder »always«, " +"»prompt«, »auto«, »pre-auto« oder »never« sein. »always« und »prompt« " +"werden, nachdem das Upgrade durchgeführt wurde, alle Pakete aus dem " +"Zwischenspeicher entfernen, »prompt« (die Vorgabe) tut dies bedingt. »auto« " +"entfernt nur jene Pakete, die nicht länger heruntergeladen werden können " +"(zum Beispiel, weil sie durch eine neue Version ersetzt wurden). »pre-auto« " +"führt diese Aktion vor dem Herunterladen neuer Pakete durch." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:485 @@ -7058,16 +6995,6 @@ msgstr "DPkg::NoTriggers" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:567 -#, fuzzy -#| msgid "" -#| "Add the no triggers flag to all dpkg calls (expect the ConfigurePending " -#| "call). See &dpkg; if you are interested in what this actually means. In " -#| "short: dpkg will not run the triggers then this flag is present unless it " -#| "is explicit called to do so in an extra call. Note that this option " -#| "exists (undocumented) also in older apt versions with a slightly " -#| "different meaning: Previously these option only append --no-triggers to " -#| "the configure calls to dpkg - now apt will add these flag also to the " -#| "unpack and remove calls." msgid "" "Add the no triggers flag to all dpkg calls (except the ConfigurePending " "call). See &dpkg; if you are interested in what this actually means. In " @@ -7085,7 +7012,7 @@ msgstr "" "außerdem in älteren APT-Versionen mit einer geringfügig anderen Bedeutung " "existiert (nicht dokumentiert): Vorher hing diese Option nur --no-triggers " "an die Konfigurationsaufrufe für Dpkg an – nun wird APT diese Markierung " -"außerdem an die unpack- und remove-Aufrufe anhängen." +"außerdem an die »unpack«- und »remove«-Aufrufe anhängen." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> #: apt.conf.5.xml:574 @@ -7094,20 +7021,6 @@ msgstr "PackageManager::Configure" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:575 -#, fuzzy -#| msgid "" -#| "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " -#| "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " -#| "value and causes APT to configure all packages explicit. The " -#| "\"<literal>smart</literal>\" way is it to configure only packages which " -#| "need to be configured before another package can be unpacked (Pre-" -#| "Depends) and let the rest configure by dpkg with a call generated by the " -#| "next option. \"<literal>no</literal>\" on the other hand will not " -#| "configure anything and totally relay on dpkg for configuration (which " -#| "will at the moment fail if a Pre-Depends is encountered). Setting this " -#| "option to another than the all value will implicit activate also the next " -#| "option per default as otherwise the system could end in an unconfigured " -#| "status which could be unbootable!" msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@ -7142,14 +7055,6 @@ msgstr "DPkg::ConfigurePending" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:586 -#, fuzzy -#| msgid "" -#| "If this option is set apt will call <command>dpkg --configure --pending</" -#| "command> to let dpkg handle all required configurations and triggers. " -#| "This option is activated automatic per default if the previous option is " -#| "not set to <literal>all</literal>, but deactivating could be useful if " -#| "you want to run APT multiple times in a row - e.g. in an installer. In " -#| "this sceneries you could deactivate this option in all but the last run." msgid "" "If this option is set apt will call <command>dpkg --configure --pending</" "command> to let dpkg handle all required configurations and triggers. This " @@ -7342,7 +7247,7 @@ msgid "" "in CDROM IDs." msgstr "" "<literal>Debug::IdentCdrom</literal> schaltet das Einbeziehen von statfs-" -"Daten in CDROM-IDs aus." +"Daten in CD-ROM-IDs aus." #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:684 @@ -7607,8 +7512,8 @@ msgid "" "there is none or if it is the same version as the installed. " "<literal>section</literal> is the name of the section the package appears in." msgstr "" -"Generiert Fehlersuchmeldungen, die beschreiben, welches Paket als keep/" -"install/remove markiert ist, währen der ProblemResolver seine Arbeit " +"Generiert Fehlersuchmeldungen, die beschreiben, welches Paket als »keep«/" +"»install«/»remove« markiert ist, während der ProblemResolver seine Arbeit " "verrichtet. Jedes Hinzufügen oder Löschen kann zusätzliche Aktionen " "auslösen. Sie werden nach zwei eingerückten Leerzeichen unter dem " "Originaleintrag angezeigt. Jede Zeile hat das Format <literal>MarkKeep</" @@ -7957,7 +7862,7 @@ msgid "" "Note also that downgrading a package can be risky.)" msgstr "" "Führen Sie niemals ein Downgrade durch, außer wenn die Priorität verfügbarer " -"Pakete 1000 übersteigt. »Downgrading« ist das Installieren einer weniger " +"Pakete 1000 übersteigt. (»Downgrading« ist das Installieren einer weniger " "aktuellen Version, an Stelle einer aktuelleren Version. Beachten Sie, dass " "keine Standardpriorität von APT 1000 übersteigt. So hohe Prioritäten können " "nur durch die Einstellungsdatei gesetzt werden. Beachten Sie außerdem, dass " @@ -8110,7 +8015,7 @@ msgid "" msgstr "" "Dieser Eintrag in allgemeiner Form in der APT-Einstellungsdatei verwendet " "nur Gruppen von Paketen. Der folgende Eintrag weist zum Beispiel allen " -"Paketversionen eine hohe Priorität zu, die lokale liegen." +"Paketversionen eine hohe Priorität zu, die lokal liegen." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> #: apt_preferences.5.xml:175 @@ -8952,7 +8857,7 @@ msgstr "" "Mit einer geeigneten &sources-list;-Datei und der obigen Einstellungsdatei " "wird jeder der folgenden Befehle APT veranlassen, ein Upgrade auf die letzte" "(n) Version(en) im Release mit Codenamen <literal>squeeze</literal> " -"durchzuführen.<placeholder type=\"programlisting\" id=\"0\"/>" +"durchzuführen. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> #: apt_preferences.5.xml:608 @@ -9002,12 +8907,6 @@ msgstr "Paketressourcenliste für APT" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:34 -#, fuzzy -#| msgid "" -#| "The package resource list is used to locate archives of the package " -#| "distribution system in use on the system. At this time, this manual page " -#| "documents only the packaging system used by the Debian GNU/Linux system. " -#| "This control file is located in <filename>/etc/apt/sources.list</filename>" msgid "" "The package resource list is used to locate archives of the package " "distribution system in use on the system. At this time, this manual page " @@ -9017,21 +8916,11 @@ msgstr "" "Die Paketquellenliste wird benutzt, um Archive des Paketverteilungssystems, " "das auf dem System benutzt wird, zu finden. Momentan dokumentiert diese " "Handbuchseite nur das vom Debian-GNU/Linux-System benutzte " -"Paketierungssystem. Die Steuerungsdatei befindet sich in <filename>/etc/apt/" -"sources.list</filename>." +"Paketierungssystem. Diese Steuerungsdatei ist " +"<filename>/etc/apt/sources.list</filename>." #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:39 -#, fuzzy -#| msgid "" -#| "The source list is designed to support any number of active sources and a " -#| "variety of source media. The file lists one source per line, with the " -#| "most preferred source listed first. The format of each line is: " -#| "<literal>type uri args</literal> The first item, <literal>type</literal> " -#| "determines the format for <literal>args</literal> <literal>uri</literal> " -#| "is a Universal Resource Identifier (URI), which is a superset of the more " -#| "specific and well-known Universal Resource Locator, or URL. The rest of " -#| "the line can be marked as a comment by using a #." msgid "" "The source list is designed to support any number of active sources and a " "variety of source media. The file lists one source per line, with the most " @@ -9083,17 +8972,6 @@ msgstr "Die Typen deb und deb-src" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:61 -#, 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, " @@ -9118,10 +8996,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:73 -#, fuzzy -#| msgid "" -#| "The format for a <filename>sources.list</filename> entry using the " -#| "<literal>deb</literal> and <literal>deb-src</literal> types are:" msgid "" "The format for a <filename>sources.list</filename> entry using the " "<literal>deb</literal> and <literal>deb-src</literal> types is:" @@ -9137,16 +9011,6 @@ msgstr "deb URI Distribution [Komponente1] [Komponente2] [...]" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:78 -#, fuzzy -#| msgid "" -#| "The URI for the <literal>deb</literal> type must specify the base of the " -#| "Debian distribution, from which APT will find the information it needs. " -#| "<literal>distribution</literal> can specify an exact path, in which case " -#| "the components must be omitted and <literal>distribution</literal> must " -#| "end with a slash (/). This is useful for when only a particular sub-" -#| "section of the archive denoted by the URI is of interest. If " -#| "<literal>distribution</literal> does not specify an exact path, at least " -#| "one <literal>component</literal> must be present." msgid "" "The URI for the <literal>deb</literal> type must specify the base of the " "Debian distribution, from which APT will find the information it needs. " @@ -9275,14 +9139,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: sources.list.5.xml:141 -#, fuzzy -#| msgid "" -#| "The http scheme specifies an HTTP server for the archive. If an " -#| "environment variable <envar>http_proxy</envar> is set with the format " -#| "http://server:port/, the proxy server specified in <envar>http_proxy</" -#| "envar> will be used. Users of authenticated HTTP/1.1 proxies may use a " -#| "string of the format http://user:pass@server:port/ Note that this is an " -#| "insecure method of authentication." msgid "" "The http scheme specifies an HTTP server for the archive. If an environment " "variable <envar>http_proxy</envar> is set with the format http://server:" @@ -9364,7 +9220,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> #: sources.list.5.xml:178 msgid "more recongnizable URI types" -msgstr "" +msgstr "weitere erkennbare URI-Typen" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: sources.list.5.xml:180 @@ -9378,6 +9234,15 @@ msgid "" "<citerefentry> <refentrytitle><filename>apt-transport-debtorrent</filename></" "refentrytitle> <manvolnum>1</manvolnum></citerefentry>." msgstr "" +"APT kann mit weiteren Methoden, die in anderen optionalen Paketen geliefert " +"werden, die dem Namensschema " +"<literal>apt-transport-<replaceable>Methode</replaceable></literal> folgen " +"sollten, erweitert werden. Das APT-Team betreut z.B. außerdem das Paket " +"<literal>apt-transport-https</literal>, das Zugriffsmethoden für HTTPS-URIs " +"mit Funktionen bereitstellt, die denen der HTTP-Methode ähneln, bei der " +"aber andere Methoden für z.B. debtorrent verfügbar sind, siehe " +"<citerefentry> <refentrytitle><filename>apt-transport-debtorrent</filename></" +"refentrytitle> <manvolnum>1</manvolnum></citerefentry>." #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:122 @@ -9385,8 +9250,8 @@ msgid "" "The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, " "rsh. <placeholder type=\"variablelist\" id=\"0\"/>" msgstr "" -"Die aktuell erkannten URI-Typen sind cdrom, file, http, ftp, copy, ssh, rsh. " -"<placeholder type=\"variablelist\" id=\"0\"/>" +"Die aktuell erkannten URI-Typen sind »cdrom«, »file«, »http«, »ftp«, " +"»copy«, »ssh«, »rsh«. <placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:194 @@ -9407,7 +9272,8 @@ msgstr "deb file:/home/jason/debian stable main contrib non-free" #: sources.list.5.xml:198 msgid "As above, except this uses the unstable (development) distribution." msgstr "" -"Wie oben, außer das dies die unstable- (Entwicklungs-) Distribution benutzt." +"Wie oben, außer das dies die »unstable«- (Entwicklungs-) Distribution " +"benutzt." #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml:199 @@ -9458,12 +9324,6 @@ msgstr "deb ftp://ftp.debian.org/debian stable contrib" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:212 -#, fuzzy -#| msgid "" -#| "Uses FTP to access the archive at ftp.debian.org, under the debian " -#| "directory, and uses only the unstable/contrib area. If this line appears " -#| "as well as the one in the previous example in <filename>sources.list</" -#| "filename>. a single FTP session will be used for both resource lines." msgid "" "Uses FTP to access the archive at ftp.debian.org, under the debian " "directory, and uses only the unstable/contrib area. If this line appears as " @@ -9519,8 +9379,8 @@ msgstr "" "<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\"/>" +"»non-us« ist nicht länger so strukturiert] " +"<placeholder type=\"literallayout\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:234 @@ -9530,28 +9390,30 @@ msgstr "&apt-cache; &apt-conf;" #. type: <title> #: guide.sgml:4 msgid "APT User's Guide" -msgstr "" +msgstr "APT-Benutzerhandbuch" #. type: #: guide.sgml:6 offline.sgml:6 msgid "Jason Gunthorpe jgg@debian.org" -msgstr "" +msgstr "Jason Gunthorpe jgg@debian.org" #. type: #: guide.sgml:7 msgid "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $" -msgstr "" +msgstr "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $" #. type: #: guide.sgml:11 msgid "" "This document provides an overview of how to use the the APT package manager." msgstr "" +"Dieses Dokument stellt eine Übersicht bereit, wie das " +"APT-Paketverwaltungsprogramm benutzt wird." #. type: #: guide.sgml:15 msgid "Copyright © Jason Gunthorpe, 1998." -msgstr "" +msgstr "Copyright © Jason Gunthorpe, 1998." #. type:

#: guide.sgml:21 offline.sgml:22 @@ -9561,6 +9423,10 @@ msgid "" "published by the Free Software Foundation; either version 2 of the License, " "or (at your option) any later version." msgstr "" +"»APT« und dieses Dokument sind freie Software. Sie können sie weitergeben " +"und/oder verändern unter den Bedingungen der GNU General Public License, " +"wie sie von der Free Software Foundation veröffentlicht wird; entweder " +"Version 2 der Lizenz oder (optional) jeder späteren Version." #. type:

#: guide.sgml:24 offline.sgml:25 @@ -9568,13 +9434,13 @@ msgid "" "For more details, on Debian GNU/Linux systems, see the file /usr/share/" "common-licenses/GPL for the full license." msgstr "" +"Siehe für weitere Details auf Debian-Systemen die Datei " +"/usr/share/common-licenses/GPL, die die vollständige Lizenz enthält." #. type: #: guide.sgml:32 -#, fuzzy -#| msgid "generate" msgid "General" -msgstr "generate" +msgstr "Allgemein" #. type:

#: guide.sgml:38 @@ -9584,11 +9450,16 @@ msgid "" "provide a way to install and remove packages as well as download new " "packages from the Internet." msgstr "" +"Das Paket APT enthält derzeit zwei Abschnitte, die " +"APT-dselect-Methode und die Anwenderschnittstelle " +"apt-get für die Befehlszeile. Beide stellen eine Möglichkeit " +"bereit, Pakete zu installieren, zu entfernen, sowie neue Pakete aus dem " +"Internet herunterzuladen." #. type: #: guide.sgml:39 msgid "Anatomy of the Package System" -msgstr "" +msgstr "Anatomie des Paketsystems" #. type:

#: guide.sgml:44 @@ -9597,6 +9468,10 @@ msgid "" "with each package to help assure that it integrates cleanly and easily into " "the system. The most prominent of its features is the dependency system." msgstr "" +"Das Debian-Paketierungssystem besitzt eine große Anzahl von Informationen, " +"die mit jedem Paket verbunden sind, um zu helfen sicherzustellen, dass es " +"ordentlich und leicht in das System integriert wird. Das bekannteste seiner " +"Funktionen ist das Abhängigkeitssystem." #. type:

#: guide.sgml:52 @@ -9607,6 +9482,12 @@ msgid "" "things the average user is required to install. Also, it allows for choices " "in mail transport agents, X servers and so on." msgstr "" +"Das Abhängigkeitssystem erlaubt individuellen Programmen, Gebrauch von " +"gemeinsam im System benutzten Elementen, wie Bibliotheken, zu machen. Es " +"vereinfacht, selten benutze Teile eines Programms in separaten Paketen zu " +"platzieren, um die Zahl von Dingen zu verringern, die der " +"Durchschnittsanwender installieren sollte. Außerdem erlaubt es die Auswahl " +"von Mail-Transport-Agenten, X-Servern und so weiter." #. type:

#: guide.sgml:57 @@ -9616,6 +9497,11 @@ msgid "" "package requires another package to be installed at the same time to work " "properly." msgstr "" +"Der erste Schritt zum Verständnis des Abhängigkeitssystems besteht darin, " +"das Konzept einer einfachen Abhängigkeit zu begreifen. Die Bedeutung einer " +"einfachen Abhängigkeit besteht darin, dass ein Paket ein anderes Paket " +"benötigt, das zu gleichen Zeit installiert sein muss, um ordentlich zu " +"funktionieren." #. type:

#: guide.sgml:63 @@ -9625,6 +9511,11 @@ msgid "" "simple dependency on GPG. Also, because it is an emacs extension it has a " "simple dependency on emacs, without emacs it is completely useless." msgstr "" +"Mailcrypt ist zum Beispiel eine Emacs-Erweiterung, die hilft, E-Mails mit " +"GPG zu verschlüsseln. Ohne installiertes GPG ist Mailcrypt unbrauchbar, " +"deshalb hat Mailcrypt eine einfache Abhängigkeit von GPG. Da es außerdem " +"eine Emacs-Erweiterung ist, hat es ebenfalls eine einfache Abhängigkeit von " +"Emacs. Ohne Emacs ist es komplett unbenutzbar." #. type:

#: guide.sgml:73 @@ -9638,6 +9529,16 @@ msgid "" "system so all mail transport agents have a conflicting dependency with all " "other mail transport agents." msgstr "" +"Die andere wichtige Abhängigkeit, die es zu verstehen gilt, ist eine in " +"Konflikt stehende Abhängigkeit. Das bedeutet, dass das Paket, wenn es mit " +"einem anderen Paket installiert ist, nicht funktioniert und möglicherweise " +"extrem schädlich für das System sein könnte. Stellen Sie sich als Beispiel " +"einen Mail-Transport-Agenten wie Sendmail, Exim oder QMail vor. Es ist " +"nicht möglich, zwei Mail-Transport-Agenten installiert zu haben, da beide " +"im Netzwerk auf zu empfangende Mails warten. Der Versuch, zwei zu " +"installieren, würde das System ernsthaft beschädigen, weshalb alle " +"Mail-Transport-Agenten in Konflikt stehende Abhängigkeiten mit allen " +"anderen Mail-Transport-Agenten haben." #. type:

#: guide.sgml:83 @@ -9651,6 +9552,15 @@ msgid "" "depend on mail-transport-agent. This can add a great deal of confusion when " "trying to manually fix packages." msgstr "" +"Als zusätzliche Komplikation besteht die Möglichkeit, dass ein Paket " +"vortäuscht, ein anderes Paket zu sein. Bedenken Sie, dass Exim und Sendmail " +"in vieler Hinsicht identisch sind – sie liefern beide E-Mails aus und " +"verstehen eine gemeinsame Schnittstelle. Daher hat das Paketsystem " +"die Möglichkeit, beide als Mail-Transport-Agenten zu deklarieren. Deshalb " +"deklarieren Exim und Sendmail, dass sie einen Mail-Transport-Agenten " +"bereitstellen und andere Pakete, die einen Mail-Transport-Agenten benötigen, " +"dass sie von einem Mail-Transport-Agenten abhängen. Die kann zu großer " +"Verwirrung führen, wenn manuell versucht wird, Pakete zu reparieren." #. type:

#: guide.sgml:88 @@ -9660,6 +9570,11 @@ msgid "" "issues by providing a number of automatic algorithms that help in selecting " "packages for installation." msgstr "" +"Zu jeder Zeit könnte eine einzelne Abhängigkeit von Paketen vorgefunden " +"werden, die bereits installiert sind oder nicht. APT versucht beim Auflösen " +"von Abhängigkeitsproblemen zu helfen, indem es eine Anzahl automatischer " +"Algorithmen bereitstellt, die bei der Auswahl von Paketen zur Installation " +"helfen." #. type:

#: guide.sgml:102 @@ -9669,6 +9584,10 @@ msgid "" "understand .deb files, it works with the package's proper name and can only " "install .deb archives from a Source." msgstr "" +"apt-get stellt eine einfache Möglichkeit zu Verfügung, Pakete " +"auf der Befehlszeile zu installieren. Anders als dpkg versteht " +"apt-get keine .deb-Dateien. Es arbeitet mit dem Eigennamen des " +"Pakets und kann .deb-Archive nur aus einer Quelle installieren." #. type:

#: guide.sgml:109 @@ -9680,6 +9599,12 @@ msgid "" "packages are available. This is done with apt-get update. For " "instance," msgstr "" +"Das Erste

Falls Sie einen HTTP-Proxy-Server benutzen, müssen " +"Sie zuerst die Umgebungsvariable »http_proxy« setzen, siehe " +"sources.list(5)

, das Sie vor der Benutzung von " +"apt-get tun sollten, ist es, die Paketlisten von der " +"Quelle herunterzuladen, so dass es weiß, welche Pakete verfügbar " +"sind. Dies wird mit apt-get update erledigt. Zum Beispiel," #. type: #: guide.sgml:116 @@ -9691,11 +9616,17 @@ msgid "" "Reading Package Lists... Done\n" "Building Dependency Tree... Done" msgstr "" +"# apt-get update\n" +"OK http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n" +"OK http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n" +"Paketlisten werden gelesen... Fertig\n" +"Abhängigkeitsbaum wird aufgebaut... Fertig" #. type:

#: guide.sgml:120 msgid "Once updated there are several commands that can be used:" msgstr "" +"Einmal aktualisiert stehen mehrere Befehl zur Benutzung zur Verfügung:" #. type:

#: guide.sgml:131 @@ -9708,6 +9639,16 @@ msgid "" "on new packages or conflict with some other package. dselect or " "apt-get install can be used to force these packages to install." msgstr "" +"»Upgrade« wird versuchen, ein behutsames Upgrade des ganzen Systems " +"durchzuführen. »Upgrade« wird niemals ein neues Paket installieren oder " +"entfernen, noch wird es jemals ein Upgrade eines Pakets durchführen, das " +"andere Pakete beschädigen könnte. Dies kann täglich dazu benutzt werden, um " +"ein relativ sicheres Upgrade des Systems durchzuführen. »Upgrade« wird alle " +"Pakete auflisten, von denen es kein Upgrade durchführen kann, was " +"üblicherweise bedeutet, dass sie von neuen Paketen abhängen oder Konflikte " +"mit anderen Paketen haben. dselect oder " +"apt-get install können benutzt werden, um die Installation von " +"diesen Paketen zu erzwingen." #. type:

#: guide.sgml:140 @@ -9720,6 +9661,14 @@ msgid "" "listed packages and will print a summary and ask for confirmation if " "anything other than its arguments are changed." msgstr "" +"»Install« wird benutzt, um Pakete nach Namen zu installieren. Das Paket wird " +"automatisch heruntergeladen und installiert. Dies kann nützlich sein, wenn " +"Sie bereits den Namen des zu installierenden Pakets kennen und keine GUI " +"aufrufen möchten, um es auszuwählen. Jede Anzahl von Paketen könnte zum " +"Installieren übergeben werden, sie werden alle heruntergeladen. " +"»Install« versucht automatisch Abhängigkeitsprobleme mit den aufgelisteten " +"Paketen aufzulösen, wird eine Zusammenfassung ausgeben und nach einer " +"Bestätigung fragen, wenn sich etwas anderes als dessen Argumente ändert." #. type:

#: guide.sgml:149 @@ -9732,6 +9681,16 @@ msgid "" "dselect. Once dist-upgrade has completed then dselect can be used to install any packages that may have been left out." msgstr "" +"»Dist-upgrade« führt vollständige Upgrades durch. Es wurde entworfen, um " +"Upgrades zwischen Releases von Debian zu vereinfachen. Es benutzt einen " +"ausgeklügelten Algorithmus, um die beste Zusammenstellung von Paketen zum " +"Installieren, für das Upgrade oder zum Entfernen festzulegen, um soviel wie " +"möglich vom System auf das neuste Release zu bekommen. In einigen " +"Situationen könnte es eher gewünscht sein, »dist-upgrade« zu benutzen, als " +"Zeit in das manuelle Auflösen von Abhängigkeiten in dselect " +"zu investieren. Ist »Dist-upgrade« erst vollständig, dann kann " +"dselect benutzt werden, um einige Pakete zu installieren, die " +"außen vor geblieben sind." #. type:

#: guide.sgml:152 @@ -9739,6 +9698,8 @@ msgid "" "It is important to closely look at what dist-upgrade is going to do, its " "decisions may sometimes be quite surprising." msgstr "" +"Es ist wichtig, genau zu schauen, was »Dist-upgrade« tun wird, seine " +"Entscheidungen können manchmal ziemlich überraschend sein." #. type:

#: guide.sgml:163 @@ -9751,13 +9712,20 @@ msgid "" "the downloaded archives can be installed by simply running the command that " "caused them to be downloaded again without -d." msgstr "" +"apt-get hat mehrere Befehlszeilenoptionen, die sich detailliert " +"in dessen Handbuchseite, finden. Die " +"nützlichste Option ist -d, die die heruntergeladenen Dateien nicht " +"installiert. Falls das System eine große Anzahl Pakete herunterladen soll, " +"würde es nicht erwünscht sein, wenn die Installation in dem Fall gestartet " +"würde, wenn etwas schief läuft. Falls -d benutzt wird, können die " +"heruntergeladenen Archive dadurch installiert werden, indem einfach der " +"Befehl, der das Herunterladen veranlasste, erneut ohne -d ausführt " +"wird." #. type: #: guide.sgml:168 -#, fuzzy -#| msgid "APT in DSelect" msgid "DSelect" -msgstr "APT in DSelect" +msgstr "DSelect" #. type:

#: guide.sgml:173 @@ -9767,6 +9735,10 @@ msgid "" "to select the packages to be installed or removed and APT actually installs " "them." msgstr "" +"Die APT-dselect-Methode stellt das komplette APT-System mit " +"dem dselect-Paketauswahl-GUI bereit. dselect wird " +"benutzt, um Pakete zum Installieren oder Entfernen auszuwählen und APT " +"installiert sie tatsächlich." #. type:

#: guide.sgml:184 @@ -9781,6 +9753,17 @@ msgid "" "have access to the latest bug fixes. APT will automatically use packages on " "your CDROM before downloading from the Internet." msgstr "" +"Um die APT-Methode einzuschalten, müssen Sie [Z]ugriff in " +"dselect auswählen und dann die APT-Methode wählen. Sie werden " +"nach einer Zusammenstellung von Quellen gefragt. Dies sind Plätze, " +"von denen Archive heruntergeladen werden. Dies können ferne Internetsites, " +"lokale Debian-Spiegel oder CD-ROMs sein. Jede Quelle kann einen Ausschnitt " +"des gesamten Debian-Archives bereitstellen. APT wird sie automatisch " +"kombinieren, um eine komplette Zusammenstellung von Paketen zu formen. " +"Falls Sie eine CD-ROM haben, ist es eine gute Idee, sie als erstes und dann " +"den Spiegel anzugeben, so dass Sie Zugriff auf die neusten Fehlerbehebungen " +"haben. APT wird automatisch Pakete auf der CD-ROM benutzen, bevor es sie " +"aus dem Internet herunterlädt." #. type: #: guide.sgml:198 @@ -9799,6 +9782,18 @@ msgid "" " \n" " URL [http://llug.sep.bnl.gov/debian]:" msgstr "" +" eine Liste mit Orten von Distributionsquellen einrichten\n" +"\t \n" +" Bitte geben Sie die Basis-URL der Debian-Distribution an.\n" +" Die bekannten Zugriffsschemata dafür sind: http file\n" +"\t \n" +" Zum Beispiel:\n" +" file:/mnt/debian,\n" +" ftp://ftp.debian.org/debian,\n" +" http://ftp.de.debian.org/debian,\n" +" \n" +" \n" +" URL [http://llug.sep.bnl.gov/debian]:" #. type:

#: guide.sgml:205 @@ -9807,6 +9802,9 @@ msgid "" "archive, defaulting to a HTTP mirror. Next it asks for the distribution to " "get." msgstr "" +"Das Einrichten der Quellen beginnt durch das Erfragen der Basis " +"des Debian-Archives, vorgegeben ist ein HTTP-Spiegel. Als nächstes wird " +"nach der zu erhaltenden Distribution gefragt." #. type: #: guide.sgml:212 @@ -9818,6 +9816,11 @@ msgid "" " \n" " Distribution [stable]:" msgstr "" +" Bitte geben Sie die zu erhaltende Distributionskennzeichnung oder den mit " +" einem / endenden Pfad zum Paket an. Die Distributionskennzeichnungen sind " +" normalerweise etwas wie: stable unstable testing non-US\n" +" \n" +" Distribution [stable]:" #. type:

#: guide.sgml:222 @@ -9829,6 +9832,13 @@ msgid "" "that cannot be exported from the United States. Importing these packages " "into the US is legal however." msgstr "" +"Die Distribution bezieht sich auf die Debian-Version im Archiv, " +"stable bezieht sich auf die zuletzt veröffentlichte Version und " +"unstable bezieht sich auf die Entwicklungsversion. non-US " +"ist nur auf einigen Spiegeln verfügbar und bezieht sich auf Pakete, die " +"Verschlüsselungstechnologie oder andere Dinge enthalten, die nicht aus den " +"Vereinigten Staaten exportiert werden können. Diese Pakete in die USA zu " +"importieren ist jedoch legal." #. type: #: guide.sgml:228 @@ -9839,6 +9849,10 @@ msgid "" " \n" " Components [main contrib non-free]:" msgstr "" +" Bitte geben Sie die Komponenten an, die Sie erhalten möchten\n" +" Die Komponenten sind normalerweise etwas wie: »main« »contrib« »non-free«\n" +" \n" +" Komponenten [main contrib non-free]:" #. type:

#: guide.sgml:236 @@ -9848,6 +9862,11 @@ msgid "" "packages while contrib and non-free contain things that have various " "restrictions placed on their use and distribution." msgstr "" +"Die Komponentenliste bezieht sich auf die Liste von Unter-Distributionen " +"zum Herunterladen. Die Distribution ist auf Basis von Software-Lizenzen " +"unterteilt, »Main« besteht aus Paketen die gemäß der DFSG frei sind, während " +"»Contrib« und »Non-free« Dinge enthalten, die verschiedene Einschränkungen " +"in ihrer Benutzung und ihren Vertrieb haben." #. type:

#: guide.sgml:240 @@ -9855,6 +9874,9 @@ msgid "" "Any number of sources can be added, the setup script will continue to prompt " "until you have specified all that you want." msgstr "" +"Jegliche Anzahl von Quellen kann hinzugefügt werden, das Einrichtungsskript " +"wird mit Nachfragen fortfahren, bis Sie alles angegeben haben, was Sie " +"möchten." #. type:

#: guide.sgml:247 @@ -9865,6 +9887,12 @@ msgid "" "dselect. [U]pdate must be performed even if apt-get update has been run before." msgstr "" +"Bevor sie beginnen, dselect zu benutzen, ist es notwendig, die " +"Verfügbarkeitsliste zu aktualisieren, indem sie aus dem Menü [E]rneuern " +"auswählen. Dies ist eine Obermenge von apt-get update, das " +"dselect heruntergeladene Informationen zur Verfügung stellt. " +"[E]rneuern muss auch dann durchgeführt werden, wenn vorher " +"apt-get update ausgeführt wurde." #. type:

#: guide.sgml:253 @@ -9874,6 +9902,10 @@ msgid "" "[R]emove commands have no meaning, the [I]nstall command performs both of " "them together." msgstr "" +"Sie können dann fortfahren und Ihre Auswahl per [A]uswähle treffen und dann " +"die Installation mit [I]nstall. vornehmen. Wenn Sie die APT-Methode " +"benutzen, haben die Befehle Kon[f]ig. und [L]öschen keine Bedeutung, der " +"Befehl [I]nstall. führt beides gleichermaßen aus." #. type:

#: guide.sgml:258 @@ -9882,11 +9914,14 @@ msgid "" "have been successfully installed. To change this behavior place Dselect::" "clean \"prompt\"; in /etc/apt/apt.conf." msgstr "" +"Standardmäßig wird APT automatisch die Paketdateien (.deb) entfernen, " +"sobald sie erfolgreich installiert sind. Um dieses Verhalten zu ändern, " +"platzieren Sie Dselect::clean \"prompt\"; in /etc/apt/apt.conf." #. type: #: guide.sgml:264 msgid "The Interface" -msgstr "" +msgstr "Die Schnittstelle" #. type:

#: guide.sgml:278 @@ -9900,11 +9935,20 @@ msgid "" "then will print out some informative status messages so that you can " "estimate how far along it is and how much is left to do." msgstr "" +"Sowohl die APT-Methode dselect, als auch apt-get " +"teilen sich die gleiche Schnittstelle. Es ist ein einfaches System, das " +"üblicherweise mitteilt, was es tun wird und es dann tut.

Die " +"Methode dselect ist tatsächlich eine Zusammenstellung von " +"Wrapper-Skripten für apt-get. Die Methode stellt tatsächlich " +"mehr Funktionalitäten bereit, als in apt-get allein vorhanden " +"sind.

 Nach der Ausgabe einer Zusammenfassung was passieren " +"wird, gibt APT einige informative Statusmeldungen aus, so dass Sie " +"abschätzen können, wie weit es ist und wieviel noch zu tun ist." #. type: #: guide.sgml:280 msgid "Startup" -msgstr "" +msgstr "Anfang" #. type:

#: guide.sgml:284 @@ -9914,6 +9958,10 @@ msgid "" "At any time these operations can be performed by running apt-get check." msgstr "" +"Vor allen Operationen, ausgenommen »update«, führt APT eine Reihe von " +"Aktionen durch, um seinen internen Status vorzubereiten. Es macht außerdem " +"einige Prüfungen des Systemstatus. Diese Operationen können jederzeit durch " +"Ausführung von apt-get check durchgeführt werden." #. type: #: guide.sgml:289 @@ -9923,6 +9971,9 @@ msgid "" "Reading Package Lists... Done\n" "Building Dependency Tree... Done" msgstr "" +"# apt-get check\n" +"Paketlisten werden gelesen... Fertig\n" +"Abhängigkeitsbaum wird aufgebaut" #. type:

#: guide.sgml:297 @@ -9932,6 +9983,11 @@ msgid "" "If some of the package files are not found then they will be ignored and a " "warning will be printed when apt-get exits." msgstr "" +"Das erste was es tut, ist das Einlesen aller Paketdateien in den Speicher. " +"APT benutzt ein Zwischenspeicherschema, so dass diese Operation beim " +"zweiten Ausführen schneller laufen wird. Falls einige der Paketdateien nicht " +"gefunden werden, werden sie ignoriert und beim Beenden von Apt-get wird eine " +"Warnung ausgegeben." #. type:

#: guide.sgml:303 @@ -9941,6 +9997,11 @@ msgid "" "package and considers if it is OK. Should this find a problem then a report " "will be printed out and apt-get will refuse to run." msgstr "" +"Die letzte Operation führt eine detaillierte Analyse der Abhängigkeiten des " +"Systems durch. Sie prüft jede Abhängigkeit jedes installierten oder " +"entpackten Pakets und berücksichtigt, ob es in Ordnung ist. Sollte sie ein " +"Problem finden, dann wird eine Meldung ausgegeben und apt-get " +"wird die Ausführung verweigern." #. type: #: guide.sgml:320 @@ -9962,6 +10023,22 @@ msgid "" " Depends: xlib6g (>= 3.3-5) but it is not installed\n" " libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)" msgstr "" +"# apt-get check\n" +"Paketlisten werden gelesen... Fertig\n" +"Abhängigkeitsbaum wird aufgebaut\n" +"Status-Informationen einlesen... Fertig\n" +"Probieren Sie „apt-get -f install“, um diese zu korrigieren:\n" +"Die folgenden Pakete haben nichterfüllte Abhängigkeiten:\n" +" 9fonts: Hängt ab: xlib6g ist aber nicht installiert\n" +" uucp: Hängt ab: mailx ist aber nicht installiert\n" +" blast: Hängt ab: xlib6g (>= 3.3-5) ist aber nicht installiert\n" +" adduser: Hängt ab: perl-base ist aber nicht installiert\n" +" aumix: Hängt ab: libgpmg1 ist aber nicht installiert\n" +" debiandoc-sgml: Hängt ab: sgml-base ist aber nicht installiert\n" +" bash-builtins: Hängt ab: bash (>= 2.01) but 2.0-3 ist installiert\n" +" cthugha: Hängt ab: svgalibg1 ist aber nicht installiert\n" +" Hängt ab: xlib6g (>= 3.3-5) ist aber nicht installiert\n" +" libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)" #. type:

#: guide.sgml:329 @@ -9972,6 +10049,11 @@ msgid "" "that are unmet. A short explanation of why the package has a dependency " "problem is also included." msgstr "" +"In diesem Beispiel hat das System viele Probleme, einschließlich eines " +"ernsten Problems mit libreadlineg2. Für jedes Paket, das nichterfüllte " +"Abhängigkeiten hat, wird eine Zeile ausgegeben, die das Paket mit dem " +"Problem anzeigt und die Abhängigkeiten, die nicht erfüllt sind. Eine kurze " +"Erklärung, warum das Paket ein Abhängigkeitsproblem hat, ist inbegriffen." #. type:

#: guide.sgml:337 @@ -9984,6 +10066,14 @@ msgid "" "situation a package may have been unpacked without its dependents being " "installed." msgstr "" +"Es gibt zwei Möglichkeiten, wie ein System in einen kaputten Status wie " +"diesen kommen kann. Die erste wird dadurch verursacht, dass " +"dpkg einige feine Beziehungen zwischen Paketen übersieht, wenn " +"Upgrades durchgeführt werden.

APT berücksichtigt jedoch alle " +"bekannten Abhängigkeiten und versucht, kaputte Pakete zu vermeiden" +"

. Die zweite tritt auf, falls eine Paketinstallation während " +"der Ausführung fehlschlägt. In dieser Situation könnte ein Paket entpackt " +"worden sein, ohne dass die von ihm Abhängigen installiert sind." #. type:

#: guide.sgml:345 @@ -9995,6 +10085,13 @@ msgid "" "dselect method always supplies the -f option to allow " "for easy continuation of failed maintainer scripts." msgstr "" +"Die zweite Situation ist weit weniger ernst als die erste, weil APT " +"bestimmte Beschränkungen in der Reihenfolge setzt, in der Pakete installiert " +"werden. In beiden Fällen veranlasst die Option -f " +"apt-get, eine mögliche Lösung für das Problem zu folgern und " +"dann fortzufahren. Die APT-Methode dselect liefert immer die " +"Option -f, zum einfachen Fortfahren von gescheiterten " +"Betreuerskripten." #. type:

#: guide.sgml:351 @@ -10005,11 +10102,17 @@ msgid "" "necessary to manually use dpkg (possibly with forcing options) to correct " "the situation enough to allow APT to proceed." msgstr "" +"Falls jedoch die Option -f benutzt wird, um ein ernsthaft kaputtes " +"System zu korrigieren, das vom ersten Fall verursacht wurde, dann ist es " +"möglich, dass es entweder sofort fehlschlägt oder die Installationsabfolge " +"fehlschlagen wird. In beiden Fällen ist es nötig, Dpkg (möglicherweise mit " +"erzwingenden Optionen) manuell zu benutzen, um die Situation ausreichend zu " +"korrigieren, so dass es APT ermöglicht wird, fortzufahren." #. type: #: guide.sgml:356 msgid "The Status Report" -msgstr "" +msgstr "Der Statusbericht" #. type:

#: guide.sgml:363 @@ -10020,11 +10123,17 @@ msgid "" "final state of things, taking into account the -f option and any " "other relevant activities to the command being executed." msgstr "" +"Bevor es fortfährt, wird apt-get einen Bericht darüber " +"präsentieren, was geschehen wird. Im Allgemeinen spiegelt der Bericht den Typ " +"der Operation, die ausgeführt wird, wider, aber es gibt auch mehrere " +"geläufige Elemente. Auf jeden Fall spiegelt die Liste den Endstatus der Dinge " +"wider, bezieht die Option -f in Betracht und alle andere " +"relevante Aktivitäten zum Befehl, der ausgeführt wird." #. type: #: guide.sgml:364 msgid "The Extra Package list" -msgstr "" +msgstr "Die zusätzliche Paketliste" #. type: #: guide.sgml:372 @@ -10037,6 +10146,12 @@ msgid "" " squake pgp-i python-base debmake ldso perl libreadlineg2\n" " ssh" msgstr "" +"Die folgenden Pakete werden zusätzlich installiert:\n" +" libdbd-mysql-perl xlib6 zlib1 xzx libreadline2 libdbd-msql-perl\n" +" mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n" +" bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n" +" squake pgp-i python-base debmake ldso perl libreadlineg2\n" +" ssh" #. type:

#: guide.sgml:379 @@ -10046,11 +10161,16 @@ msgid "" "generated for an install command. The listed packages are often the " "result of an Auto Install." msgstr "" +"Die zusätzliche Paketliste zeigt alle Pakete, die installiert werden oder " +"von denen ein Upgrade durchgeführt wird, zusätzlich zu den auf der " +"Befehlszeile angegebenen. Sie wird nur für einen " +"install-Befehl generiert. Die aufgelisteten Pakete sind häufig das " +"Ergebnis einer automatischen Installation." #. type: #: guide.sgml:382 msgid "The Packages to Remove" -msgstr "" +msgstr "Die zu entfernenden Pakete" #. type: #: guide.sgml:389 @@ -10062,6 +10182,11 @@ msgid "" " xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n" " nas xpilot xfig" msgstr "" +"Die folgenden Pakete werden ENTFERNT:\n" +" xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n" +" xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n" +" xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n" +" nas xpilot xfig" #. type:

#: guide.sgml:399 @@ -10074,11 +10199,19 @@ msgid "" "that are going to be removed because they are only partially installed, " "possibly due to an aborted installation." msgstr "" +"Die Liste der zu entfernenden Pakete zeigt all die Pakete, die vom System " +"entfernt werden. Sie kann für jede der Operationen angezeigt werden und " +"sollte einer sorgfältige Überprüfung unterzogen werden, um sicherzustellen, " +"dass nichts Wichtiges weggenommen wird. Die Option -f ist " +"insbesondere gut darin, Pakete zum Entfernen vorzumerken, so dass in diesem " +"Fall mit extremer Vorsicht vorgegangen werden sollte. Die Liste könnte " +"Pakete enthalten, die entfernt werden, weil sie nur teilweise installiert " +"sind, möglicherweise aufgrund einer abgebrochenen Installation." #. type: #: guide.sgml:402 msgid "The New Packages list" -msgstr "" +msgstr "Die Liste neuer Pakete" #. type: #: guide.sgml:406 @@ -10087,6 +10220,8 @@ msgid "" "The following NEW packages will installed:\n" " zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base" msgstr "" +"Die folgenden NEUEN Pakete werden zusätzlich installiert:\n" +" zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base" #. type:

#: guide.sgml:411 @@ -10095,11 +10230,14 @@ msgid "" "listed are not presently installed in the system but will be when APT is " "done." msgstr "" +"Die Liste neuer Pakete ist einfache eine Erinnerung, was geschehen " +"wird. Die aufgelisteten Pakete sind zurzeit nicht auf dem System " +"installiert, werden es aber sein, wenn APT fertig ist." #. type: #: guide.sgml:414 msgid "The Kept Back list" -msgstr "" +msgstr "Die Liste zurückgehaltener Pakete" #. type: #: guide.sgml:419 @@ -10109,6 +10247,9 @@ msgid "" " compface man-db tetex-base msql libpaper svgalib1\n" " gs snmp arena lynx xpat2 groff xscreensaver" msgstr "" +"Die folgenden Pakete werden zurückgehalten:\n" +" compface man-db tetex-base msql libpaper svgalib1\n" +" gs snmp arena lynx xpat2 groff xscreensaver" #. type:

#: guide.sgml:428 @@ -10120,11 +10261,18 @@ msgid "" "to install is with apt-get install or by using dselect " "to resolve their problems." msgstr "" +"Jedesmal, wenn ein Upgrade des ganzen Systems durchgeführt wird, besteht die " +"Möglichkeit, dass neue Versionen von Paketen nicht installiert werden " +"können, weil sie neue Dinge benötigen oder einen Konflikt mit bereits " +"installierten Dingen haben. In diesem Fall wird das Paket auf der Liste " +"zurückgehaltener Pakete erscheinen. Der beste Weg dort aufgeführte Pakete " +"zur Installation zu bewegen, ist per apt-get install oder indem " +"dselect zum Lösen ihrer Probleme benutzt wird." #. type: #: guide.sgml:431 msgid "Held Packages warning" -msgstr "" +msgstr "Warnung wegen zurückgehaltener Pakete" #. type: #: guide.sgml:435 @@ -10133,6 +10281,8 @@ msgid "" "The following held packages will be changed:\n" " cvs" msgstr "" +"Die folgenden zurückgehaltenen Pakete werden geändert:\n" +" cvs" #. type:

#: guide.sgml:441 @@ -10141,17 +10291,23 @@ msgid "" "case it prints out a warning that the held package is going to be changed. " "This should only happen during dist-upgrade or install." msgstr "" +"Manchmal können Sie APT bitten, ein auf »zurückgehalten« gesetztes Paket zu " +"installieren. In einem solchen Fall gibt es eine Warnung aus, dass das " +"zurückgehaltene Paket geändert wird. Dies sollte nur während »Dist-upgrade« " +"oder »Install« vorkommen." #. type: #: guide.sgml:444 msgid "Final summary" -msgstr "" +msgstr "Abschließende Zusammenfassung" #. type:

#: guide.sgml:447 msgid "" "Finally, APT will print out a summary of all the changes that will occur." msgstr "" +"Abschließend wird APT eine Zusammenfassung aller Änderungen ausgeben, die " +"auftreten werden." #. type: #: guide.sgml:452 @@ -10161,6 +10317,11 @@ msgid "" "12 packages not fully installed or removed.\n" "Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used." msgstr "" +"206 Pakete aktualisiert, 8 zusätzlich installiert, 23 werden entfernt und " +"51 nicht aktualisiert.\n" +"12 Pakete nicht vollständig installiert oder entfernt.\n" +"Muss 65,7MB/66,7MB an Archiven herunterladen. Nach dem Entpacken werden " +"26,5MB zusätzlich belegt sein." #. type:

#: guide.sgml:470 @@ -10179,6 +10340,20 @@ msgid "" "If a large number of packages are being removed then the value may indicate " "the amount of space that will be freed." msgstr "" +"Die erste Zeile der Zusammenfassung ist bloß eine Zusammenfassung von all " +"den Listen und umfasst die Anzahl der Upgrades – das sind bereits " +"installierte Pakete, für die neue Versionen verfügbar sind. Die zweite " +"Zeile zeigt die Anzahl von schlecht konfigurierten Paketen, die " +"möglicherweise das Ergebnis einer abgebrochenen Installation sind. Die " +"letzt Zeile zeigt den Speicherbedarf, den die Installation benötigt. Das " +"erste Zahlenpaar bezieht sich auf die Größe der Archivdateien. Die erste " +"Zahl zeigt die Anzahl der Bytes an, die von fernen Orten heruntergeladen " +"werden müssen und die zweite zeigt die gesamte Größe aller benötigten " +"Archive an. Die nächste Zahl zeigt den Größenunterschied zwischen den " +"derzeit installierten Paketen und den neu installierten Paketen. Es " +"entspricht ungefähr dem in /usr benötigten Speicher nachdem alles erledigt " +"ist. Wenn eine große Anzahl Pakete entfernt wird, dann kann der Wert den " +"Betrag des freiwerdenden Speichers anzeigen." #. type:

#: guide.sgml:473 @@ -10186,11 +10361,14 @@ msgid "" "Some other reports can be generated by using the -u option to show packages " "to upgrade, they are similar to the previous examples." msgstr "" +"Einige andere Berichte können durch Benutzung der Option »-u« generiert " +"werden, um Pakete anzuzeigen, von denen ein Upgrade durchgeführt werden " +"soll. Dies ist den vorherigen Beispielen ähnlich." #. type: #: guide.sgml:477 msgid "The Status Display" -msgstr "" +msgstr "Der Anzeigestatus" #. type:

#: guide.sgml:481 @@ -10198,6 +10376,8 @@ msgid "" "During the download of archives and package files APT prints out a series of " "status messages." msgstr "" +"Während des Herunterladens von Archiven und Paketdateien gibt APT eine " +"Reihe von Statusmeldungen aus." #. type: #: guide.sgml:490 @@ -10211,6 +10391,13 @@ msgid "" "Get:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n" "11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s" msgstr "" +"# apt-get update\n" +"Hole:1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ Packages\n" +"Hole:2 http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n" +"Treffer http://llug.sep.bnl.gov/debian/ testing/main Packages\n" +"Hole:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n" +"Hole:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n" +"11% [5 testing/non-free 'Warte auf Datei' 0/32.1k 0%] 2203b/s 1m52s" #. type:

#: guide.sgml:500 @@ -10222,6 +10409,13 @@ msgid "" "apt-get update estimates the percent done which causes some " "inaccuracies." msgstr "" +"Die Zeilen, die mit Hole beginnen, werden ausgegeben, wenn APT " +"anfängt, eine Datei herunterzuladen, während die letzte Zeile den " +"Fortschritt des Herunterladens anzeigt. Die erste Prozentzahl der " +"Fortschrittszeile zeigt die gesamt erledigte Prozentzahl aller Dateien an. " +"Unglücklicherweise schätzt apt-get update die erledigte " +"Prozentzahl, da die Größe der Pakete unbekannt ist, was einige " +"Ungenauigkeiten bewirkt." #. type:

#: guide.sgml:509 @@ -10234,6 +10428,15 @@ msgid "" "The next word is the short form name of the object being downloaded. For " "archives it will contain the name of the package that is being fetched." msgstr "" +"Der nächste Abschnitt der Statuszeile wird für jeden Download-Thread " +"wiederholt und zeigt die durchgeführte Operation, sowie einige nützliche " +"Informationen darüber an was geschieht. Manchmal wird dieser Abschnitt " +"einfach nur Forking darstellen, was bedeutet, dass das " +"Betriebssystem das Download-Modul am Laden ist. Das erste Wort nach dem " +"»[« ist die Ladenummer, wie sie auf den Verlaufszeilen angezeigt wird. Das " +"nächste Wort ist Name in Kurzform des Ojektes, das heruntergeladen wird. " +"Für Archive wird es den Namen des Paketes enthalten, das heruntergeladen " +"wird." #. type:

#: guide.sgml:524 @@ -10252,6 +10455,21 @@ msgid "" "regularly and reflects the time to complete everything at the shown transfer " "rate." msgstr "" +"Innerhalb von einzelnen Anführungszeichen folgt eine informative " +"Zeichenkette, die den Fortschritt der Übertragungsphase des Downloads " +"anzeigt. Normalerweise schreitet sie fort von Verbinde zu Warte " +"auf Datei zu Lade herunter oder Nehme wieder auf. " +"Der letzte Wert ist die Anzahl der von der fernen Site heruntergeladenen " +"Bytes. Sobald der Download beginnt, zeigt sich dies wie 102/10.2k " +"was anzeigt, dass 102 Bytes heruntergeladen und 10,2 Kilobytes erwartet " +"werden. Die Gesamtgröße wird immer in vierstelliger Schreibweise " +"dargestellt, um Platz zu sparen. Nach der Größenanzeige ist eine " +"Prozentangabe für die Datei selbst. Das zweitletzte Element ist die " +"augenblickliche Fortschrittsgeschwindigkeit. Dieser Wert wird alle fünf " +"Sekunden aktualisiert und spiegelt die Datenübertragungsgeschwindigkeit in " +"dieser Periode wider. Am Ende wird die geschätzte Übertragungszeit " +"angezeigt. Dies wird regelmäßig aktualisiert und spiegelt die Zeit zum " +"Vervollständigen bei der angezeigten Datenübertragungsgeschwindigkeit wider." #. type:

#: guide.sgml:530 @@ -10262,11 +10480,17 @@ msgid "" "for logging to a file, use the -q option to remove the status " "display." msgstr "" +"Die Statusanzeige aktualisiert sich alle halbe Sekunde, um eine " +"gleichmäßige Rückmeldung über den Download-Fortschritt bereitzustellen, " +"während die »Hole«-Zeilen bei jeder gestarteten neuen Datei zurückscrollen. " +"Da die Statusanzeige ständig aktualisiert wird, ist sie für die " +"Protokollierung in eine Datei ungeeignet. Benutzen Sie die Option " +"-q, um die Statusanzeige zu entfernen." #. type: #: guide.sgml:535 msgid "Dpkg" -msgstr "" +msgstr "Dpkg" #. type:

#: guide.sgml:542 @@ -10278,16 +10502,23 @@ msgid "" "each question there is usually a description of what it is asking and the " "questions are too varied to discuss completely here." msgstr "" +"APT benutzt dpkg, um die Archive zu installieren und wird " +"zu der dpkg-Schnittstelle herüberschalten, sobald der " +"Download vollständig ist. dpkg wird außerdem eine Reihe von " +"Fragen stellen, während es die Pakete abarbeitet und die Pakete können auch " +"mehrere Fragen stellen . Vor jeder Frage ist üblicherweise eine " +"Beschreibung des Gefragten und die Fragen sind zu vielfältig, um sie " +"vollständig hier zu besprechen." #. type: #: offline.sgml:4 msgid "Using APT Offline" -msgstr "" +msgstr "APT offline verwenden" #. type: #: offline.sgml:7 msgid "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $" -msgstr "" +msgstr "$Id: offline.sgml,v 1.8 12.02.2003 15:06:41 doogie Exp $" #. type: #: offline.sgml:12 @@ -10295,23 +10526,24 @@ msgid "" "This document describes how to use APT in a non-networked environment, " "specifically a 'sneaker-net' approach for performing upgrades." msgstr "" +"Dieses Dokument beschreibt, wie APT in einer Umgebung ohne Netzwerk, " +"speziell einem »Turnschuhnetzwerk«, an die Durchführung von Upgrades " +"herangeht." #. type: #: offline.sgml:16 msgid "Copyright © Jason Gunthorpe, 1999." -msgstr "" +msgstr "Copyright © Jason Gunthorpe, 1999." #. type: #: offline.sgml:32 msgid "Introduction" -msgstr "" +msgstr "Einleitung" #. type: #: offline.sgml:34 offline.sgml:65 offline.sgml:180 -#, fuzzy -#| msgid "OverrideDir" msgid "Overview" -msgstr "OverrideDir" +msgstr "Übersicht" #. type:

#: offline.sgml:40 @@ -10321,6 +10553,11 @@ msgid "" "machine is on a slow link, such as a modem and another machine has a very " "fast connection but they are physically distant." msgstr "" +"Normalerweise benötigt APT direkten Zugang zu einem Debian-Archiv, entweder " +"von einem lokalen Medium oder über ein Netz. Eine andere häufige " +"Beanstandung ist, dass eine Debian-Maschine an einer langsamen Anbindung, " +"wie einem Modem, hängt und eine andere Maschine eine sehr schnelle " +"Verbindung hat, sie jedoch physisch fern sind." #. type:

#: offline.sgml:51 @@ -10335,6 +10572,17 @@ msgid "" "the machine downloading the packages, and target host the one with " "bad or no connection." msgstr "" +"Die Lösung dazu besteht darin, große Wechselmedien, wie eine Zip-Platte " +"oder eine SuperDisk zu benutzen. Diese Platten sind nicht groß genug, um " +"ein ganzes Debian-Archiv zu speichern, können aber leicht eine Untermenge " +"aufnehmen, die für die meisten Anwender groß genug ist. Die Idee besteht " +"darin, APT zu benutzen, um eine Liste benötigter Pakete zu generieren und " +"diese dann mit einer anderen Maschine mit guter Verbindung auf die Platte " +"herunterzuladen. Es ist sogar möglich, eine andere Debian-Maschine mit APT " +"oder ein komplett unterschiedliches Betriebssystem und ein " +"Download-Werkzeug wie Wget zu benutzen. Nennen wir die Maschine, die die " +"Pakete herunterlädt ferner Rechner und die mit der schlechten oder " +"fehlenden Verbindung Zielrechner." #. type:

#: offline.sgml:57 @@ -10344,11 +10592,16 @@ msgid "" "that the disc should be formated with a filesystem that can handle long file " "names such as ext2, fat32 or vfat." msgstr "" +"Dies wird durch kreatives Manipulieren der APT-Konfigurationsdatei " +"erreicht. Die wesentliche Voraussetzung besteht darin, APT mitzuteilen, " +"dass es für seine Archivdateien auf einer Platte nachsieht. Beachten Sie, " +"dass diese Platte mit einem Dateisystem formatiert sein sollte, das mit " +"langen Dateinamen umgehen kann, so wie ext2, fat32 oder vfat." #. type: #: offline.sgml:63 msgid "Using APT on both machines" -msgstr "" +msgstr "APT auf beiden Maschinen benutzen" #. type:

#: offline.sgml:71 @@ -10358,6 +10611,11 @@ msgid "" "remote machine to fetch the latest package files and decide which packages " "to download. The disk directory structure should look like:" msgstr "" +"Ein verfügbares APT auf beiden Maschinen stellt die einfachste Konfiguration " +"dar. Die Grundidee besteht darin, eine Kopie der Statusdatei auf der Platte " +"zu platzieren und die ferne Maschine zu benutzen, um die neusten " +"Paketdateien herunterzuladen und zu entscheiden, welche Pakete " +"heruntergeladen werden. Die Plattenverzeichnisstruktur sollte so aussehen:" #. type: #: offline.sgml:80 @@ -10372,13 +10630,19 @@ msgid "" " sources.list\n" " apt.conf" msgstr "" +" /Platte/\n" +" Archive/\n" +" partial/\n" +" lists/\n" +" partial/\n" +" status\n" +" sources.list\n" +" apt.conf" #. type: #: offline.sgml:88 -#, fuzzy -#| msgid "User configuration" msgid "The configuration file" -msgstr "Benutzerkonfiguration" +msgstr "Die Konfigurationsdatei" #. type:

#: offline.sgml:96 @@ -10390,6 +10654,13 @@ msgid "" "target host. Please note, if you are using a local archive you must " "use copy URIs, the syntax is identical to file URIs." msgstr "" +"Die Konfigurationsdatei sollte APT mitteilen, dass es seine Dateien auf der " +"Platte speichert und obendrein die Konfigurationsdateien auf der Platte " +"benutzt. Die »sources.list« sollte genau die Sites enthalten, die Sie " +"auf der fernen Maschine benutzen möchten und die Statusdatei sollte eine " +"Kopie von /var/lib/dpkg/status vom Zielrechner sein. " +"Bitte beachten Sie, falls Sie lokale Archive benutzen, dass Sie »copy«-URIs " +"benutzen müssen. Die Syntax entspricht der von »file«-URIs." #. type:

#: offline.sgml:100 @@ -10397,6 +10668,8 @@ msgid "" "apt.conf must contain the necessary information to make APT use the " "disc:" msgstr "" +"apt.conf muss die nötigen Informationen enthalten, damit APT die " +"Platte benutzt:" #. type: #: offline.sgml:124 @@ -10426,6 +10699,30 @@ msgid "" " Etc \"/disc/\";\n" " };" msgstr "" +" APT\n" +" {\n" +" /* Dies ist nicht nötig, falls die beiden Maschinen die gleiche\n" +" Architektur haben. Es teilt dem fernen APT mit, welche Architektur " +" die Zielmaschine hat */\n" +" Architecture \"i386\";\n" +" \n" +" Get::Download-Only \"true\";\n" +" };\n" +" \n" +" Dir\n" +" {\n" +" /* Die Platte für Statusinformationen benutzen und die Statusdatei\n" +" umleiten von /var/lib/dpkg default */\n" +" State \"/disc/\";\n" +" State::status \"status\";\n" +"\n" +" // Programmzwischenspeicher werden lokal gespeichert\n" +" Cache::archives \"/disc/archives/\";\n" +" Cache \"/tmp/\";\n" +" \n" +" // Ort der Quellenliste.\n" +" Etc \"/disc/\";\n" +" };" #. type:

#: offline.sgml:129 @@ -10433,6 +10730,8 @@ msgid "" "More details can be seen by examining the apt.conf man page and the sample " "configuration file in /usr/share/doc/apt/examples/apt.conf." msgstr "" +"Weitere Details finden sich in der apt.conf-Handbuchseite und der " +"Musterkonfigurationsdatei in /usr/share/doc/apt/examples/apt.conf." #. type:

#: offline.sgml:136 @@ -10443,6 +10742,12 @@ msgid "" "em> Then take the disc to the remote machine and configure the sources.list. " "On the remote machine execute the following:" msgstr "" +"Das Erste, was auf der Zielmaschine getan werden muss, ist das Einhängen " +"der Platte und das Kopieren von /var/lib/dpkg/status dorthin. Sie " +"werden außerdem die in der Übersicht umrissenen Verzeichnisse " +"archives/partial/ und lists/partial/ erstellen müssen. " +"Dann bringen Sie die Platte zu der fernen Maschine und konfigurieren Sie " +"die »sources.list«. Führen Sie das folgende aus:" #. type: #: offline.sgml:142 @@ -10451,9 +10756,15 @@ msgid "" " # export APT_CONFIG=\"/disc/apt.conf\"\n" " # apt-get update\n" " [ APT fetches the package files ]\n" -" # apt-get dist-upgrade\n" +" apt-get dist-upgrade\n" " [ APT fetches all the packages needed to upgrade the target machine ]" msgstr "" +" # export APT_CONFIG=\"/disc/apt.conf\"\n" +" # apt-get update\n" +" [ APT lädt die Paketdateien herunter ]\n" +" # apt-get dist-upgrade\n" +" [ APT lädt all die Pakete herunter, die die Zielmaschine benötigt, um ein\n" +" Upgrade durchzuführen ]" #. type:

#: offline.sgml:149 @@ -10463,6 +10774,10 @@ msgid "" "such as dselect However this presents a problem in communicating " "your selections back to the local computer." msgstr "" +"Der Befehl »dist-upgrade« kann durch alle anderen Standard-APT-Befehle " +"ersetzt werden, insbesondere »dselect-upgrade«. Sie können sogar eine " +"APT-Oberfläche, wie dselect, benutzen. Jedoch stellt dies ein " +"Problem dar, Ihre Auswahl zurück an den lokalen Rechner zu kommunizieren." #. type:

#: offline.sgml:153 @@ -10470,6 +10785,9 @@ msgid "" "Now the disc contains all of the index files and archives needed to upgrade " "the target machine. Take the disc back and run:" msgstr "" +"Nun enthält die Platte alle Indexdateien und Archive, die nötig sind, um " +"ein Upgrade der Zielmaschine druchzuführen. Bringen Sie die Platte zurück " +"und starten Sie:" #. type: #: offline.sgml:159 @@ -10481,6 +10799,11 @@ msgid "" " # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n" " [ Or any other APT command ]" msgstr "" +" # export APT_CONFIG=\"/disc/apt.conf\"\n" +" # apt-get check\n" +" [ APT generiert eine lokale Kopie der Zwischenspeicherdateien ]\n" +" # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n" +" [ Oder irgendeinen anderen APT-Befehl ]" #. type:

#: offline.sgml:165 @@ -10488,6 +10811,8 @@ msgid "" "It is necessary for proper function to re-specify the status file to be the " "local one. This is very important!" msgstr "" +"Es ist für ordentliches Funktionieren notwendig, die Statusdatei erneut als " +"die lokale anzugeben. Dies ist sehr wichtig!" #. type:

#: offline.sgml:172 @@ -10498,11 +10823,18 @@ msgid "" "the local machine - but this may not always be possible. DO NOT copy the " "status file if dpkg or APT have been run in the mean time!!" msgstr "" +"Wenn Sie Dselect benutzen, können Sie die sehr riskante Operation " +"durchführen, disc/status auf /var/lib/dpkg/status zu kopieren, so dass die " +"von Ihnen gemachte Auswahl auf der fernen Maschine aktualisiert wird. Es " +"wird in höchstem Maße empfohlen, dass Leute nur auf der lokalen Maschine " +"Auswahlen treffen – aber dies könnte manchmal unmöglich sein. Kopieren Sie " +"die Statusdatei NICHT, falls Dpkg oder APT in der Zwischenzeit benutzt " +"wurden!" #. type: #: offline.sgml:178 msgid "Using APT and wget" -msgstr "" +msgstr "APT und Wget benutzen" #. type:

#: offline.sgml:185 @@ -10511,6 +10843,10 @@ msgid "" "any machine. Unlike the method above this requires that the Debian machine " "already has a list of available packages." msgstr "" +"wget ist eine populäres und portierbares Download-Werkzeug, das " +"auf nahezu jeder Maschine laufen kann. Anders als die Methode oben wird " +"hierfür benötigt, dass die Debian-Maschine bereits eine Liste verfügbarer " +"Pakete hat." #. type:

#: offline.sgml:190 @@ -10520,13 +10856,16 @@ msgid "" "option to apt-get and then preparing a wget script to actually fetch the " "packages." msgstr "" +"Die Grundidee besteht darin, eine Platte zu erzeugen, die nur die " +"heruntergeladenen Archivdateien von der fernen Site enthält. Die wird durch " +"Benutzen der apt-get-Option »--print-uris« und dem anschließenden " +"Vorbereiten eines Wget-Skripts getan, um die eigentlichen Pakete " +"herunterzuladen." #. type: #: offline.sgml:196 -#, fuzzy -#| msgid "Options" msgid "Operation" -msgstr "Optionen" +msgstr "Betrieb" #. type:

#: offline.sgml:200 @@ -10534,6 +10873,9 @@ msgid "" "Unlike the previous technique no special configuration files are required. " "We merely use the standard APT commands to generate the file list." msgstr "" +"Anders als bei der vorherigen Technik werden keine speziellen " +"Konfigurationsdateien benötigt. Es werden lediglich die Standard-APT-Befehle " +"benutzt, um die Dateiliste zu erstellen." #. type: #: offline.sgml:205 @@ -10544,6 +10886,11 @@ msgid "" " # apt-get -qq --print-uris dist-upgrade > uris\n" " # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script" msgstr "" +" # apt-get dist-upgrade \n" +" [ Antworten Sie »nein« auf gestellte Fragen, wenn Sie mit den Aktionen\n" +" zufrieden sind ]\n" +" # apt-get -qq --print-uris dist-upgrade > uris\n" +" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /Platte/wget-script" #. type:

#: offline.sgml:210 @@ -10551,6 +10898,8 @@ msgid "" "Any command other than dist-upgrade could be used here, including dselect-" "upgrade." msgstr "" +"Jeder andere Befehl als »dist-upgrade« könnte hier benutzt werden, " +"einschließlich »upgrade«." #. type:

#: offline.sgml:216 @@ -10560,11 +10909,15 @@ msgid "" "with the current directory as the disc's mount point so as to save the " "output on the disc." msgstr "" +"Die Datei /Platte/wget-script wird nun eine Liste der Wget-Befehle enthalten, " +"um die erforderlichen Archive herunterzuladen. Dieses Skript sollte mit dem " +"aktuellen Verzeichnis als Platteneinhängepunkt ausgeführt werden, so dass " +"die Ausgabe auf die Platte gespeichert wird." #. type:

#: offline.sgml:219 msgid "The remote machine would do something like" -msgstr "" +msgstr "Die ferne Maschine würde etwas wie das folgende tun" #. type: #: offline.sgml:223 @@ -10574,6 +10927,9 @@ msgid "" " # sh -x ./wget-script\n" " [ wait.. ]" msgstr "" +" # cd /Platte\n" +" # sh -x ./wget-script\n" +" [ warten ... ]" #. type: #: offline.sgml:228 @@ -10581,28 +10937,17 @@ msgid "" "Once the archives are downloaded and the disc returned to the Debian machine " "installation can proceed using," msgstr "" +"Sobald die Archive heruntergeladen und die Platte zur Debian-Maschine " +"zurückgekehrt ist, kann die Installation fortfahren durch Benutzung von " #. type: #: offline.sgml:230 #, no-wrap msgid " # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade" -msgstr "" +msgstr " # apt-get -o dir::cache::archives=\"/Platte/\" dist-upgrade" #. type:

#: offline.sgml:234 msgid "Which will use the already fetched archives on the disc." msgstr "" - -#~ msgid "" -#~ "Disable Immediate Configuration; This dangerous option disables some of " -#~ "APT's ordering code to cause it to make fewer dpkg calls. Doing so may be " -#~ "necessary on some extremely slow single user systems but is very " -#~ "dangerous and may cause package install scripts to fail or worse. Use at " -#~ "your own risk." -#~ msgstr "" -#~ "Sofortkonfiguration ausschalten; Diese gefährliche Option schaltet " -#~ "einigen Befehlscode von APT aus, um es zu veranlassen, Dpkg seltener " -#~ "aufzurufen. Dies zu tun, könnte auf besonders langsamen " -#~ "Einzelbenutzersystemen nötig sein, ist aber gefährlich und könnte " -#~ "Paketinstallationsskripte zum Scheitern oder schlimmeren veranlassen. " -#~ "Benutzen Sie es auf eigene Gefahr." +"Es wird die bereits auf die Platte heruntergeladenen Archive benutzen." \ No newline at end of file -- cgit v1.2.3-70-g09d2 From 24b9038634f87cede3f1d58b223282f7f7a6e3cd Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 1 Jan 2010 19:15:15 +0100 Subject: remove translatable marker from the "%4i %s\n" string in apt-cache.cc --- cmdline/apt-cache.cc | 2 +- debian/changelog | 2 ++ po/apt-all.pot | 9 ++------- 3 files changed, 5 insertions(+), 8 deletions(-) (limited to 'debian') diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index 7d7f58a62..286f306cd 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -1620,7 +1620,7 @@ bool Policy(CommandLine &CmdL) if (SrcList->FindIndex(VF.File(),Indx) == false && _system->FindIndex(VF.File(),Indx) == false) return _error->Error(_("Cache is out of sync, can't x-ref a package file")); - printf(_(" %4i %s\n"),Plcy.GetPriority(VF.File()), + printf(" %4i %s\n",Plcy.GetPriority(VF.File()), Indx->Describe(true).c_str()); } } diff --git a/debian/changelog b/debian/changelog index acc53b037..67b9283aa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,8 @@ apt (0.7.26) UNRELEASED; urgency=low - add APT::FTPArchive::AlwaysStat to disable the too aggressive caching if versions are build multiply times (not recommend) Patch by Christoph Goehre, thanks! (Closes: #463260) + * cmdline/apt-cache.cc: + - remove translatable marker from the "%4i %s\n" string -- Michael Vogt Thu, 10 Dec 2009 22:02:38 +0100 diff --git a/po/apt-all.pot b/po/apt-all.pot index 4ccf7413d..c17a2e9e9 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: 2009-12-10 23:01+0100\n" +"POT-Creation-Date: 2010-01-01 19:13+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -144,11 +144,6 @@ msgstr "" msgid " Version table:" msgstr "" -#: cmdline/apt-cache.cc:1623 -#, c-format -msgid " %4i %s\n" -msgstr "" - #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 #: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144 @@ -2788,7 +2783,7 @@ msgstr "" msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:908 +#: apt-pkg/deb/dpkgpm.cc:909 msgid "Running dpkg" msgstr "" -- cgit v1.2.3-70-g09d2 From 699ec9460d846c6cd749882f3fc3e69a7ecaf14b Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 1 Jan 2010 21:00:54 +0100 Subject: instruct debiandoc to build files with utf-8 encoding --- buildlib/po4a_manpage.mak | 2 +- debian/changelog | 2 ++ doc/makefile | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/buildlib/po4a_manpage.mak b/buildlib/po4a_manpage.mak index dfa215d29..6eec9d031 100644 --- a/buildlib/po4a_manpage.mak +++ b/buildlib/po4a_manpage.mak @@ -57,5 +57,5 @@ endif # Debian Doc SGML Documents SOURCE := $(wildcard *.$(LC).sgml) -DEBIANDOC_HTML_OPTIONS=-l $(LC) +DEBIANDOC_HTML_OPTIONS=-l $(LC).UTF-8 include $(DEBIANDOC_H) diff --git a/debian/changelog b/debian/changelog index 67b9283aa..3b0bf6c10 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,6 +27,8 @@ apt (0.7.26) UNRELEASED; urgency=low Patch by Christoph Goehre, thanks! (Closes: #463260) * cmdline/apt-cache.cc: - remove translatable marker from the "%4i %s\n" string + * buildlib/po4a_manpage.mak: + - instruct debiandoc to build files with utf-8 encoding -- Michael Vogt Thu, 10 Dec 2009 22:02:38 +0100 diff --git a/doc/makefile b/doc/makefile index 6fb604e4e..6e6186466 100644 --- a/doc/makefile +++ b/doc/makefile @@ -8,7 +8,7 @@ include ../buildlib/defaults.mak # Debian Doc SGML Documents SOURCE = $(wildcard *.sgml) -DEBIANDOC_HTML_OPTIONS=-l en +DEBIANDOC_HTML_OPTIONS=-l en.UTF-8 include $(DEBIANDOC_H) # Do not use XMLTO, build the manpages directly with XSLTPROC -- cgit v1.2.3-70-g09d2 From 6fb4e89012d2cc606100e475fb53b337df07e454 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 1 Jan 2010 21:05:58 +0100 Subject: fix some warning from the buildtools in tools.m4 and configure.in --- buildlib/tools.m4 | 12 ++++++------ configure.in | 6 +++--- debian/changelog | 2 ++ 3 files changed, 11 insertions(+), 9 deletions(-) (limited to 'debian') diff --git a/buildlib/tools.m4 b/buildlib/tools.m4 index d1d692331..433d5ca32 100644 --- a/buildlib/tools.m4 +++ b/buildlib/tools.m4 @@ -1,4 +1,4 @@ -AC_DEFUN(ah_HAVE_GETCONF, +AC_DEFUN([ah_HAVE_GETCONF], [AC_ARG_WITH(getconf, [ --with-getconf Enable automagical buildtime configuration], [if test "$withval" = "yes"; then @@ -14,7 +14,7 @@ AC_DEFUN(ah_HAVE_GETCONF, ]) dnl ah_GET_CONF(variable, value ..., [default]) -AC_DEFUN(ah_GET_GETCONF, +AC_DEFUN([ah_GET_GETCONF], [AC_REQUIRE([ah_HAVE_GETCONF]) if test ! -z "$GETCONF";then old_args="[$]@" @@ -28,7 +28,7 @@ AC_DEFUN(ah_GET_GETCONF, eval $1="$3" fi ]) -AC_DEFUN(ah_NUM_CPUS, +AC_DEFUN([ah_NUM_CPUS], [AC_MSG_CHECKING([number of cpus]) AC_ARG_WITH(cpus, [ --with-cpus The number of cpus to be used for building(see --with-procs, default 1)], @@ -56,7 +56,7 @@ AC_DEFUN(ah_NUM_CPUS, AC_MSG_RESULT([$ah_NUM_CPUS_msg]) AC_SUBST(NUM_CPUS) ]) -AC_DEFUN(ah_PROC_MULTIPLY, +AC_DEFUN([ah_PROC_MULTIPLY], [AC_REQUIRE([ah_NUM_CPUS]) AC_MSG_CHECKING([processor multiplier]) AC_ARG_WITH(proc-multiply, @@ -72,7 +72,7 @@ AC_DEFUN(ah_PROC_MULTIPLY, AC_SUBST(PROC_MULTIPLY) ]) -AC_DEFUN(ah_NUM_PROCS, +AC_DEFUN([ah_NUM_PROCS], [AC_REQUIRE([ah_PROC_MULTIPLY]) AC_REQUIRE([ah_NUM_CPUS]) AC_MSG_CHECKING([number of processes to run during make]) @@ -89,7 +89,7 @@ AC_DEFUN(ah_NUM_PROCS, AC_SUBST(NUM_PROCS) ]) -AC_DEFUN(ah_GCC3DEP,[ +AC_DEFUN([ah_GCC3DEP],[ AC_MSG_CHECKING(if $CXX -MD works) touch gcc3dep.cc ${CXX-c++} -MD -o gcc3dep_test.o -c gcc3dep.cc diff --git a/configure.in b/configure.in index fe30d4ca1..302d88d51 100644 --- a/configure.in +++ b/configure.in @@ -96,10 +96,10 @@ AC_MSG_RESULT($archset) AC_DEFINE_UNQUOTED(COMMON_ARCH,"$archset") dnl We use C99 types if at all possible -AC_CACHE_CHECK([for C99 integer types],c9x_ints,[ +AC_CACHE_CHECK([for C99 integer types],apt_cv_c9x_ints,[ AC_TRY_COMPILE([#include ], [uint8_t Foo1;uint16_t Foo2;uint32_t Foo3;], - c9x_ints=yes,c9x_ints=no)]) + apt_cv_c9x_ints=yes,apt_cv_c9x_ints=no)]) dnl Single Unix Spec statvfs AC_CHECK_FUNC(statvfs,[HAVE_STATVFS=yes]) @@ -150,7 +150,7 @@ AC_C_BIGENDIAN dnl We do not need this if we have inttypes! HAVE_C9X=yes -if test x"$c9x_ints" = x"no"; then +if test x"$apt_cv_c9x_ints" = x"no"; then AC_CHECK_SIZEOF(char,$size_char) AC_CHECK_SIZEOF(int,$size_int) AC_CHECK_SIZEOF(short,$size_short) diff --git a/debian/changelog b/debian/changelog index 3b0bf6c10..e36813148 100644 --- a/debian/changelog +++ b/debian/changelog @@ -29,6 +29,8 @@ apt (0.7.26) UNRELEASED; urgency=low - remove translatable marker from the "%4i %s\n" string * buildlib/po4a_manpage.mak: - instruct debiandoc to build files with utf-8 encoding + * buildlib/tools.m4: + - fix some warning from the buildtools -- Michael Vogt Thu, 10 Dec 2009 22:02:38 +0100 -- cgit v1.2.3-70-g09d2 From 02dceb31f77f0812c76334a1758631c7cf9544a3 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 2 Jan 2010 00:22:31 +0100 Subject: add configuration PDiffs::Limit-options (FileLimit and SizeLimit) to not download too many or too big patches (Closes: #554349) --- apt-pkg/acquire-item.cc | 62 ++++++++++++++++++++++++++++++++++---------- debian/changelog | 3 +++ doc/apt.conf.5.xml | 9 ++++++- doc/examples/configure-index | 5 +++- 4 files changed, 64 insertions(+), 15 deletions(-) (limited to 'debian') diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 10e80eb56..4f0abbb91 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -219,19 +219,19 @@ bool pkgAcqDiffIndex::ParseDiffIndex(string IndexDiffFile) /*{{{*/ if(TF.Step(Tags) == true) { - string local_sha1; bool found = false; DiffInfo d; string size; - string tmp = Tags.FindS("SHA1-Current"); + string const tmp = Tags.FindS("SHA1-Current"); std::stringstream ss(tmp); - ss >> ServerSha1; + ss >> ServerSha1 >> size; + unsigned long const ServerSize = atol(size.c_str()); FileFd fd(CurrentPackagesFile, FileFd::ReadOnly); SHA1Summation SHA1; SHA1.AddFD(fd.Fd(), fd.Size()); - local_sha1 = string(SHA1.Result()); + string const local_sha1 = SHA1.Result(); if(local_sha1 == ServerSha1) { @@ -248,20 +248,56 @@ bool pkgAcqDiffIndex::ParseDiffIndex(string IndexDiffFile) /*{{{*/ std::clog << "SHA1-Current: " << ServerSha1 << std::endl; // check the historie and see what patches we need - string history = Tags.FindS("SHA1-History"); + string const history = Tags.FindS("SHA1-History"); std::stringstream hist(history); - while(hist >> d.sha1 >> size >> d.file) + while(hist >> d.sha1 >> size >> d.file) { - d.size = atoi(size.c_str()); // read until the first match is found + // from that point on, we probably need all diffs if(d.sha1 == local_sha1) found=true; - // from that point on, we probably need all diffs - if(found) + else if (found == false) + continue; + + if(Debug) + std::clog << "Need to get diff: " << d.file << std::endl; + available_patches.push_back(d); + } + + if (available_patches.empty() == false) + { + // patching with too many files is rather slow compared to a fast download + unsigned long const fileLimit = _config->FindI("Acquire::PDiffs::FileLimit", 0); + if (fileLimit != 0 && fileLimit < available_patches.size()) + { + if (Debug) + std::clog << "Need " << available_patches.size() << " diffs (Limit is " << fileLimit + << ") so fallback to complete download" << std::endl; + return false; + } + + // see if the patches are too big + found = false; // it was true and it will be true again at the end + d = *available_patches.begin(); + string const firstPatch = d.file; + unsigned long patchesSize = 0; + std::stringstream patches(Tags.FindS("SHA1-Patches")); + while(patches >> d.sha1 >> size >> d.file) + { + if (firstPatch == d.file) + found = true; + else if (found == false) + continue; + + patchesSize += atol(size.c_str()); + } + unsigned long const sizeLimit = ServerSize * _config->FindI("Acquire::PDiffs::SizeLimit", 100); + if (sizeLimit > 0 && (sizeLimit/100) < patchesSize) { - if(Debug) - std::clog << "Need to get diff: " << d.file << std::endl; - available_patches.push_back(d); + if (Debug) + std::clog << "Need " << patchesSize << " bytes (Limit is " << sizeLimit/100 + << ") so fallback to complete download" << std::endl; + return false; } } } @@ -270,7 +306,7 @@ bool pkgAcqDiffIndex::ParseDiffIndex(string IndexDiffFile) /*{{{*/ if(found) { // queue the diffs - string::size_type last_space = Description.rfind(" "); + string::size_type const last_space = Description.rfind(" "); if(last_space != string::npos) Description.erase(last_space, Description.size()-last_space); new pkgAcqIndexDiffs(Owner, RealURI, Description, Desc.ShortDesc, diff --git a/debian/changelog b/debian/changelog index e36813148..1454eed3c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,6 +31,9 @@ apt (0.7.26) UNRELEASED; urgency=low - instruct debiandoc to build files with utf-8 encoding * buildlib/tools.m4: - fix some warning from the buildtools + * apt-pkg/acquire-item.cc: + - add configuration PDiffs::Limit-options to not download + too many or too big patches (Closes: #554349) -- Michael Vogt Thu, 10 Dec 2009 22:02:38 +0100 diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index 734ae1fe7..fd50e377f 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -221,7 +221,14 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; PDiffs Try to download deltas called PDiffs for Packages or Sources files instead of downloading whole ones. True - by default. + by default. + Two sub-options to limit the use of PDiffs are also available: + With FileLimit can be specified how many PDiff files + are downloaded at most to patch a file. SizeLimit + on the other hand is the maximum precentage of the size of all patches + compared to the size of the targeted file. If one of these limits is + exceeded the complete file is downloaded instead of the patches. + Queue-Mode diff --git a/doc/examples/configure-index b/doc/examples/configure-index index 0a20e8f2b..be461aaad 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -176,7 +176,10 @@ Acquire Source-Symlinks "true"; PDiffs "true"; // try to get the IndexFile diffs - + PDiffs::FileLimit "4"; // don't use diffs if we would need more than 4 diffs + PDiffs::SizeLimit "50"; // don't use diffs if size of all patches excess + // 50% of the size of the original file + // HTTP method configuration http { -- cgit v1.2.3-70-g09d2 From 20f463e8f67a6d442444cb6a18ddbe60fc06742d Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 2 Jan 2010 17:03:23 +0100 Subject: let all packages depend on --- debian/changelog | 2 ++ debian/control | 10 ++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 1454eed3c..1e935c682 100644 --- a/debian/changelog +++ b/debian/changelog @@ -34,6 +34,8 @@ apt (0.7.26) UNRELEASED; urgency=low * apt-pkg/acquire-item.cc: - add configuration PDiffs::Limit-options to not download too many or too big patches (Closes: #554349) + * debian/control: + - let all packages depend on ${misc:Depends} -- Michael Vogt Thu, 10 Dec 2009 22:02:38 +0100 diff --git a/debian/control b/debian/control index 357fb3f5f..d756871d1 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/ Package: apt Architecture: any -Depends: ${shlibs:Depends}, debian-archive-keyring +Depends: ${shlibs:Depends}, debian-archive-keyring, ${misc:Depends} Replaces: libapt-pkg-doc (<< 0.3.7), libapt-pkg-dev (<< 0.3.7) Provides: ${libapt-pkg:provides} Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, bzip2, lzma, python-apt @@ -26,6 +26,7 @@ Description: Advanced front-end for dpkg Package: apt-doc Architecture: all Priority: optional +Depends: ${misc:Depends} Replaces: apt (<< 0.5.4.9) Section: doc Description: Documentation for APT @@ -35,7 +36,7 @@ Description: Documentation for APT Package: libapt-pkg-dev Architecture: any Priority: optional -Depends: apt (= ${binary:Version}), apt-utils (= ${binary:Version}), ${libapt-pkg:provides}, ${libapt-inst:provides} +Depends: apt (= ${binary:Version}), apt-utils (= ${binary:Version}), ${libapt-pkg:provides}, ${libapt-inst:provides}, ${misc:Depends} Section: libdevel Description: Development files for APT's libapt-pkg and libapt-inst This package contains the header files and libraries for @@ -45,6 +46,7 @@ Description: Development files for APT's libapt-pkg and libapt-inst Package: libapt-pkg-doc Architecture: all Priority: optional +Depends: ${misc:Depends} Section: doc Description: Documentation for APT development This package contains documentation for development of the APT @@ -52,7 +54,7 @@ Description: Documentation for APT development Package: apt-utils Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Provides: ${libapt-inst:provides} Replaces: apt (<< 0.5.9) Description: APT utility programs @@ -65,7 +67,7 @@ Description: APT utility programs Package: apt-transport-https Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Priority: optional Description: APT https transport This package contains a APT https transport. It makes it possible to -- cgit v1.2.3-70-g09d2 From 6aa944bc539cea4095971ccb2354c1e8f9f2c90a Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 2 Jan 2010 17:53:05 +0100 Subject: remove the horrible outdated share/*-archive.gpg files and all there traces We already depend on the proper keyring so we don't need to ship our own version which isn't used anyway. --- debian/apt.postinst | 6 ------ debian/changelog | 3 +++ debian/rules | 1 - share/debian-archive.gpg | Bin 2280 -> 0 bytes share/ubuntu-archive.gpg | Bin 1724 -> 0 bytes 5 files changed, 3 insertions(+), 7 deletions(-) delete mode 100644 share/debian-archive.gpg delete mode 100644 share/ubuntu-archive.gpg (limited to 'debian') diff --git a/debian/apt.postinst b/debian/apt.postinst index 88fb932df..cc0d8b1fe 100644 --- a/debian/apt.postinst +++ b/debian/apt.postinst @@ -15,13 +15,7 @@ set -e case "$1" in configure) - - if ! test -f /etc/apt/trusted.gpg; then - cp /usr/share/apt/debian-archive.gpg /etc/apt/trusted.gpg - fi - apt-key update - ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/debian/changelog b/debian/changelog index 1e935c682..ffd8f5c59 100644 --- a/debian/changelog +++ b/debian/changelog @@ -36,6 +36,9 @@ apt (0.7.26) UNRELEASED; urgency=low too many or too big patches (Closes: #554349) * debian/control: - let all packages depend on ${misc:Depends} + * share/*-archive.gpg: + - remove the horrible outdated files. We already depend on + the keyring so we don't need to ship our own version -- Michael Vogt Thu, 10 Dec 2009 22:02:38 +0100 diff --git a/debian/rules b/debian/rules index d01b57cd6..37c96ef20 100755 --- a/debian/rules +++ b/debian/rules @@ -213,7 +213,6 @@ apt: build build-doc debian/shlibs.local cp debian/bugscript debian/$@/usr/share/bug/apt/script cp debian/apt.logrotate debian/$@/etc/logrotate.d/apt - cp share/debian-archive.gpg debian/$@/usr/share/$@ cp debian/apt.conf.autoremove debian/$@/etc/apt/apt.conf.d/01autoremove # head -n 500 ChangeLog > debian/ChangeLog diff --git a/share/debian-archive.gpg b/share/debian-archive.gpg deleted file mode 100644 index da1aa5e97..000000000 Binary files a/share/debian-archive.gpg and /dev/null differ diff --git a/share/ubuntu-archive.gpg b/share/ubuntu-archive.gpg deleted file mode 100644 index 2ce60d454..000000000 Binary files a/share/ubuntu-archive.gpg and /dev/null differ -- cgit v1.2.3-70-g09d2 From 6355a02fbfa1cffa9291095ede32c35737ed7419 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 2 Jan 2010 20:24:53 +0100 Subject: apt-key errors out nicely if wget is not installed (Closes: #545754) --- cmdline/apt-key | 9 ++++++++- debian/changelog | 2 ++ 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/cmdline/apt-key b/cmdline/apt-key index 5f4e02fdf..24010edf3 100755 --- a/cmdline/apt-key +++ b/cmdline/apt-key @@ -56,7 +56,14 @@ add_keys_with_verify_against_master_keyring() { # (otherwise it does not make sense from a security POV) net_update() { if [ -z "$ARCHIVE_KEYRING_URI" ]; then - echo "ERROR: no location for the archive-keyring given" + echo "ERROR: no location for the archive-keyring given" + exit 1 + fi + # in theory we would need to depend on wget for this, but this feature + # isn't useable in debian anyway as we have no keyring uri nor a master key + if ! which wget >/dev/null 2>&1; then + echo "ERROR: an installed wget is required for a network-based update" + exit 1 fi if [ ! -d /var/lib/apt/keyrings ]; then mkdir -p /var/lib/apt/keyrings diff --git a/debian/changelog b/debian/changelog index ffd8f5c59..f70c5735f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -39,6 +39,8 @@ apt (0.7.26) UNRELEASED; urgency=low * share/*-archive.gpg: - remove the horrible outdated files. We already depend on the keyring so we don't need to ship our own version + * cmdline/apt-key: + - errors out if wget is not installed (Closes: #545754) -- Michael Vogt Thu, 10 Dec 2009 22:02:38 +0100 -- cgit v1.2.3-70-g09d2 From c24f6ce22cd6720004addad2e3382b3caa6b1b7c Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 4 Jan 2010 13:45:14 +0100 Subject: add TrustedParts so in the future new keyrings can just be dropped into /etc/apt/trusted.gpg.d/ which eliminates the need to have gpg installed to add keys to APTs trusted keyring (with apt-key) (Closes #304846) - Thanks to Timo Weingärtner & Peter Palfrader for providing different patchs/ideas for this! MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmdline/apt-key | 37 +++++++++++++++-- debian/apt.dirs | 1 + debian/changelog | 4 ++ doc/apt-key.8.xml | 24 ++++++++--- doc/apt.ent | 13 ++++++ doc/examples/configure-index | 7 +--- methods/gpgv.cc | 98 +++++++++++++++++++++++++------------------- 7 files changed, 126 insertions(+), 58 deletions(-) (limited to 'debian') diff --git a/cmdline/apt-key b/cmdline/apt-key index 24010edf3..1950723f3 100755 --- a/cmdline/apt-key +++ b/cmdline/apt-key @@ -5,10 +5,8 @@ unset GREP_OPTIONS # We don't use a secret keyring, of course, but gpg panics and # implodes if there isn't one available - GPG_CMD="gpg --ignore-time-conflict --no-options --no-default-keyring --secret-keyring /etc/apt/secring.gpg --trustdb-name /etc/apt/trustdb.gpg" -GPG="$GPG_CMD --keyring /etc/apt/trusted.gpg" - +GPG="$GPG_CMD" MASTER_KEYRING="" ARCHIVE_KEYRING_URI="" @@ -115,7 +113,7 @@ update() { usage() { - echo "Usage: apt-key [command] [arguments]" + echo "Usage: apt-key [--keyring file] [command] [arguments]" echo echo "Manage apt's list of trusted keys" echo @@ -129,8 +127,39 @@ usage() { echo " apt-key finger - list fingerprints" echo " apt-key adv - pass advanced options to gpg (download key)" echo + echo "If no specific keyring file is given the command applies to all keyring files." } +# Determine on which keyring we want to work +if [ "$1" = "--keyring" ]; then + echo "keyfile given" + shift + TRUSTEDFILE="$1" + if [ -r "$TRUSTEDFILE" ]; then + GPG="$GPG --keyring $TRUSTEDFILE --primary-keyring $TRUSTEDFILE" + else + echo >&2 "Error: The specified keyring »$TRUSTEDFILE« is missing or not readable" + exit 1 + fi + shift +else + echo "generate list" + TRUSTEDFILE="/etc/apt/trusted.gpg" + if [ -r "$TRUSTEDFILE" ]; then + GPG="$GPG --keyring $TRUSTEDFILE" + fi + GPG="$GPG --primary-keyring $TRUSTEDFILE" + TRUSTEDPARTS="/etc/apt/trusted.gpg.d" + if [ -d "$TRUSTEDPARTS" ]; then + echo "parts active" + for trusted in $(run-parts --list $TRUSTEDPARTS --regex '^.*\.gpg$'); do + echo "part -> $trusted" + GPG="$GPG --keyring $trusted" + done + fi +fi +echo "COMMAND: $GPG" + command="$1" if [ -z "$command" ]; then usage diff --git a/debian/apt.dirs b/debian/apt.dirs index fb6716c35..66556e453 100644 --- a/debian/apt.dirs +++ b/debian/apt.dirs @@ -5,6 +5,7 @@ etc/apt etc/apt/apt.conf.d etc/apt/preferences.d etc/apt/sources.list.d +etc/apt/trusted.gpg.d etc/logrotate.d var/cache/apt/archives/partial var/lib/apt/lists/partial diff --git a/debian/changelog b/debian/changelog index f70c5735f..fca8d3ccb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -41,6 +41,10 @@ apt (0.7.26) UNRELEASED; urgency=low the keyring so we don't need to ship our own version * cmdline/apt-key: - errors out if wget is not installed (Closes: #545754) + - add --keyring option as we have now possibly many + * methods/gpgv.cc: + - pass all keyrings (TrustedParts) to gpgv instead of + using only one trusted.gpg keyring (Closes: #304846) -- Michael Vogt Thu, 10 Dec 2009 22:02:38 +0100 diff --git a/doc/apt-key.8.xml b/doc/apt-key.8.xml index 7b0691b5e..8f445b7f9 100644 --- a/doc/apt-key.8.xml +++ b/doc/apt-key.8.xml @@ -26,7 +26,8 @@ apt-key - command/ + + command @@ -135,11 +136,24 @@ + Options +Note that options need to be defined before the commands described in the previous section. + + --keyring filename + 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 trusted.gpg file as well as on all parts in the + trusted.gpg.d directory, through trusted.gpg + is the primary keyring which means that e.g. new keys are added to this one. + + + + + Files - /etc/apt/trusted.gpg - Keyring of local trusted keys, new keys will be added here. - + + &file-trustedgpg; /etc/apt/trustdb.gpg Local trust database of archive keys. @@ -153,8 +167,6 @@ Keyring of Debian archive removed trusted keys. - - diff --git a/doc/apt.ent b/doc/apt.ent index 0b341ec14..da43d8f3d 100644 --- a/doc/apt.ent +++ b/doc/apt.ent @@ -353,3 +353,16 @@ Configuration Item: Dir::State::Lists (implicit partial). "> + +/etc/apt/trusted.gpg + Keyring of local trusted keys, new keys will be added here. + Configuration Item: Dir::Etc::Trusted. + + + /etc/apt/trusted.gpg.d/ + File fragments for the trusted keys, additional keyrings can + be stored here (by other packages or the administrator). + Configuration Item Dir::Etc::TrustedParts. + +"> diff --git a/doc/examples/configure-index b/doc/examples/configure-index index be461aaad..87cf97ffe 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -90,11 +90,6 @@ APT TrustCDROM "false"; // consider the CDROM always trusted }; - GPGV - { - TrustedKeyring "/etc/apt/trusted.gpg"; - }; - // Some general options Ignore-Hold "false"; Clean-Installed "true"; @@ -320,6 +315,8 @@ Dir "/" SourceParts "sources.list.d"; VendorList "vendors.list"; VendorParts "vendors.list.d"; + Trusted "trusted.gpg"; + TrustedParts "trusted.gpg.d"; }; // Locations of binaries diff --git a/methods/gpgv.cc b/methods/gpgv.cc index 150c1d315..e3e849827 100644 --- a/methods/gpgv.cc +++ b/methods/gpgv.cc @@ -1,10 +1,9 @@ #include #include #include +#include #include -#include -#include #include #include #include @@ -45,42 +44,47 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, vector &WorthlessSigners, vector &NoPubKeySigners) { + bool const Debug = _config->FindB("Debug::Acquire::gpgv", false); // setup a (empty) stringstream for formating the return value std::stringstream ret; ret.str(""); - if (_config->FindB("Debug::Acquire::gpgv", false)) - { - std::cerr << "inside VerifyGetSigners" << std::endl; - } + if (Debug == true) + std::clog << "inside VerifyGetSigners" << std::endl; + pid_t pid; int fd[2]; FILE *pipein; int status; - struct stat buff; - string gpgvpath = _config->Find("Dir::Bin::gpg", "/usr/bin/gpgv"); - string pubringpath = _config->Find("APT::GPGV::TrustedKeyring", "/etc/apt/trusted.gpg"); - if (_config->FindB("Debug::Acquire::gpgv", false)) + string const gpgvpath = _config->Find("Dir::Bin::gpg", "/usr/bin/gpgv"); + // FIXME: remove support for deprecated APT::GPGV setting + string const trustedFile = _config->FindFile("Dir::Etc::Trusted", + _config->Find("APT::GPGV::TrustedKeyring", "/etc/apt/trusted.gpg").c_str()); + string const trustedPath = _config->FindDir("Dir::Etc::TrustedParts", "/etc/apt/trusted.gpg.d"); + if (Debug == true) { - std::cerr << "gpgv path: " << gpgvpath << std::endl; - std::cerr << "Keyring path: " << pubringpath << std::endl; + std::clog << "gpgv path: " << gpgvpath << std::endl; + std::clog << "Keyring file: " << trustedFile << std::endl; + std::clog << "Keyring path: " << trustedPath << std::endl; } - if (stat(pubringpath.c_str(), &buff) != 0) + vector keyrings = GetListOfFilesInDir(trustedPath, "gpg", false); + if (FileExists(trustedFile) == true) + keyrings.push_back(trustedFile); + + if (keyrings.empty() == true) { - ioprintf(ret, _("Couldn't access keyring: '%s'"), strerror(errno)); + // TRANSLATOR: %s is the trusted keyring parts directory + ioprintf(ret, _("No keyring installed in %s."), trustedPath.c_str()); return ret.str(); } + if (pipe(fd) < 0) - { return "Couldn't create pipe"; - } pid = fork(); if (pid < 0) - { return string("Couldn't spawn new process") + strerror(errno); - } else if (pid == 0) { const char *Args[400]; @@ -90,8 +94,16 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, Args[i++] = "--status-fd"; Args[i++] = "3"; Args[i++] = "--ignore-time-conflict"; - Args[i++] = "--keyring"; - Args[i++] = pubringpath.c_str(); + for (vector::const_iterator K = keyrings.begin(); + K != keyrings.end(); ++K) + { + Args[i++] = "--keyring"; + Args[i++] = K->c_str(); + if(i >= 395) { + std::clog << _("E: Too many keyrings should be passed to gpgv. Exiting.") << std::endl; + exit(111); + } + } Configuration::Item const *Opts; Opts = _config->Tree("Acquire::gpgv::Options"); @@ -104,7 +116,7 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, continue; Args[i++] = Opts->Value.c_str(); if(i >= 395) { - std::cerr << _("E: Argument list from Acquire::gpgv::Options too long. Exiting.") << std::endl; + std::clog << _("E: Argument list from Acquire::gpgv::Options too long. Exiting.") << std::endl; exit(111); } } @@ -113,14 +125,14 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, Args[i++] = outfile; Args[i++] = NULL; - if (_config->FindB("Debug::Acquire::gpgv", false)) + if (Debug == true) { - std::cerr << "Preparing to exec: " << gpgvpath; + std::clog << "Preparing to exec: " << gpgvpath; for(unsigned int j=0;Args[j] != NULL; j++) - std::cerr << " " << Args[j]; - std::cerr << std::endl; + std::clog << " " << Args[j]; + std::clog << std::endl; } - int nullfd = open("/dev/null", O_RDONLY); + int const nullfd = open("/dev/null", O_RDONLY); close(fd[0]); // Redirect output to /dev/null; we read from the status fd dup2(nullfd, STDOUT_FILENO); @@ -159,8 +171,8 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, break; *(buffer+bufferoff) = '\0'; bufferoff = 0; - if (_config->FindB("Debug::Acquire::gpgv", false)) - std::cerr << "Read: " << buffer << std::endl; + if (Debug == true) + std::clog << "Read: " << buffer << std::endl; // Push the data into three separate vectors, which // we later concatenate. They're kept separate so @@ -168,33 +180,33 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, // it will be better. if (strncmp(buffer, GNUPGBADSIG, sizeof(GNUPGBADSIG)-1) == 0) { - if (_config->FindB("Debug::Acquire::gpgv", false)) - std::cerr << "Got BADSIG! " << std::endl; + if (Debug == true) + std::clog << "Got BADSIG! " << std::endl; BadSigners.push_back(string(buffer+sizeof(GNUPGPREFIX))); } if (strncmp(buffer, GNUPGNOPUBKEY, sizeof(GNUPGNOPUBKEY)-1) == 0) { - if (_config->FindB("Debug::Acquire::gpgv", false)) - std::cerr << "Got NO_PUBKEY " << std::endl; + if (Debug == true) + std::clog << "Got NO_PUBKEY " << std::endl; NoPubKeySigners.push_back(string(buffer+sizeof(GNUPGPREFIX))); } if (strncmp(buffer, GNUPGNODATA, sizeof(GNUPGBADSIG)-1) == 0) { - if (_config->FindB("Debug::Acquire::gpgv", false)) - std::cerr << "Got NODATA! " << std::endl; + if (Debug == true) + std::clog << "Got NODATA! " << std::endl; BadSigners.push_back(string(buffer+sizeof(GNUPGPREFIX))); } if (strncmp(buffer, GNUPGKEYEXPIRED, sizeof(GNUPGKEYEXPIRED)-1) == 0) { - if (_config->FindB("Debug::Acquire::gpgv", false)) - std::cerr << "Got KEYEXPIRED! " << std::endl; + if (Debug == true) + std::clog << "Got KEYEXPIRED! " << std::endl; WorthlessSigners.push_back(string(buffer+sizeof(GNUPGPREFIX))); } if (strncmp(buffer, GNUPGREVKEYSIG, sizeof(GNUPGREVKEYSIG)-1) == 0) { - if (_config->FindB("Debug::Acquire::gpgv", false)) - std::cerr << "Got REVKEYSIG! " << std::endl; + if (Debug == true) + std::clog << "Got REVKEYSIG! " << std::endl; WorthlessSigners.push_back(string(buffer+sizeof(GNUPGPREFIX))); } if (strncmp(buffer, GNUPGGOODSIG, sizeof(GNUPGGOODSIG)-1) == 0) @@ -204,17 +216,17 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, while (*p && isxdigit(*p)) p++; *p = 0; - if (_config->FindB("Debug::Acquire::gpgv", false)) - std::cerr << "Got GOODSIG, key ID:" << sig << std::endl; + if (Debug == true) + std::clog << "Got GOODSIG, key ID:" << sig << std::endl; GoodSigners.push_back(string(sig)); } } fclose(pipein); waitpid(pid, &status, 0); - if (_config->FindB("Debug::Acquire::gpgv", false)) + if (Debug == true) { - std::cerr << "gpgv exited\n"; + std::clog << "gpgv exited\n"; } if (WEXITSTATUS(status) == 0) @@ -305,7 +317,7 @@ bool GPGVMethod::Fetch(FetchItem *Itm) if (_config->FindB("Debug::Acquire::gpgv", false)) { - std::cerr << "gpgv succeeded\n"; + std::clog << "gpgv succeeded\n"; } return true; -- cgit v1.2.3-70-g09d2 From 930f51811cd36a695c07f0b8414b118ce28dda04 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 4 Jan 2010 13:54:57 +0100 Subject: finally merge the rest of the patchset from Arnaud Ebalard with the CRL and Issuers options for https, thanks! (Closes: #485963) --- debian/changelog | 3 +++ doc/examples/apt-https-method-example.conf | 21 +++++++++++++++++++++ methods/https.cc | 14 ++++++++++++++ 3 files changed, 38 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index fca8d3ccb..cdf477cfd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -45,6 +45,9 @@ apt (0.7.26) UNRELEASED; urgency=low * methods/gpgv.cc: - pass all keyrings (TrustedParts) to gpgv instead of using only one trusted.gpg keyring (Closes: #304846) + * methods/https.cc: + - finally merge the rest of the patchset from Arnaud Ebalard + with the CRL and Issuers options, thanks! (Closes: #485963) -- Michael Vogt Thu, 10 Dec 2009 22:02:38 +0100 diff --git a/doc/examples/apt-https-method-example.conf b/doc/examples/apt-https-method-example.conf index 0067171bd..cc7889044 100644 --- a/doc/examples/apt-https-method-example.conf +++ b/doc/examples/apt-https-method-example.conf @@ -36,6 +36,8 @@ to access its content. - The certificate presented by both server have (as expected) a CN that matches their respective DNS names. + - We have CRL available for both dom1.tld and dom2.tld PKI, and intend + to use them. - It somtimes happens that we had other more generic https available repository to our list. We want the checks to be performed against a common list of anchors (like the one provided by ca-certificates @@ -56,10 +58,13 @@ Acquire::https::CaInfo "/etc/ssl/certs/ca-certificates.pem"; // Use a specific anchor and associated CRL. Enforce issuer of // server certificate using its cert. Acquire::https::secure.dom1.tld::CaInfo "/etc/apt/certs/ca-dom1-crt.pem"; +Acquire::https::secure.dom1.tld::CrlFile "/etc/apt/certs/ca-dom1-crl.pem"; +Acquire::https::secure.dom1.tld::IssuerCert "/etc/apt/certs/secure.dom1-issuer-crt.pem"; // Like previous for anchor and CRL, but also provide our // certificate and keys for client authentication. Acquire::https::secure.dom2.tld::CaInfo "/etc/apt/certs/ca-dom2-crt.pem"; +Acquire::https::secure.dom2.tld::CrlFile "/etc/apt/certs/ca-dom2-crl.pem"; Acquire::https::secure.dom2.tld::SslCert "/etc/apt/certs/my-crt.pem"; Acquire::https::secure.dom2.tld::SslKey "/etc/apt/certs/my-key.pem"; @@ -97,6 +102,22 @@ Acquire::https::secure.dom2.tld::SslKey "/etc/apt/certs/my-key.pem"; used for the https entries in the sources.list file that use that repository (with the same name). + Acquire::https[::repo.domain.tld]::CrlFile "/path/to/all/crl.pem"; + + Like previous knob but for passing the list of CRL files (in PEM + format) to be used to verify revocation status. Again, if the + option is defined with no specific mirror (probably makes little + sense), this CRL information is used for all defined https entries + in sources.list file. In a mirror specific context, it only applies + to that mirror. + + Acquire::https[::repo.domain.tld]::IssuerCert "/path/to/issuer/cert.pem"; + + Allows to constrain the issuer of the server certificate (for all + https mirrors or a specific one) to a specific issuer. If the + server certificate has not been issued by this certificate, + connection fails. + Acquire::https[::repo.domain.tld]::Verify-Peer "true"; When authenticating the server, if the certificate verification fails diff --git a/methods/https.cc b/methods/https.cc index 5d8e63f47..35c23db20 100644 --- a/methods/https.cc +++ b/methods/https.cc @@ -151,6 +151,13 @@ bool HttpsMethod::Fetch(FetchItem *Itm) default_verify = 0; curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, verify); + // Also enforce issuer of server certificate using its cert + string issuercert = _config->Find("Acquire::https::IssuerCert",""); + knob = "Acquire::https::"+remotehost+"::IssuerCert"; + issuercert = _config->Find(knob.c_str(),issuercert.c_str()); + if(issuercert != "") + curl_easy_setopt(curl, CURLOPT_ISSUERCERT,issuercert.c_str()); + // For client authentication, certificate file ... string pem = _config->Find("Acquire::https::SslCert",""); knob = "Acquire::https::"+remotehost+"::SslCert"; @@ -177,6 +184,13 @@ bool HttpsMethod::Fetch(FetchItem *Itm) final_version = CURL_SSLVERSION_SSLv3; curl_easy_setopt(curl, CURLOPT_SSLVERSION, final_version); + // CRL file + string crlfile = _config->Find("Acquire::https::CrlFile",""); + knob = "Acquire::https::"+remotehost+"::CrlFile"; + crlfile = _config->Find(knob.c_str(),crlfile.c_str()); + if(crlfile != "") + curl_easy_setopt(curl, CURLOPT_CRLFILE, crlfile.c_str()); + // cache-control if(_config->FindB("Acquire::https::No-Cache", _config->FindB("Acquire::http::No-Cache",false)) == false) -- cgit v1.2.3-70-g09d2 From daee881bf82d23197d991227fa0ab36b918b4323 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 13 Jan 2010 14:52:28 +0100 Subject: correct a spelling error spotted by lintian in the debian/NEWS file: W: spelling-error-in-news-debian: informations -> information --- debian/NEWS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/NEWS b/debian/NEWS index 7612adb9c..a12f1a4f8 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -2,7 +2,7 @@ apt (0.7.24) unstable; urgency=low * Already included in the last version but now with better documentation is the possibility to add/prefer different compression types while - downloading archive informations, which can decrease the time needed for + downloading archive information, which can decrease the time needed for update on slow machines. See apt.conf (5) manpage for details. * APT manages his manpage translations now with po4a, thanks to Nicolas François and Kurasawa Nozomu, who also provide the ja translation. -- cgit v1.2.3-70-g09d2 From e29a6bb14dcc004d174ad8502b76623139fbee06 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 16 Jan 2010 23:09:42 +0100 Subject: Fix the newly introduced method GetListOfFilesInDir to not accept every file if no extension is enforced (= restore old behaviour). (Closes: #565213) This commit includes also: * apt-pkg/policy.cc: - accept also partfiles with "pref" file extension as valid * apt-pkg/contrib/configuration.cc: - accept also partfiles with "conf" file extension as valid * doc/apt.conf.5.xml: - reorder description and split out syntax - add partfile name convention (Closes: #558348) * doc/apt_preferences.conf.5.xml: - describe partfile name convention also here And a lovely test application of course. --- apt-pkg/contrib/configuration.cc | 2 +- apt-pkg/contrib/fileutl.cc | 84 +++++++++++++++++++++++++++++++-- apt-pkg/contrib/fileutl.h | 5 ++ apt-pkg/policy.cc | 2 +- debian/changelog | 18 +++++++ doc/apt.conf.5.xml | 33 ++++++++----- doc/apt_preferences.5.xml | 7 +++ test/libapt/getlistoffilesindir_test.cc | 82 ++++++++++++++++++++++++++++++++ test/libapt/makefile | 6 +++ test/libapt/run-tests.sh | 50 ++++++++++++++++++-- 10 files changed, 267 insertions(+), 22 deletions(-) create mode 100644 test/libapt/getlistoffilesindir_test.cc (limited to 'debian') diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc index 80b089fac..7588b041c 100644 --- a/apt-pkg/contrib/configuration.cc +++ b/apt-pkg/contrib/configuration.cc @@ -832,7 +832,7 @@ bool ReadConfigFile(Configuration &Conf,const string &FName,bool const &AsSectio bool ReadConfigDir(Configuration &Conf,const string &Dir, bool const &AsSectional, unsigned const &Depth) { - vector const List = GetListOfFilesInDir(Dir, "", true); + vector const List = GetListOfFilesInDir(Dir, "conf", true, true); // Read the files for (vector::const_iterator I = List.begin(); I != List.end(); I++) diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index cce8a4512..da32983f1 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -202,8 +202,37 @@ bool FileExists(string File) /* If an extension is given only files with this extension are included in the returned vector, otherwise every "normal" file is included. */ std::vector GetListOfFilesInDir(string const &Dir, string const &Ext, - bool const &SortList) + bool const &SortList) { + return GetListOfFilesInDir(Dir, Ext, SortList, false); +} +std::vector GetListOfFilesInDir(string const &Dir, string const &Ext, + bool const &SortList, bool const &AllowNoExt) +{ + std::vector ext; + ext.reserve(2); + if (Ext.empty() == false) + ext.push_back(Ext); + if (AllowNoExt == true && ext.empty() == false) + ext.push_back(""); + return GetListOfFilesInDir(Dir, ext, SortList); +} +std::vector GetListOfFilesInDir(string const &Dir, std::vector const &Ext, + bool const &SortList) +{ + // Attention debuggers: need to be set with the environment config file! + bool const Debug = _config->FindB("Debug::GetListOfFilesInDir", false); + if (Debug == true) + { + std::clog << "Accept in " << Dir << " only files with the following " << Ext.size() << " extensions:" << std::endl; + if (Ext.empty() == true) + std::clog << "\tNO extension" << std::endl; + else + for (std::vector::const_iterator e = Ext.begin(); + e != Ext.end(); ++e) + std::clog << '\t' << (e->empty() == true ? "NO" : *e) << " extension" << std::endl; + } + std::vector List; DIR *D = opendir(Dir.c_str()); if (D == 0) @@ -214,28 +243,73 @@ std::vector GetListOfFilesInDir(string const &Dir, string const &Ext, for (struct dirent *Ent = readdir(D); Ent != 0; Ent = readdir(D)) { + // skip "hidden" files if (Ent->d_name[0] == '.') continue; - if (Ext.empty() == false && flExtension(Ent->d_name) != Ext) - continue; + // check for accepted extension: + // no extension given -> periods are bad as hell! + // extensions given -> "" extension allows no extension + if (Ext.empty() == false) + { + string d_ext = flExtension(Ent->d_name); + if (d_ext == Ent->d_name) // no extension + { + if (std::find(Ext.begin(), Ext.end(), "") == Ext.end()) + { + if (Debug == true) + std::clog << "Bad file: " << Ent->d_name << " → no extension" << std::endl; + continue; + } + } + else if (std::find(Ext.begin(), Ext.end(), d_ext) == Ext.end()) + { + if (Debug == true) + std::clog << "Bad file: " << Ent->d_name << " → bad extension »" << flExtension(Ent->d_name) << "«" << std::endl; + continue; + } + } - // Skip bad file names ala run-parts + // Skip bad filenames ala run-parts const char *C = Ent->d_name; for (; *C != 0; ++C) if (isalpha(*C) == 0 && isdigit(*C) == 0 - && *C != '_' && *C != '-' && *C != '.') + && *C != '_' && *C != '-') { + // no required extension -> dot is a bad character + if (*C == '.' && Ext.empty() == false) + continue; break; + } + // we don't reach the end of the name -> bad character included if (*C != 0) + { + if (Debug == true) + std::clog << "Bad file: " << Ent->d_name << " → bad character »" + << *C << "« in filename (period allowed: " << (Ext.empty() ? "no" : "yes") << ")" << std::endl; continue; + } + + // skip filenames which end with a period. These are never valid + if (*(C - 1) == '.') + { + if (Debug == true) + std::clog << "Bad file: " << Ent->d_name << " → Period as last character" << std::endl; + continue; + } // Make sure it is a file and not something else string const File = flCombine(Dir,Ent->d_name); struct stat St; if (stat(File.c_str(),&St) != 0 || S_ISREG(St.st_mode) == 0) + { + if (Debug == true) + std::clog << "Bad file: " << Ent->d_name << " → stat says not a good file" << std::endl; continue; + } + if (Debug == true) + std::clog << "Accept file: " << Ent->d_name << " in " << Dir << std::endl; List.push_back(File); } closedir(D); diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h index 2807c29d9..85a94898c 100644 --- a/apt-pkg/contrib/fileutl.h +++ b/apt-pkg/contrib/fileutl.h @@ -82,8 +82,13 @@ bool RunScripts(const char *Cnf); bool CopyFile(FileFd &From,FileFd &To); int GetLock(string File,bool Errors = true); bool FileExists(string File); +// FIXME: next ABI-Break: merge the two method-headers std::vector GetListOfFilesInDir(string const &Dir, string const &Ext, bool const &SortList); +std::vector GetListOfFilesInDir(string const &Dir, string const &Ext, + bool const &SortList, bool const &AllowNoExt); +std::vector GetListOfFilesInDir(string const &Dir, std::vector const &Ext, + bool const &SortList); string SafeGetCWD(); void SetCloseExec(int Fd,bool Close); void SetNonBlock(int Fd,bool Block); diff --git a/apt-pkg/policy.cc b/apt-pkg/policy.cc index 393181b6d..f9901bc9a 100644 --- a/apt-pkg/policy.cc +++ b/apt-pkg/policy.cc @@ -280,7 +280,7 @@ bool ReadPinDir(pkgPolicy &Plcy,string Dir) return true; } - vector const List = GetListOfFilesInDir(Dir, "", true); + vector const List = GetListOfFilesInDir(Dir, "pref", true, true); // Read the files for (vector::const_iterator I = List.begin(); I != List.end(); I++) diff --git a/debian/changelog b/debian/changelog index ef6f846cb..caafde70c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,24 @@ apt (0.7.26) UNRELEASED; urgency=low -- Michael Vogt Thu, 10 Dec 2009 22:02:38 +0100 +apt (0.7.25.2) UNRELEASED; urgency=low + + * apt-pkg/contrib/fileutl.cc: + - Fix the newly introduced method GetListOfFilesInDir to not + accept every file if no extension is enforced + (= restore old behaviour). (Closes: #565213) + * apt-pkg/policy.cc: + - accept also partfiles with "pref" file extension as valid + * apt-pkg/contrib/configuration.cc: + - accept also partfiles with "conf" file extension as valid + * doc/apt.conf.5.xml: + - reorder description and split out syntax + - add partfile name convention (Closes: #558348) + * doc/apt_preferences.conf.5.xml: + - describe partfile name convention also here + + -- David Kalnischkies Sat, 16 Jan 2010 21:06:38 +0100 + apt (0.7.25.1) unstable; urgency=low [ Christian Perrier ] diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index e568baa35..c13ad4867 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -21,7 +21,7 @@ &apt-email; &apt-product; - 18 September 2009 + 16 January 2010 @@ -37,16 +37,27 @@ Description - apt.conf is the main configuration file for the APT suite of - tools, all tools make use of the configuration file and a common command line - parser to provide a uniform environment. When an APT tool starts up it will - read the configuration specified by the APT_CONFIG environment - variable (if any) and then read the files in Dir::Etc::Parts - then read the main configuration file specified by - Dir::Etc::main then finally apply the - command line options to override the configuration directives, possibly - loading even more config files. - + apt.conf is the main configuration file for + the APT suite of tools, but by far not the only place changes to options + can be made. All tools therefore share the configuration files and also + use a common command line parser to provide a uniform environment. + + When an APT tool starts up it will read the configuration files + in the following order: + the file specified by the APT_CONFIG + environment variable (if any) + all files in Dir::Etc::Parts in + alphanumeric ascending order which have no or "conf" + as filename extension and which only contain alphanumeric, + hyphen (-), underscore (_) and period (.) characters - + otherwise they will be silently ignored. + the main configuration file specified by + Dir::Etc::main + the command line options are applied to override the + configuration directives or to load even more configuration files. + + + Syntax The configuration file is organized in a tree with options organized into functional groups. Option specification is given with a double colon notation, for instance APT::Get::Assume-Yes is an option within diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml index 159d61f2b..9a4791c08 100644 --- a/doc/apt_preferences.5.xml +++ b/doc/apt_preferences.5.xml @@ -53,6 +53,13 @@ earliest in the &sources-list; file. The APT preferences file does not affect the choice of instance, only the choice of version. +Note that the files in the /etc/apt/preferences.d +directory are parsed in alphanumeric ascending order and need to obey the +following naming convention: The files have no or "pref" +as filename extension and which only contain alphanumeric, hyphen (-), +underscore (_) and period (.) characters - otherwise they will be silently +ignored. + APT's Default Priority Assignments If there is no preferences file or if there is no entry in the file diff --git a/test/libapt/getlistoffilesindir_test.cc b/test/libapt/getlistoffilesindir_test.cc new file mode 100644 index 000000000..ed8d2dad6 --- /dev/null +++ b/test/libapt/getlistoffilesindir_test.cc @@ -0,0 +1,82 @@ +#include + +#include "assert.h" +#include +#include + +#include +#include + +// simple helper to quickly output a vector of strings +void dumpVector(std::vector vec) { + for (std::vector::const_iterator v = vec.begin(); + v != vec.end(); v++) + std::cout << *v << std::endl; +} + +#define P(x) string(argv[1]).append("/").append(x) + +int main(int argc,char *argv[]) +{ + if (argc != 2) { + std::cout << "One parameter expected - given " << argc << std::endl; + return 100; + } + + // Files with no extension + std::vector files = GetListOfFilesInDir(argv[1], "", true); + equals(files.size(), 2); + equals(files[0], P("01yet-anothernormalfile")); + equals(files[1], P("anormalfile")); + + // Files with no extension - should be the same as above + files = GetListOfFilesInDir(argv[1], "", true, true); + equals(files.size(), 2); + equals(files[0], P("01yet-anothernormalfile")); + equals(files[1], P("anormalfile")); + + // Files with impossible extension + files = GetListOfFilesInDir(argv[1], "impossible", true); + equals(files.size(), 0); + + // Files with impossible or no extension + files = GetListOfFilesInDir(argv[1], "impossible", true, true); + equals(files.size(), 2); + equals(files[0], P("01yet-anothernormalfile")); + equals(files[1], P("anormalfile")); + + // Files with list extension - nothing more + files = GetListOfFilesInDir(argv[1], "list", true); + equals(files.size(), 4); + equals(files[0], P("01yet-anotherapt.list")); + equals(files[1], P("anormalapt.list")); + equals(files[2], P("linkedfile.list")); + equals(files[3], P("multi.dot.list")); + + // Files with conf or no extension + files = GetListOfFilesInDir(argv[1], "conf", true, true); + equals(files.size(), 5); + equals(files[0], P("01yet-anotherapt.conf")); + equals(files[1], P("01yet-anothernormalfile")); + equals(files[2], P("anormalapt.conf")); + equals(files[3], P("anormalfile")); + equals(files[4], P("multi.dot.conf")); + + // Files with disabled extension - nothing more + files = GetListOfFilesInDir(argv[1], "disabled", true); + equals(files.size(), 3); + equals(files[0], P("disabledfile.conf.disabled")); + equals(files[1], P("disabledfile.disabled")); + equals(files[2], P("disabledfile.list.disabled")); + + // Files with disabled or no extension + files = GetListOfFilesInDir(argv[1], "disabled", true, true); + equals(files.size(), 5); + equals(files[0], P("01yet-anothernormalfile")); + equals(files[1], P("anormalfile")); + equals(files[2], P("disabledfile.conf.disabled")); + equals(files[3], P("disabledfile.disabled")); + equals(files[4], P("disabledfile.list.disabled")); + + return 0; +} diff --git a/test/libapt/makefile b/test/libapt/makefile index 5712c025a..08f581e6d 100644 --- a/test/libapt/makefile +++ b/test/libapt/makefile @@ -17,3 +17,9 @@ PROGRAM = ParseDepends${BASENAME} SLIBS = -lapt-pkg SOURCE = parsedepends_test.cc include $(PROGRAM_H) + +# Program for testing GetListOfFilesInDir +PROGRAM = GetListOfFilesInDir${BASENAME} +SLIBS = -lapt-pkg +SOURCE = getlistoffilesindir_test.cc +include $(PROGRAM_H) diff --git a/test/libapt/run-tests.sh b/test/libapt/run-tests.sh index 365bbe215..1fcfb6861 100755 --- a/test/libapt/run-tests.sh +++ b/test/libapt/run-tests.sh @@ -1,10 +1,52 @@ #!/bin/sh +set -e + echo "Compiling the tests ..." make echo "Running all testcases ..." -PATH=$(pwd)/../../build/bin -for testapp in $(/bin/ls ${PATH}/*_libapt_test) +LDPATH=$(pwd)/../../build/bin +EXT="_libapt_test" +for testapp in $(ls ${LDPATH}/*$EXT) do - echo -n "Testing with \033[1;35m$(/usr/bin/basename ${testapp})\033[0m ... " - LD_LIBRARY_PATH=${PATH} ${testapp} && echo "\033[1;32mOKAY\033[0m" || echo "\033[1;31mFAILED\033[0m" + name=$(basename ${testapp}) + tmppath="" + + if [ $name = "GetListOfFilesInDir${EXT}" ]; then + # TODO: very-low: move env creation to the actual test-app + echo "Prepare Testarea for \033[1;35m$name\033[0m ..." + tmppath=$(mktemp -d) + touch "${tmppath}/anormalfile" \ + "${tmppath}/01yet-anothernormalfile" \ + "${tmppath}/anormalapt.conf" \ + "${tmppath}/01yet-anotherapt.conf" \ + "${tmppath}/anormalapt.list" \ + "${tmppath}/01yet-anotherapt.list" \ + "${tmppath}/wrongextension.wron" \ + "${tmppath}/wrong-extension.wron" \ + "${tmppath}/strangefile." \ + "${tmppath}/s.t.r.a.n.g.e.f.i.l.e" \ + "${tmppath}/.hiddenfile" \ + "${tmppath}/.hiddenfile.conf" \ + "${tmppath}/.hiddenfile.list" \ + "${tmppath}/multi..dot" \ + "${tmppath}/multi.dot.conf" \ + "${tmppath}/multi.dot.list" \ + "${tmppath}/disabledfile.disabled" \ + "${tmppath}/disabledfile.conf.disabled" \ + "${tmppath}/disabledfile.list.disabled" \ + "${tmppath}/invälid.conf" \ + "${tmppath}/invalíd" \ + "${tmppath}/01invalíd" + ln -s "${tmppath}/anormalfile" "${tmppath}/linkedfile.list" + ln -s "${tmppath}/non-existing-file" "${tmppath}/brokenlink.list" + fi + + echo -n "Testing with \033[1;35m${name}\033[0m ... " + LD_LIBRARY_PATH=${LDPATH} ${testapp} ${tmppath} && echo "\033[1;32mOKAY\033[0m" || echo "\033[1;31mFAILED\033[0m" + + if [ -n "$tmppath" -a -d "$tmppath" ]; then + echo "Cleanup Testarea after \033[1;35m$name\033[0m ..." + rm -rf "$tmppath" + fi + done -- cgit v1.2.3-70-g09d2 From 3ad676a1420f65b4de3d1742c09f6e7e3966652c Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 19 Jan 2010 13:08:01 +0100 Subject: * apt-pkg/deb/dpkgpm.cc: - don't segfault if term.log file can't be opened. Thanks Sam Brightman for the patch! (Closes: #475770) --- apt-pkg/deb/dpkgpm.cc | 7 ++++--- debian/changelog | 3 +++ 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index d1a275a47..565f01b84 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -561,15 +561,16 @@ bool pkgDPkgPM::OpenLog() if (!logfile_name.empty()) { term_out = fopen(logfile_name.c_str(),"a"); + if (term_out == NULL) + return _error->WarningE(_("Could not open file '%s'"), logfile_name.c_str()); + chmod(logfile_name.c_str(), 0600); // output current time char outstr[200]; time_t t = time(NULL); struct tm *tmp = localtime(&t); strftime(outstr, sizeof(outstr), "%F %T", tmp); - fprintf(term_out, "\nLog started: "); - fprintf(term_out, "%s", outstr); - fprintf(term_out, "\n"); + fprintf(term_out, "\nLog started: %s\n", outstr); } return true; } diff --git a/debian/changelog b/debian/changelog index 2cc256695..e699ee6c5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -35,6 +35,9 @@ apt (0.7.25.2) UNRELEASED; urgency=low - add partfile name convention (Closes: #558348) * doc/apt_preferences.conf.5.xml: - describe partfile name convention also here + * apt-pkg/deb/dpkgpm.cc: + - don't segfault if term.log file can't be opened. + Thanks Sam Brightman for the patch! (Closes: #475770) -- David Kalnischkies Sat, 16 Jan 2010 21:06:38 +0100 -- cgit v1.2.3-70-g09d2 From e29f5aee684afa04f84d8e0fe523dec72b231672 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 20 Jan 2010 13:39:37 +0100 Subject: replace the per language addendum with a global addendum and add a explanation why translations include (maybe) english parts to this new global addendum (Closes: #561636) --- debian/changelog | 4 + doc/apt.ent | 19 + doc/de/addendum/debiandoc_de.add | 6 - doc/de/addendum/xml_de.add | 6 - doc/es/addendum/xml_es.add | 9 - doc/fr/addendum/xml_fr.add | 7 - doc/ja/addendum/xml_ja.add | 7 - doc/po/apt-doc.pot | 708 +++++++------- doc/po/de.po | 749 ++++++++------- doc/po/es.po | 762 ++++++++------- doc/po/fr.po | 1880 +++++++++++++++++++++----------------- doc/po/it.po | 705 +++++++------- doc/po/ja.po | 750 ++++++++------- doc/po/pl.po | 705 +++++++------- doc/po/pt_BR.po | 710 +++++++------- doc/po4a.conf | 39 +- doc/pt_BR/addendum/xml_pt_BR.add | 5 - doc/xml.add | 5 + 18 files changed, 3947 insertions(+), 3129 deletions(-) delete mode 100644 doc/de/addendum/debiandoc_de.add delete mode 100644 doc/de/addendum/xml_de.add delete mode 100644 doc/es/addendum/xml_es.add delete mode 100644 doc/fr/addendum/xml_fr.add delete mode 100644 doc/ja/addendum/xml_ja.add delete mode 100644 doc/pt_BR/addendum/xml_pt_BR.add create mode 100644 doc/xml.add (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index e699ee6c5..588038b4c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -38,6 +38,10 @@ apt (0.7.25.2) UNRELEASED; urgency=low * apt-pkg/deb/dpkgpm.cc: - don't segfault if term.log file can't be opened. Thanks Sam Brightman for the patch! (Closes: #475770) + * doc/*: + - replace the per language addendum with a global addendum + - add a explanation why translations include (maybe) english + parts to the new global addendum (Closes: #561636) -- David Kalnischkies Sat, 16 Jan 2010 21:06:38 +0100 diff --git a/doc/apt.ent b/doc/apt.ent index da43d8f3d..c23d906e2 100644 --- a/doc/apt.ent +++ b/doc/apt.ent @@ -366,3 +366,22 @@ Configuration Item Dir::Etc::TrustedParts. "> + + + + +john@doe.org in 2009, + 2010 and Daniela Acme daniela@acme.us in 2010 together with the + Debian Dummy l10n Team debian-l10n-dummy@lists.debian.org. +"> + + + diff --git a/doc/de/addendum/debiandoc_de.add b/doc/de/addendum/debiandoc_de.add deleted file mode 100644 index 2332878a6..000000000 --- a/doc/de/addendum/debiandoc_de.add +++ /dev/null @@ -1,6 +0,0 @@ -PO4A-HEADER:mode=after;position=manbugs;beginboundary=^ - Übersetzung - Die deutsche Übersetzung wurde 2009 von Chris Leick c.leick@vollbio.de angefertigt - in Zusammenarbeit mit dem Debian German-l10n-Team debian-l10n-german@lists.debian.org. - - diff --git a/doc/de/addendum/xml_de.add b/doc/de/addendum/xml_de.add deleted file mode 100644 index 2332878a6..000000000 --- a/doc/de/addendum/xml_de.add +++ /dev/null @@ -1,6 +0,0 @@ -PO4A-HEADER:mode=after;position=manbugs;beginboundary=^ - Übersetzung - Die deutsche Übersetzung wurde 2009 von Chris Leick c.leick@vollbio.de angefertigt - in Zusammenarbeit mit dem Debian German-l10n-Team debian-l10n-german@lists.debian.org. - - diff --git a/doc/es/addendum/xml_es.add b/doc/es/addendum/xml_es.add deleted file mode 100644 index dc2b06be0..000000000 --- a/doc/es/addendum/xml_es.add +++ /dev/null @@ -1,9 +0,0 @@ -PO4A-HEADER:mode=after;position=manbugs;beginboundary=^ - Translation - The spanish translation was written 2003 and 2004 by Ismael Fanlo (2003), Carlos Mestre (2003), - Rudy Godoy rudy@kernel-panik.org (2003), - Gustavo Saldumbide gsal@adinet.com.uy (2003), - Javier Fernández-Sanguino jfs@computer.org (2003) - and Rubén Porras Campo nahoo@inicia.es (2003, 2004) - under the aegis of the debian spanish-l10n-team debian-l10n-spanish@lists.debian.org. - diff --git a/doc/fr/addendum/xml_fr.add b/doc/fr/addendum/xml_fr.add deleted file mode 100644 index 987b5b1f5..000000000 --- a/doc/fr/addendum/xml_fr.add +++ /dev/null @@ -1,7 +0,0 @@ -PO4A-HEADER:mode=after;position=manbugs;beginboundary=^ - Traducteurs - Jérôme Marant, Philippe Batailler, Christian Perrier bubulle@debian.org (2000, 2005, 2009), - Équipe de traduction francophone de Debian debian-l10n-french@lists.debian.org - - - diff --git a/doc/ja/addendum/xml_ja.add b/doc/ja/addendum/xml_ja.add deleted file mode 100644 index 05d4cff3f..000000000 --- a/doc/ja/addendum/xml_ja.add +++ /dev/null @@ -1,7 +0,0 @@ -PO4A-HEADER:mode=after;position=manbugs;beginboundary=^ - 訳者 - 倉澤 望 nabetaro@debian.or.jp (2003-2006,2009), - Debian JP Documentation ML debian-doc@debian.or.jp - - - diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index fe7c6f514..40ed1f589 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: 2010-01-11 15:12+0100\n" +"POT-Creation-Date: 2010-01-20 12:18+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -784,7 +784,7 @@ msgid "" msgstr "" #. type: Plain text -#: apt.ent:368 +#: apt.ent:369 #, no-wrap msgid "" " " @@ -798,6 +798,44 @@ msgid "" "\">\n" msgstr "" +#. type: Plain text +#: apt.ent:371 +msgid "" +msgstr "" + +#. type: Plain text +#: apt.ent:380 +#, no-wrap +msgid "" +"\n" +"john@doe.org in 2009,\n" +" 2010 and Daniela Acme daniela@acme.us in 2010 together " +"with the\n" +" Debian Dummy l10n Team " +"debian-l10n-dummy@lists.debian.org.\n" +"\">\n" +msgstr "" + +#. type: Plain text +#: apt.ent:387 +#, no-wrap +msgid "" +"\n" +"\n" +msgstr "" + #. The last update date #. type: Content of: #: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13 apt-sortpkgs.1.xml:13 sources.list.5.xml:13 @@ -1246,7 +1284,7 @@ msgid "" msgstr "" #. type: Content of: -#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89 apt-sortpkgs.1.xml:54 apt.conf.5.xml:491 apt.conf.5.xml:513 +#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89 apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524 msgid "options" msgstr "" @@ -1444,7 +1482,7 @@ msgid "&apt-commonoptions;" msgstr "" #. type: Content of: -#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122 apt.conf.5.xml:1024 apt_preferences.5.xml:615 +#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122 apt.conf.5.xml:1035 apt_preferences.5.xml:622 msgid "Files" msgstr "" @@ -1454,7 +1492,7 @@ msgid "&file-sourceslist; &file-statelists;" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569 apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 apt-sortpkgs.1.xml:69 apt.conf.5.xml:1030 apt_preferences.5.xml:622 sources.list.5.xml:233 +#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569 apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:629 sources.list.5.xml:233 msgid "See Also" msgstr "" @@ -2753,7 +2791,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1018 apt_preferences.5.xml:462 sources.list.5.xml:193 +#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1029 apt_preferences.5.xml:469 sources.list.5.xml:193 msgid "Examples" msgstr "" @@ -4266,7 +4304,7 @@ msgid "" "&apt-author.jgunthorpe; &apt-author.team; <author> " "<firstname>Daniel</firstname> <surname>Burrows</surname> <contrib>Initial " "documentation of Debug::*.</contrib> <email>dburrows@debian.org</email> " -"</author> &apt-email; &apt-product; <date>18 September 2009</date>" +"</author> &apt-email; &apt-product; <date>16 January 2010</date>" msgstr "" #. type: Content of: <refentry><refnamediv><refname> @@ -4288,18 +4326,53 @@ msgstr "" #: apt.conf.5.xml:40 msgid "" "<filename>apt.conf</filename> is the main configuration file for the APT " -"suite of tools, all tools make use of the configuration file and a common " -"command line parser to provide a uniform environment. When an APT tool " -"starts up it will read the configuration specified by the " -"<envar>APT_CONFIG</envar> environment variable (if any) and then read the " -"files in <literal>Dir::Etc::Parts</literal> then read the main configuration " -"file specified by <literal>Dir::Etc::main</literal> then finally apply the " -"command line options to override the configuration directives, possibly " -"loading even more config files." +"suite of tools, but by far not the only place changes to options can be " +"made. All tools therefore share the configuration files and also use a " +"common command line parser to provide a uniform environment." +msgstr "" + +#. type: Content of: <refentry><refsect1><orderedlist><para> +#: apt.conf.5.xml:45 +msgid "" +"When an APT tool starts up it will read the configuration files in the " +"following order:" +msgstr "" + +#. type: Content of: <refentry><refsect1><orderedlist><listitem><para> +#: apt.conf.5.xml:47 +msgid "" +"the file specified by the <envar>APT_CONFIG</envar> environment variable (if " +"any)" +msgstr "" + +#. type: Content of: <refentry><refsect1><orderedlist><listitem><para> +#: apt.conf.5.xml:49 +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." +msgstr "" + +#. type: Content of: <refentry><refsect1><orderedlist><listitem><para> +#: apt.conf.5.xml:54 +msgid "the main configuration file specified by <literal>Dir::Etc::main</literal>" +msgstr "" + +#. type: Content of: <refentry><refsect1><orderedlist><listitem><para> +#: apt.conf.5.xml:56 +msgid "" +"the command line options are applied to override the configuration " +"directives or to load even more configuration files." +msgstr "" + +#. type: Content of: <refentry><refsect1><title> +#: apt.conf.5.xml:60 +msgid "Syntax" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:50 +#: apt.conf.5.xml:61 msgid "" "The configuration file is organized in a tree with options organized into " "functional groups. Option specification is given with a double colon " @@ -4309,7 +4382,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:56 +#: apt.conf.5.xml:67 msgid "" "Syntactically the configuration language is modeled after what the ISC tools " "such as bind and dhcp use. Lines starting with <literal>//</literal> are " @@ -4325,7 +4398,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><informalexample><programlisting> -#: apt.conf.5.xml:70 +#: apt.conf.5.xml:81 #, no-wrap msgid "" "APT {\n" @@ -4337,7 +4410,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:78 +#: apt.conf.5.xml:89 msgid "" "with newlines placed to make it more readable. Lists can be created by " "opening a scope and including a single string enclosed in quotes followed by " @@ -4346,13 +4419,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><informalexample><programlisting> -#: apt.conf.5.xml:83 +#: apt.conf.5.xml:94 #, no-wrap msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:86 +#: apt.conf.5.xml:97 msgid "" "In general the sample configuration file in " "<filename>&docdir;examples/apt.conf</filename> &configureindex; is a good " @@ -4360,14 +4433,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:90 +#: apt.conf.5.xml:101 msgid "" "The names of the configuration items are not case-sensitive. So in the " "previous example you could use <literal>dpkg::pre-install-pkgs</literal>." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:93 +#: apt.conf.5.xml:104 msgid "" "Names for the configuration items are optional if a list is defined as it " "can be see in the <literal>DPkg::Pre-Install-Pkgs</literal> example " @@ -4377,7 +4450,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:98 +#: apt.conf.5.xml:109 msgid "" "Two specials are allowed, <literal>#include</literal> (which is deprecated " "and not supported by alternative implementations) and " @@ -4389,7 +4462,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:106 +#: apt.conf.5.xml:117 msgid "" "The #clear command is the only way to delete a list or a complete scope. " "Reopening a scope or the ::-style described below will " @@ -4399,7 +4472,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:111 +#: apt.conf.5.xml:122 msgid "" "All of the APT tools take a -o option which allows an arbitrary " "configuration directive to be specified on the command line. The syntax is a " @@ -4410,7 +4483,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:118 +#: apt.conf.5.xml:129 msgid "" "Note that you can use :: only for appending one item per line to a list and " "that you should not use it in combination with the scope syntax. (The scope " @@ -4427,24 +4500,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:130 +#: apt.conf.5.xml:141 msgid "The APT Group" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:131 +#: apt.conf.5.xml:142 msgid "" "This group of options controls general APT behavior as well as holding the " "options for all of the tools." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:135 +#: apt.conf.5.xml:146 msgid "Architecture" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:136 +#: apt.conf.5.xml:147 msgid "" "System Architecture; sets the architecture to use when fetching files and " "parsing package lists. The internal default is the architecture apt was " @@ -4452,12 +4525,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:141 +#: apt.conf.5.xml:152 msgid "Default-Release" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:142 +#: apt.conf.5.xml:153 msgid "" "Default release to install packages from if more than one version " "available. Contains release name, codename or release version. Examples: " @@ -4466,24 +4539,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:146 +#: apt.conf.5.xml:157 msgid "Ignore-Hold" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:147 +#: apt.conf.5.xml:158 msgid "" "Ignore Held packages; This global option causes the problem resolver to " "ignore held packages in its decision making." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:151 +#: apt.conf.5.xml:162 msgid "Clean-Installed" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:152 +#: apt.conf.5.xml:163 msgid "" "Defaults to on. When turned on the autoclean feature will remove any " "packages which can no longer be downloaded from the cache. If turned off " @@ -4492,12 +4565,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:158 +#: apt.conf.5.xml:169 msgid "Immediate-Configure" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:159 +#: apt.conf.5.xml:170 msgid "" "Defaults to on which will cause APT to install essential and important " "packages as fast as possible in the install/upgrade operation. This is done " @@ -4530,12 +4603,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:181 +#: apt.conf.5.xml:192 msgid "Force-LoopBreak" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:182 +#: apt.conf.5.xml:193 msgid "" "Never Enable this option unless you -really- know what you are doing. It " "permits APT to temporarily remove an essential package to break a " @@ -4546,82 +4619,82 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:190 +#: apt.conf.5.xml:201 msgid "Cache-Limit" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:191 +#: apt.conf.5.xml:202 msgid "" "APT uses a fixed size memory mapped cache file to store the 'available' " "information. This sets the size of that cache (in bytes)." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:195 +#: apt.conf.5.xml:206 msgid "Build-Essential" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:196 +#: apt.conf.5.xml:207 msgid "Defines which package(s) are considered essential build dependencies." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:199 +#: apt.conf.5.xml:210 msgid "Get" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:200 +#: apt.conf.5.xml:211 msgid "" "The Get subsection controls the &apt-get; tool, please see its documentation " "for more information about the options here." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:204 +#: apt.conf.5.xml:215 msgid "Cache" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:205 +#: apt.conf.5.xml:216 msgid "" "The Cache subsection controls the &apt-cache; tool, please see its " "documentation for more information about the options here." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:209 +#: apt.conf.5.xml:220 msgid "CDROM" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:210 +#: apt.conf.5.xml:221 msgid "" "The CDROM subsection controls the &apt-cdrom; tool, please see its " "documentation for more information about the options here." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:216 +#: apt.conf.5.xml:227 msgid "The Acquire Group" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:221 +#: apt.conf.5.xml:232 msgid "PDiffs" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:222 +#: apt.conf.5.xml:233 msgid "" "Try to download deltas called <literal>PDiffs</literal> for Packages or " "Sources files instead of downloading whole ones. True by default." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:225 +#: apt.conf.5.xml:236 msgid "" "Two sub-options to limit the use of PDiffs are also available: With " "<literal>FileLimit</literal> can be specified how many PDiff files are " @@ -4632,12 +4705,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:234 +#: apt.conf.5.xml:245 msgid "Queue-Mode" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:235 +#: apt.conf.5.xml:246 msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of " "<literal>host</literal> or <literal>access</literal> which determines how " @@ -4647,36 +4720,36 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:242 +#: apt.conf.5.xml:253 msgid "Retries" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:243 +#: apt.conf.5.xml:254 msgid "" "Number of retries to perform. If this is non-zero APT will retry failed " "files the given number of times." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:247 +#: apt.conf.5.xml:258 msgid "Source-Symlinks" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:248 +#: apt.conf.5.xml:259 msgid "" "Use symlinks for source archives. If set to true then source archives will " "be symlinked when possible instead of copying. True is the default." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:252 sources.list.5.xml:139 +#: apt.conf.5.xml:263 sources.list.5.xml:139 msgid "http" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:253 +#: apt.conf.5.xml:264 msgid "" "HTTP URIs; http::Proxy is the default http proxy to use. It is in the " "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per " @@ -4688,7 +4761,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:261 +#: apt.conf.5.xml:272 msgid "" "Three settings are provided for cache control with HTTP/1.1 compliant proxy " "caches. <literal>No-Cache</literal> tells the proxy to not use its cached " @@ -4702,7 +4775,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:271 apt.conf.5.xml:335 +#: apt.conf.5.xml:282 apt.conf.5.xml:346 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method, this applies to all things including connection timeout and data " @@ -4710,7 +4783,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:274 +#: apt.conf.5.xml:285 msgid "" "One setting is provided to control the pipeline depth in cases where the " "remote server is not RFC conforming or buggy (such as Squid 2.0.2). " @@ -4722,7 +4795,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:282 +#: apt.conf.5.xml:293 msgid "" "The used bandwidth can be limited with " "<literal>Acquire::http::Dl-Limit</literal> which accepts integer values in " @@ -4732,7 +4805,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:287 +#: apt.conf.5.xml:298 msgid "" "<literal>Acquire::http::User-Agent</literal> can be used to set a different " "User-Agent for the http download method as some proxies allow access for " @@ -4740,12 +4813,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:293 +#: apt.conf.5.xml:304 msgid "https" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:294 +#: apt.conf.5.xml:305 msgid "" "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy " "options are the same as for <literal>http</literal> method and will also " @@ -4755,7 +4828,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:300 +#: apt.conf.5.xml:311 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is " @@ -4777,12 +4850,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:318 sources.list.5.xml:150 +#: apt.conf.5.xml:329 sources.list.5.xml:150 msgid "ftp" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:319 +#: apt.conf.5.xml:330 msgid "" "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard " "form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host " @@ -4802,7 +4875,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:338 +#: apt.conf.5.xml:349 msgid "" "Several settings are provided to control passive mode. Generally it is safe " "to leave passive mode on, it works in nearly every environment. However " @@ -4812,7 +4885,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:345 +#: apt.conf.5.xml:356 msgid "" "It is possible to proxy FTP over HTTP by setting the " "<envar>ftp_proxy</envar> environment variable to a http url - see the " @@ -4822,7 +4895,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:350 +#: apt.conf.5.xml:361 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@ -4832,18 +4905,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:357 sources.list.5.xml:132 +#: apt.conf.5.xml:368 sources.list.5.xml:132 msgid "cdrom" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:363 +#: apt.conf.5.xml:374 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:358 +#: apt.conf.5.xml:369 msgid "" "CDROM URIs; the only setting for CDROM URIs is the mount point, " "<literal>cdrom::Mount</literal> which must be the mount point for the CDROM " @@ -4856,12 +4929,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:368 +#: apt.conf.5.xml:379 msgid "gpgv" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:369 +#: apt.conf.5.xml:380 msgid "" "GPGV URIs; the only option for GPGV URIs is the option to pass additional " "parameters to gpgv. <literal>gpgv::Options</literal> Additional options " @@ -4869,12 +4942,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:374 +#: apt.conf.5.xml:385 msgid "CompressionTypes" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:380 +#: apt.conf.5.xml:391 #, no-wrap msgid "" "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> " @@ -4882,7 +4955,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:375 +#: apt.conf.5.xml:386 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@ -4894,19 +4967,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:385 +#: apt.conf.5.xml:396 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:388 +#: apt.conf.5.xml:399 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:381 +#: apt.conf.5.xml:392 msgid "" "Also the <literal>Order</literal> subgroup can be used to define in which " "order the acquire system will try to download the compressed files. The " @@ -4923,13 +4996,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:392 +#: apt.conf.5.xml:403 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:390 +#: apt.conf.5.xml:401 msgid "" "Note that at run time the " "<literal>Dir::Bin::<replaceable>Methodname</replaceable></literal> will be " @@ -4944,7 +5017,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:397 +#: apt.conf.5.xml:408 msgid "" "While it is possible to add an empty compression type to the order list, but " "APT in its current version doesn't understand it correctly and will display " @@ -4954,12 +5027,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:403 +#: apt.conf.5.xml:414 msgid "Languages" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:404 +#: apt.conf.5.xml:415 msgid "" "The Languages subsection controls which <filename>Translation</filename> " "files are downloaded and in which order APT tries to display the " @@ -4972,13 +5045,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting> -#: apt.conf.5.xml:420 +#: apt.conf.5.xml:431 #, no-wrap msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:410 +#: apt.conf.5.xml:421 msgid "" "The default list includes \"environment\" and " "\"en\". \"<literal>environment</literal>\" has a special meaning here: It " @@ -5001,7 +5074,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:217 +#: apt.conf.5.xml:228 msgid "" "The <literal>Acquire</literal> group of options controls the download of " "packages and the URI handlers. <placeholder type=\"variablelist\" " @@ -5009,12 +5082,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:427 +#: apt.conf.5.xml:438 msgid "Directories" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:429 +#: apt.conf.5.xml:440 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@ -5026,7 +5099,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:436 +#: apt.conf.5.xml:447 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@ -5039,7 +5112,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:445 +#: apt.conf.5.xml:456 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@ -5049,7 +5122,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:451 +#: apt.conf.5.xml:462 msgid "" "The <literal>Dir::Parts</literal> setting reads in all the config fragments " "in lexical order from the directory specified. After this is done then the " @@ -5057,7 +5130,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:455 +#: apt.conf.5.xml:466 msgid "" "Binary programs are pointed to by " "<literal>Dir::Bin</literal>. <literal>Dir::Bin::Methods</literal> specifies " @@ -5069,7 +5142,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:463 +#: apt.conf.5.xml:474 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@ -5082,12 +5155,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:476 +#: apt.conf.5.xml:487 msgid "APT in DSelect" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:478 +#: apt.conf.5.xml:489 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behaviour. These are in the <literal>DSelect</literal> " @@ -5095,12 +5168,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:482 +#: apt.conf.5.xml:493 msgid "Clean" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:483 +#: apt.conf.5.xml:494 msgid "" "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto " "and never. always and prompt will remove all packages from the cache after " @@ -5111,50 +5184,50 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:492 +#: apt.conf.5.xml:503 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the install phase." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:496 +#: apt.conf.5.xml:507 msgid "Updateoptions" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:497 +#: apt.conf.5.xml:508 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the update phase." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:501 +#: apt.conf.5.xml:512 msgid "PromptAfterUpdate" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:502 +#: apt.conf.5.xml:513 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:508 +#: apt.conf.5.xml:519 msgid "How APT calls dpkg" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:509 +#: apt.conf.5.xml:520 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:514 +#: apt.conf.5.xml:525 msgid "" "This is a list of options to pass to dpkg. The options must be specified " "using the list notation and each list item is passed as a single argument to " @@ -5162,17 +5235,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:519 +#: apt.conf.5.xml:530 msgid "Pre-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:519 +#: apt.conf.5.xml:530 msgid "Post-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:520 +#: apt.conf.5.xml:531 msgid "" "This is a list of shell commands to run before/after invoking &dpkg;. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -5181,12 +5254,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:526 +#: apt.conf.5.xml:537 msgid "Pre-Install-Pkgs" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:527 +#: apt.conf.5.xml:538 msgid "" "This is a list of shell commands to run before invoking dpkg. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -5196,7 +5269,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:533 +#: apt.conf.5.xml:544 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@ -5207,36 +5280,36 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:540 +#: apt.conf.5.xml:551 msgid "Run-Directory" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:541 +#: apt.conf.5.xml:552 msgid "" "APT chdirs to this directory before invoking dpkg, the default is " "<filename>/</filename>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:545 +#: apt.conf.5.xml:556 msgid "Build-options" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:546 +#: apt.conf.5.xml:557 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages, the " "default is to disable signing and produce all binaries." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt.conf.5.xml:551 +#: apt.conf.5.xml:562 msgid "dpkg trigger usage (and related options)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:552 +#: apt.conf.5.xml:563 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 " @@ -5251,7 +5324,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:567 +#: apt.conf.5.xml:578 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@ -5261,7 +5334,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:561 +#: apt.conf.5.xml:572 msgid "" "Note that it is not guaranteed that APT will support these options or that " "these options will not cause (big) trouble in the future. If you have " @@ -5275,12 +5348,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:573 +#: apt.conf.5.xml:584 msgid "DPkg::NoTriggers" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:574 +#: apt.conf.5.xml:585 msgid "" "Add the no triggers flag to all dpkg calls (except the ConfigurePending " "call). See &dpkg; if you are interested in what this actually means. In " @@ -5292,12 +5365,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:581 +#: apt.conf.5.xml:592 msgid "PackageManager::Configure" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:582 +#: apt.conf.5.xml:593 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@ -5314,12 +5387,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:592 +#: apt.conf.5.xml:603 msgid "DPkg::ConfigurePending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:593 +#: apt.conf.5.xml:604 msgid "" "If this option is set apt will call <command>dpkg --configure " "--pending</command> to let dpkg handle all required configurations and " @@ -5331,12 +5404,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:599 +#: apt.conf.5.xml:610 msgid "DPkg::TriggersPending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:600 +#: apt.conf.5.xml:611 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@ -5346,12 +5419,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:605 +#: apt.conf.5.xml:616 msgid "PackageManager::UnpackAll" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:606 +#: apt.conf.5.xml:617 msgid "" "As the configuration can be deferred to be done at the end by dpkg it can be " "tried to order the unpack series only by critical needs, e.g. by " @@ -5363,12 +5436,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:613 +#: apt.conf.5.xml:624 msgid "OrderList::Score::Immediate" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:621 +#: apt.conf.5.xml:632 #, no-wrap msgid "" "OrderList::Score {\n" @@ -5380,7 +5453,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:614 +#: apt.conf.5.xml:625 msgid "" "Essential packages (and there dependencies) should be configured immediately " "after unpacking. It will be a good idea to do this quite early in the " @@ -5394,12 +5467,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:634 +#: apt.conf.5.xml:645 msgid "Periodic and Archives options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:635 +#: apt.conf.5.xml:646 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@ -5408,12 +5481,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:643 +#: apt.conf.5.xml:654 msgid "Debug options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:645 +#: apt.conf.5.xml:656 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -5424,7 +5497,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:656 +#: apt.conf.5.xml:667 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, " @@ -5432,7 +5505,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:664 +#: apt.conf.5.xml:675 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s " @@ -5440,7 +5513,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:673 +#: apt.conf.5.xml:684 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -5450,110 +5523,110 @@ msgstr "" #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:681 +#: apt.conf.5.xml:692 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CDROM IDs." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:691 +#: apt.conf.5.xml:702 msgid "A full list of debugging options to apt follows." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:696 +#: apt.conf.5.xml:707 msgid "<literal>Debug::Acquire::cdrom</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:700 +#: apt.conf.5.xml:711 msgid "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:707 +#: apt.conf.5.xml:718 msgid "<literal>Debug::Acquire::ftp</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:711 +#: apt.conf.5.xml:722 msgid "Print information related to downloading packages using FTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:718 +#: apt.conf.5.xml:729 msgid "<literal>Debug::Acquire::http</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:722 +#: apt.conf.5.xml:733 msgid "Print information related to downloading packages using HTTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:729 +#: apt.conf.5.xml:740 msgid "<literal>Debug::Acquire::https</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:733 +#: apt.conf.5.xml:744 msgid "Print information related to downloading packages using HTTPS." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:740 +#: apt.conf.5.xml:751 msgid "<literal>Debug::Acquire::gpgv</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:744 +#: apt.conf.5.xml:755 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:751 +#: apt.conf.5.xml:762 msgid "<literal>Debug::aptcdrom</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:755 +#: apt.conf.5.xml:766 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:762 +#: apt.conf.5.xml:773 msgid "<literal>Debug::BuildDeps</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:765 +#: apt.conf.5.xml:776 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:772 +#: apt.conf.5.xml:783 msgid "<literal>Debug::Hashes</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:775 +#: apt.conf.5.xml:786 msgid "" "Output each cryptographic hash that is generated by the " "<literal>apt</literal> libraries." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:782 +#: apt.conf.5.xml:793 msgid "<literal>Debug::IdentCDROM</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:785 +#: apt.conf.5.xml:796 msgid "" "Do not include information from <literal>statfs</literal>, namely the number " "of used and free blocks on the CD-ROM filesystem, when generating an ID for " @@ -5561,92 +5634,92 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:793 +#: apt.conf.5.xml:804 msgid "<literal>Debug::NoLocking</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:796 +#: apt.conf.5.xml:807 msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:804 +#: apt.conf.5.xml:815 msgid "<literal>Debug::pkgAcquire</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:808 +#: apt.conf.5.xml:819 msgid "Log when items are added to or removed from the global download queue." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:815 +#: apt.conf.5.xml:826 msgid "<literal>Debug::pkgAcquire::Auth</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:818 +#: apt.conf.5.xml:829 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:825 +#: apt.conf.5.xml:836 msgid "<literal>Debug::pkgAcquire::Diffs</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:828 +#: apt.conf.5.xml:839 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:836 +#: apt.conf.5.xml:847 msgid "<literal>Debug::pkgAcquire::RRed</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:840 +#: apt.conf.5.xml:851 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:847 +#: apt.conf.5.xml:858 msgid "<literal>Debug::pkgAcquire::Worker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:851 +#: apt.conf.5.xml:862 msgid "Log all interactions with the sub-processes that actually perform downloads." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:858 +#: apt.conf.5.xml:869 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:862 +#: apt.conf.5.xml:873 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:869 +#: apt.conf.5.xml:880 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:872 +#: apt.conf.5.xml:883 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial " @@ -5656,12 +5729,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:883 +#: apt.conf.5.xml:894 msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:886 +#: apt.conf.5.xml:897 msgid "" "Generate debug messages describing which package is marked as " "keep/install/remove while the ProblemResolver does his work. Each addition " @@ -5679,90 +5752,90 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:905 +#: apt.conf.5.xml:916 msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:908 +#: apt.conf.5.xml:919 msgid "Dump the default configuration to standard error on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:915 +#: apt.conf.5.xml:926 msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:918 +#: apt.conf.5.xml:929 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:926 +#: apt.conf.5.xml:937 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:929 +#: apt.conf.5.xml:940 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:936 +#: apt.conf.5.xml:947 msgid "<literal>Debug::pkgOrderList</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:940 +#: apt.conf.5.xml:951 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:948 +#: apt.conf.5.xml:959 msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:952 +#: apt.conf.5.xml:963 msgid "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:959 +#: apt.conf.5.xml:970 msgid "<literal>Debug::pkgPolicy</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:963 +#: apt.conf.5.xml:974 msgid "Output the priority of each package list on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:969 +#: apt.conf.5.xml:980 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:973 +#: apt.conf.5.xml:984 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:981 +#: apt.conf.5.xml:992 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:984 +#: apt.conf.5.xml:995 msgid "" "Display a list of all installed packages with their calculated score used by " "the pkgProblemResolver. The description of the package is the same as " @@ -5770,32 +5843,32 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:992 +#: apt.conf.5.xml:1003 msgid "<literal>Debug::sourceList</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:996 +#: apt.conf.5.xml:1007 msgid "" "Print information about the vendors read from " "<filename>/etc/apt/vendors.list</filename>." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1019 +#: apt.conf.5.xml:1030 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt.conf.5.xml:1026 +#: apt.conf.5.xml:1037 msgid "&file-aptconf;" msgstr "" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1031 +#: apt.conf.5.xml:1042 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "" @@ -5847,13 +5920,24 @@ msgid "" "choice of instance, only the choice of version." msgstr "" -#. type: Content of: <refentry><refsect1><refsect2><title> +#. type: Content of: <refentry><refsect1><para> #: apt_preferences.5.xml:56 +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." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt_preferences.5.xml:63 msgid "APT's Default Priority Assignments" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:71 +#: apt_preferences.5.xml:78 #, no-wrap msgid "" "<command>apt-get install -t testing " @@ -5861,13 +5945,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:74 +#: apt_preferences.5.xml:81 #, no-wrap msgid "APT::Default-Release \"stable\";\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:58 +#: apt_preferences.5.xml:65 msgid "" "If there is no preferences file or if there is no entry in the file that " "applies to a particular version then the priority assigned to that version " @@ -5884,39 +5968,39 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:83 +#: apt_preferences.5.xml:90 msgid "priority 100" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:84 +#: apt_preferences.5.xml:91 msgid "to the version that is already installed (if any)." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:88 +#: apt_preferences.5.xml:95 msgid "priority 500" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:89 +#: apt_preferences.5.xml:96 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:93 +#: apt_preferences.5.xml:100 msgid "priority 990" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:94 +#: apt_preferences.5.xml:101 msgid "to the versions that are not installed and belong to the target release." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:78 +#: apt_preferences.5.xml:85 msgid "" "If the target release has been specified then APT uses the following " "algorithm to set the priorities of the versions of a package. Assign: " @@ -5924,7 +6008,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:99 +#: apt_preferences.5.xml:106 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 " @@ -5932,14 +6016,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:103 +#: apt_preferences.5.xml:110 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:106 +#: apt_preferences.5.xml:113 msgid "" "Never downgrade unless the priority of an available version exceeds 1000. " "(\"Downgrading\" is installing a less recent version of a package in place " @@ -5949,19 +6033,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:112 +#: apt_preferences.5.xml:119 msgid "Install the highest priority version." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:113 +#: apt_preferences.5.xml:120 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:116 +#: apt_preferences.5.xml:123 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 " @@ -5969,7 +6053,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:122 +#: apt_preferences.5.xml:129 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 " @@ -5980,7 +6064,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:129 +#: apt_preferences.5.xml:136 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 " @@ -5990,7 +6074,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:134 +#: apt_preferences.5.xml:141 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 " @@ -6002,12 +6086,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:143 +#: apt_preferences.5.xml:150 msgid "The Effect of APT Preferences" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:145 +#: apt_preferences.5.xml:152 msgid "" "The APT preferences file allows the system administrator to control the " "assignment of priorities. The file consists of one or more multi-line " @@ -6016,7 +6100,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:151 +#: apt_preferences.5.xml:158 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 " @@ -6026,7 +6110,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:158 +#: apt_preferences.5.xml:165 #, no-wrap msgid "" "Package: perl\n" @@ -6035,7 +6119,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:164 +#: apt_preferences.5.xml:171 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 " @@ -6045,7 +6129,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:170 +#: apt_preferences.5.xml:177 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 " @@ -6053,7 +6137,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:175 +#: apt_preferences.5.xml:182 #, no-wrap msgid "" "Package: *\n" @@ -6062,7 +6146,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:180 +#: apt_preferences.5.xml:187 msgid "" "A note of caution: the keyword used here is \"<literal>origin</literal>\". " "This should not be confused with the Origin of a distribution as specified " @@ -6072,7 +6156,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:186 +#: apt_preferences.5.xml:193 msgid "" "The following record assigns a low priority to all package versions " "belonging to any distribution whose Archive name is " @@ -6080,7 +6164,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:190 +#: apt_preferences.5.xml:197 #, no-wrap msgid "" "Package: *\n" @@ -6089,7 +6173,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:195 +#: apt_preferences.5.xml:202 msgid "" "The following record assigns a high priority to all package versions " "belonging to any distribution whose Codename is " @@ -6097,7 +6181,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:199 +#: apt_preferences.5.xml:206 #, no-wrap msgid "" "Package: *\n" @@ -6106,7 +6190,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:204 +#: apt_preferences.5.xml:211 msgid "" "The following record assigns a high priority to all package versions " "belonging to any release whose Archive name is \"<literal>stable</literal>\" " @@ -6114,7 +6198,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:209 +#: apt_preferences.5.xml:216 #, no-wrap msgid "" "Package: *\n" @@ -6123,82 +6207,82 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:220 +#: apt_preferences.5.xml:227 msgid "How APT Interprets Priorities" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:228 +#: apt_preferences.5.xml:235 msgid "P > 1000" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:229 +#: apt_preferences.5.xml:236 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:233 +#: apt_preferences.5.xml:240 msgid "990 < P <=1000" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:234 +#: apt_preferences.5.xml:241 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:239 +#: apt_preferences.5.xml:246 msgid "500 < P <=990" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:240 +#: apt_preferences.5.xml:247 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:245 +#: apt_preferences.5.xml:252 msgid "100 < P <=500" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:246 +#: apt_preferences.5.xml:253 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:251 +#: apt_preferences.5.xml:258 msgid "0 < P <=100" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:252 +#: apt_preferences.5.xml:259 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:256 +#: apt_preferences.5.xml:263 msgid "P < 0" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:257 +#: apt_preferences.5.xml:264 msgid "prevents the version from being installed" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:223 +#: apt_preferences.5.xml:230 msgid "" "Priorities (P) assigned in the APT preferences file must be positive or " "negative integers. They are interpreted as follows (roughly speaking): " @@ -6206,7 +6290,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:262 +#: apt_preferences.5.xml:269 msgid "" "If any specific-form records match an available package version then the " "first such record determines the priority of the package version. Failing " @@ -6215,14 +6299,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:268 +#: apt_preferences.5.xml:275 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:272 +#: apt_preferences.5.xml:279 #, no-wrap msgid "" "Package: perl\n" @@ -6239,12 +6323,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:285 +#: apt_preferences.5.xml:292 msgid "Then:" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:287 +#: apt_preferences.5.xml:294 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 " @@ -6254,7 +6338,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:292 +#: apt_preferences.5.xml:299 msgid "" "A version of any package other than <literal>perl</literal> that is " "available from the local system has priority over other versions, even " @@ -6262,7 +6346,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:296 +#: apt_preferences.5.xml:303 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 " @@ -6271,12 +6355,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:306 +#: apt_preferences.5.xml:313 msgid "Determination of Package Version and Distribution Properties" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:308 +#: apt_preferences.5.xml:315 msgid "" "The locations listed in the &sources-list; file should provide " "<filename>Packages</filename> and <filename>Release</filename> files to " @@ -6284,27 +6368,27 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:320 +#: apt_preferences.5.xml:327 msgid "the <literal>Package:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:321 +#: apt_preferences.5.xml:328 msgid "gives the package name" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:324 apt_preferences.5.xml:374 +#: apt_preferences.5.xml:331 apt_preferences.5.xml:381 msgid "the <literal>Version:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:325 +#: apt_preferences.5.xml:332 msgid "gives the version number for the named package" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:312 +#: apt_preferences.5.xml:319 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>: " @@ -6316,12 +6400,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:341 +#: apt_preferences.5.xml:348 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:342 +#: apt_preferences.5.xml:349 msgid "" "names the archive to which all the packages in the directory tree belong. " "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies " @@ -6332,18 +6416,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:352 +#: apt_preferences.5.xml:359 #, no-wrap msgid "Pin: release a=stable\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:358 +#: apt_preferences.5.xml:365 msgid "the <literal>Codename:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:359 +#: apt_preferences.5.xml:366 msgid "" "names the codename to which all the packages in the directory tree belong. " "For example, the line \"Codename: squeeze\" specifies that all of the " @@ -6354,13 +6438,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:368 +#: apt_preferences.5.xml:375 #, no-wrap msgid "Pin: release n=squeeze\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:375 +#: apt_preferences.5.xml:382 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 " @@ -6371,7 +6455,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:384 +#: apt_preferences.5.xml:391 #, no-wrap msgid "" "Pin: release v=3.0\n" @@ -6380,12 +6464,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:393 +#: apt_preferences.5.xml:400 msgid "the <literal>Component:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:394 +#: apt_preferences.5.xml:401 msgid "" "names the licensing component associated with the packages in the directory " "tree of the <filename>Release</filename> file. For example, the line " @@ -6397,18 +6481,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:403 +#: apt_preferences.5.xml:410 #, no-wrap msgid "Pin: release c=main\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:409 +#: apt_preferences.5.xml:416 msgid "the <literal>Origin:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:410 +#: apt_preferences.5.xml:417 msgid "" "names the originator of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is " @@ -6417,18 +6501,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:416 +#: apt_preferences.5.xml:423 #, no-wrap msgid "Pin: release o=Debian\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:422 +#: apt_preferences.5.xml:429 msgid "the <literal>Label:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:423 +#: apt_preferences.5.xml:430 msgid "" "names the label of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is " @@ -6437,13 +6521,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:429 +#: apt_preferences.5.xml:436 #, no-wrap msgid "Pin: release l=Debian\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:330 +#: apt_preferences.5.xml:337 msgid "" "The <filename>Release</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for " @@ -6457,7 +6541,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:436 +#: apt_preferences.5.xml:443 msgid "" "All of the <filename>Packages</filename> and <filename>Release</filename> " "files retrieved from locations listed in the &sources-list; file are stored " @@ -6472,12 +6556,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:449 +#: apt_preferences.5.xml:456 msgid "Optional Lines in an APT Preferences Record" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:451 +#: apt_preferences.5.xml:458 msgid "" "Each record in the APT preferences file can optionally begin with one or " "more lines beginning with the word <literal>Explanation:</literal>. This " @@ -6485,7 +6569,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:455 +#: apt_preferences.5.xml:462 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 value " @@ -6494,12 +6578,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:464 +#: apt_preferences.5.xml:471 msgid "Tracking Stable" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:472 +#: apt_preferences.5.xml:479 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated\n" @@ -6514,7 +6598,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:466 +#: apt_preferences.5.xml:473 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 " @@ -6524,7 +6608,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:489 apt_preferences.5.xml:535 apt_preferences.5.xml:593 +#: apt_preferences.5.xml:496 apt_preferences.5.xml:542 apt_preferences.5.xml:600 #, no-wrap msgid "" "apt-get install <replaceable>package-name</replaceable>\n" @@ -6533,7 +6617,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:484 +#: apt_preferences.5.xml:491 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 " @@ -6542,13 +6626,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:501 +#: apt_preferences.5.xml:508 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/testing\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:495 +#: apt_preferences.5.xml:502 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>testing</literal> distribution; the package " @@ -6557,12 +6641,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:507 +#: apt_preferences.5.xml:514 msgid "Tracking Testing or Unstable" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:516 +#: apt_preferences.5.xml:523 #, no-wrap msgid "" "Package: *\n" @@ -6579,7 +6663,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:509 +#: apt_preferences.5.xml:516 msgid "" "The following APT preferences file will cause APT to assign a high priority " "to package versions from the <literal>testing</literal> distribution, a " @@ -6590,7 +6674,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:530 +#: apt_preferences.5.xml:537 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 " @@ -6599,13 +6683,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:550 +#: apt_preferences.5.xml:557 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/unstable\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:541 +#: apt_preferences.5.xml:548 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>unstable</literal> distribution. " @@ -6617,12 +6701,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:557 +#: apt_preferences.5.xml:564 msgid "Tracking the evolution of a codename release" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:571 +#: apt_preferences.5.xml:578 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated package " @@ -6644,7 +6728,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:559 +#: apt_preferences.5.xml:566 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 " @@ -6659,7 +6743,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:588 +#: apt_preferences.5.xml:595 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 " @@ -6668,13 +6752,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:608 +#: apt_preferences.5.xml:615 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/sid\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:599 +#: apt_preferences.5.xml:606 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>sid</literal> distribution. Thereafter, " @@ -6686,12 +6770,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt_preferences.5.xml:617 +#: apt_preferences.5.xml:624 msgid "&file-preferences;" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt_preferences.5.xml:623 +#: apt_preferences.5.xml:630 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;" msgstr "" diff --git a/doc/po/de.po b/doc/po/de.po index 5212de908..f9d374a6d 100644 --- a/doc/po/de.po +++ b/doc/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 0.7.24\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2010-01-11 15:12+0100\n" +"POT-Creation-Date: 2010-01-20 12:18+0100\n" "PO-Revision-Date: 2009-12-31 17:41+GMT\n" "Last-Translator: Chris Leick <c.leick@vollbio.de>\n" "Language-Team: German <debian-l10n-german@lists.debian.org>\n" @@ -1074,7 +1074,7 @@ msgstr "" " </varlistentry>\n" #. type: Plain text -#: apt.ent:368 +#: apt.ent:369 #, fuzzy, no-wrap #| msgid "" #| " <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n" @@ -1096,6 +1096,42 @@ msgstr "" " </varlistentry>\n" "\">\n" +#. type: Plain text +#: apt.ent:371 +msgid "<!ENTITY translation-title \"TRANSLATION\">" +msgstr "<!ENTITY translation-title \"Übersetzung\">" + +#. type: Plain text +#: apt.ent:380 +#, no-wrap +msgid "" +"<!-- TRANSLATOR: This is a placeholder. You should write here who has constributed\n" +" to the translation in the past, who is responsible now and maybe further information\n" +" specially related to your translation. -->\n" +"<!ENTITY translation-holder \"\n" +" The english translation was done by John Doe <email>john@doe.org</email> in 2009,\n" +" 2010 and Daniela Acme <email>daniela@acme.us</email> in 2010 together with the\n" +" Debian Dummy l10n Team <email>debian-l10n-dummy@lists.debian.org</email>.\n" +"\">\n" +msgstr "" +"<!ENTITY translation-holder \"\n" +" Die deutsche Übersetzung wurde 2009 von Chris Leick <email>c.leick@vollbio.de</email> angefertigt\n" +" in Zusammenarbeit mit dem Debian German-l10n-Team <email>debian-l10n-german@lists.debian.org</email>.\n" +"\">\n" + +#. type: Plain text +#: apt.ent:387 +#, no-wrap +msgid "" +"<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n" +" in a shipped manpage will maybe appear english parts. -->\n" +"<!ENTITY translation-english \"\n" +" Note that this translated document may contain untranslated parts.\n" +" This is done on purpose, to avoid losing content when the\n" +" translation is lagging behind the original content.\n" +"\">\n" +msgstr "" + #. The last update date #. type: Content of: <refentry><refentryinfo> #: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13 @@ -1715,7 +1751,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 #: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89 -#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:491 apt.conf.5.xml:513 +#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524 msgid "options" msgstr "Optionen" @@ -1958,7 +1994,7 @@ msgstr "&apt-commonoptions;" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122 -#: apt.conf.5.xml:1024 apt_preferences.5.xml:615 +#: apt.conf.5.xml:1035 apt_preferences.5.xml:622 msgid "Files" msgstr "Dateien" @@ -1971,7 +2007,7 @@ msgstr "&file-sourceslist; &file-statelists;" #: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 #: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569 #: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 -#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1030 apt_preferences.5.xml:622 +#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:629 #: sources.list.5.xml:233 msgid "See Also" msgstr "Siehe auch" @@ -3625,7 +3661,7 @@ msgstr "" "Dateien mit <command>apt-ftparchive</command> zu erstellen." #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1018 apt_preferences.5.xml:462 +#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1029 apt_preferences.5.xml:469 #: sources.list.5.xml:193 msgid "Examples" msgstr "Beispiele" @@ -5645,11 +5681,17 @@ msgstr "" #. The last update date #. type: Content of: <refentry><refentryinfo> #: apt.conf.5.xml:13 +#, fuzzy +#| msgid "" +#| "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</" +#| "firstname> <surname>Burrows</surname> <contrib>Initial documentation of " +#| "Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-" +#| "email; &apt-product; <date>18 September 2009</date>" msgid "" "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</" "firstname> <surname>Burrows</surname> <contrib>Initial documentation of " "Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-email; " -"&apt-product; <date>18 September 2009</date>" +"&apt-product; <date>16 January 2010</date>" msgstr "" "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</" "firstname> <surname>Burrows</surname> <contrib>Erste Dokumentation von " @@ -5675,28 +5717,54 @@ msgstr "Konfigurationsdatei für APT" #: apt.conf.5.xml:40 msgid "" "<filename>apt.conf</filename> is the main configuration file for the APT " -"suite of tools, all tools make use of the configuration file and a common " -"command line parser to provide a uniform environment. When an APT tool " -"starts up it will read the configuration specified by the <envar>APT_CONFIG</" -"envar> environment variable (if any) and then read the files in " -"<literal>Dir::Etc::Parts</literal> then read the main configuration file " -"specified by <literal>Dir::Etc::main</literal> then finally apply the " -"command line options to override the configuration directives, possibly " -"loading even more config files." -msgstr "" -"<filename>apt.conf</filename> ist die Hauptkonfigurationsdatei für die APT-" -"Werkzeugsammlung. Alle Werkzeuge benutzen die Konfigurationsdatei und einen " -"gemeinsamen Befehlszeilenauswerter, um eine einheitliche Umgebung " -"bereitzustellen. Wenn ein APT-Werkzeug startet, liest es die in der " -"Umgebungsvariablen <envar>APT_CONFIG</envar> (falls vorhanden) angegebene " -"Konfiguration, dann die Dateien in <literal>Dir::Etc::Parts</literal>, dann " -"die durch <literal>Dir::Etc::main</literal> angegebene Konfigurationsdatei " -"und übernimmt am Ende die Befehlszeilenoptionen, um Konfigurationsdirektiven " -"zu überschreiben und möglicherweise sogar weitere Konfigurationsdateien zu " -"laden." +"suite of tools, but by far not the only place changes to options can be " +"made. All tools therefore share the configuration files and also use a " +"common command line parser to provide a uniform environment." +msgstr "" + +#. type: Content of: <refentry><refsect1><orderedlist><para> +#: apt.conf.5.xml:45 +msgid "" +"When an APT tool starts up it will read the configuration files in the " +"following order:" +msgstr "" + +#. type: Content of: <refentry><refsect1><orderedlist><listitem><para> +#: apt.conf.5.xml:47 +msgid "" +"the file specified by the <envar>APT_CONFIG</envar> environment variable (if " +"any)" +msgstr "" + +#. type: Content of: <refentry><refsect1><orderedlist><listitem><para> +#: apt.conf.5.xml:49 +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." +msgstr "" + +#. type: Content of: <refentry><refsect1><orderedlist><listitem><para> +#: apt.conf.5.xml:54 +msgid "" +"the main configuration file specified by <literal>Dir::Etc::main</literal>" +msgstr "" + +#. type: Content of: <refentry><refsect1><orderedlist><listitem><para> +#: apt.conf.5.xml:56 +msgid "" +"the command line options are applied to override the configuration " +"directives or to load even more configuration files." +msgstr "" + +#. type: Content of: <refentry><refsect1><title> +#: apt.conf.5.xml:60 +msgid "Syntax" +msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:50 +#: apt.conf.5.xml:61 msgid "" "The configuration file is organized in a tree with options organized into " "functional groups. Option specification is given with a double colon " @@ -5711,7 +5779,7 @@ msgstr "" "das Werkzeug Get. Optionen werden nicht von ihren Elterngruppe geerbt." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:56 +#: apt.conf.5.xml:67 msgid "" "Syntactically the configuration language is modeled after what the ISC tools " "such as bind and dhcp use. Lines starting with <literal>//</literal> are " @@ -5740,7 +5808,7 @@ msgstr "" "geschweiften Klammern geöffnet werden, wie:" #. type: Content of: <refentry><refsect1><informalexample><programlisting> -#: apt.conf.5.xml:70 +#: apt.conf.5.xml:81 #, no-wrap msgid "" "APT {\n" @@ -5758,7 +5826,7 @@ msgstr "" "};\n" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:78 +#: apt.conf.5.xml:89 msgid "" "with newlines placed to make it more readable. Lists can be created by " "opening a scope and including a single string enclosed in quotes followed by " @@ -5771,13 +5839,13 @@ msgstr "" "jeweils getrennt durch ein Semikolon." #. type: Content of: <refentry><refsect1><informalexample><programlisting> -#: apt.conf.5.xml:83 +#: apt.conf.5.xml:94 #, no-wrap msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n" msgstr "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:86 +#: apt.conf.5.xml:97 msgid "" "In general the sample configuration file in <filename>&docdir;examples/apt." "conf</filename> &configureindex; is a good guide for how it should look." @@ -5787,7 +5855,7 @@ msgstr "" "aussehen könnte." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:90 +#: apt.conf.5.xml:101 msgid "" "The names of the configuration items are not case-sensitive. So in the " "previous example you could use <literal>dpkg::pre-install-pkgs</literal>." @@ -5797,7 +5865,7 @@ msgstr "" "<literal>dpkg::pre-install-pkgs</literal> benutzen." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:93 +#: apt.conf.5.xml:104 msgid "" "Names for the configuration items are optional if a list is defined as it " "can be see in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. " @@ -5813,7 +5881,7 @@ msgstr "" "überschreiben, indem Sie der Option erneut einen neuen Wert zuweisen." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:98 +#: apt.conf.5.xml:109 msgid "" "Two specials are allowed, <literal>#include</literal> (which is deprecated " "and not supported by alternative implementations) and <literal>#clear</" @@ -5833,7 +5901,7 @@ msgstr "" "(Beachten Sie, dass diese Zeilen auch mit einem Semikolon enden müssen.)" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:106 +#: apt.conf.5.xml:117 msgid "" "The #clear command is the only way to delete a list or a complete scope. " "Reopening a scope or the ::-style described below will <emphasis>not</" @@ -5849,7 +5917,7 @@ msgstr "" "überschrieben, sondern nur bereinigt werden." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:111 +#: apt.conf.5.xml:122 msgid "" "All of the APT tools take a -o option which allows an arbitrary " "configuration directive to be specified on the command line. The syntax is a " @@ -5868,7 +5936,7 @@ msgstr "" "Befehlszeile benutzt werden.)" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:118 +#: apt.conf.5.xml:129 msgid "" "Note that you can use :: only for appending one item per line to a list and " "that you should not use it in combination with the scope syntax. (The scope " @@ -5899,12 +5967,12 @@ msgstr "" "sich APT nicht explizit darüber beklagt." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:130 +#: apt.conf.5.xml:141 msgid "The APT Group" msgstr "Die APT-Gruppe" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:131 +#: apt.conf.5.xml:142 msgid "" "This group of options controls general APT behavior as well as holding the " "options for all of the tools." @@ -5913,12 +5981,12 @@ msgstr "" "wie es die Optionen für alle Werkzeuge enthält." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:135 +#: apt.conf.5.xml:146 msgid "Architecture" msgstr "Architecture" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:136 +#: apt.conf.5.xml:147 msgid "" "System Architecture; sets the architecture to use when fetching files and " "parsing package lists. The internal default is the architecture apt was " @@ -5929,12 +5997,12 @@ msgstr "" "die Architektur für die APT kompiliert wurde." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:141 +#: apt.conf.5.xml:152 msgid "Default-Release" msgstr "Default-Release" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:142 +#: apt.conf.5.xml:153 msgid "" "Default release to install packages from if more than one version available. " "Contains release name, codename or release version. Examples: 'stable', " @@ -5947,12 +6015,12 @@ msgstr "" "auch &apt-preferences;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:146 +#: apt.conf.5.xml:157 msgid "Ignore-Hold" msgstr "Ignore-Hold" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:147 +#: apt.conf.5.xml:158 msgid "" "Ignore Held packages; This global option causes the problem resolver to " "ignore held packages in its decision making." @@ -5961,12 +6029,12 @@ msgstr "" "Problemlöser, gehaltene Pakete beim Treffen von Entscheidungen zu ignorieren." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:151 +#: apt.conf.5.xml:162 msgid "Clean-Installed" msgstr "Clean-Installed" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:152 +#: apt.conf.5.xml:163 msgid "" "Defaults to on. When turned on the autoclean feature will remove any " "packages which can no longer be downloaded from the cache. If turned off " @@ -5981,12 +6049,12 @@ msgstr "" "Möglichkeiten bereitstellt, um sie erneut zu installieren." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:158 +#: apt.conf.5.xml:169 msgid "Immediate-Configure" msgstr "Immediate-Configure" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:159 +#: apt.conf.5.xml:170 #, fuzzy #| msgid "" #| "Defaults to on which will cause APT to install essential and important " @@ -6084,12 +6152,12 @@ msgstr "" "Upgrade-Prozesses arbeiten kann." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:181 +#: apt.conf.5.xml:192 msgid "Force-LoopBreak" msgstr "Force-LoopBreak" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:182 +#: apt.conf.5.xml:193 msgid "" "Never Enable this option unless you -really- know what you are doing. It " "permits APT to temporarily remove an essential package to break a Conflicts/" @@ -6107,12 +6175,12 @@ msgstr "" "bash oder etwas, was davon abhängt, sind." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:190 +#: apt.conf.5.xml:201 msgid "Cache-Limit" msgstr "Cache-Limit" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:191 +#: apt.conf.5.xml:202 msgid "" "APT uses a fixed size memory mapped cache file to store the 'available' " "information. This sets the size of that cache (in bytes)." @@ -6122,24 +6190,24 @@ msgstr "" "(in Bytes)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:195 +#: apt.conf.5.xml:206 msgid "Build-Essential" msgstr "Build-Essential" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:196 +#: apt.conf.5.xml:207 msgid "Defines which package(s) are considered essential build dependencies." msgstr "" "Definiert, welche(s) Paket(e) als essentielle Bauabhängigkeiten betrachtet " "werde." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:199 +#: apt.conf.5.xml:210 msgid "Get" msgstr "Get" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:200 +#: apt.conf.5.xml:211 msgid "" "The Get subsection controls the &apt-get; tool, please see its documentation " "for more information about the options here." @@ -6149,12 +6217,12 @@ msgstr "" "erhalten." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:204 +#: apt.conf.5.xml:215 msgid "Cache" msgstr "Cache" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:205 +#: apt.conf.5.xml:216 msgid "" "The Cache subsection controls the &apt-cache; tool, please see its " "documentation for more information about the options here." @@ -6164,12 +6232,12 @@ msgstr "" "erhalten." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:209 +#: apt.conf.5.xml:220 msgid "CDROM" msgstr "CD-ROM" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:210 +#: apt.conf.5.xml:221 msgid "" "The CDROM subsection controls the &apt-cdrom; tool, please see its " "documentation for more information about the options here." @@ -6179,17 +6247,17 @@ msgstr "" "erhalten." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:216 +#: apt.conf.5.xml:227 msgid "The Acquire Group" msgstr "Die Erwerbgruppe" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:221 +#: apt.conf.5.xml:232 msgid "PDiffs" msgstr "PDiffs" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:222 +#: apt.conf.5.xml:233 msgid "" "Try to download deltas called <literal>PDiffs</literal> for Packages or " "Sources files instead of downloading whole ones. True by default." @@ -6199,7 +6267,7 @@ msgstr "" "True." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:225 +#: apt.conf.5.xml:236 msgid "" "Two sub-options to limit the use of PDiffs are also available: With " "<literal>FileLimit</literal> can be specified how many PDiff files are " @@ -6210,12 +6278,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:234 +#: apt.conf.5.xml:245 msgid "Queue-Mode" msgstr "Queue-Mode" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:235 +#: apt.conf.5.xml:246 msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</" "literal> or <literal>access</literal> which determines how APT parallelizes " @@ -6231,12 +6299,12 @@ msgstr "" "URI-Art geöffnet wird." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:242 +#: apt.conf.5.xml:253 msgid "Retries" msgstr "Retries" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:243 +#: apt.conf.5.xml:254 msgid "" "Number of retries to perform. If this is non-zero APT will retry failed " "files the given number of times." @@ -6245,12 +6313,12 @@ msgstr "" "APT fehlgeschlagene Dateien in der angegebenen Zahl erneut versuchen." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:247 +#: apt.conf.5.xml:258 msgid "Source-Symlinks" msgstr "Source-Symlinks" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:248 +#: apt.conf.5.xml:259 msgid "" "Use symlinks for source archives. If set to true then source archives will " "be symlinked when possible instead of copying. True is the default." @@ -6260,12 +6328,12 @@ msgstr "" "kopiert zu werden. True ist die Vorgabe." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:252 sources.list.5.xml:139 +#: apt.conf.5.xml:263 sources.list.5.xml:139 msgid "http" msgstr "http" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:253 +#: apt.conf.5.xml:264 msgid "" "HTTP URIs; http::Proxy is the default http proxy to use. It is in the " "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per " @@ -6283,7 +6351,7 @@ msgstr "" "die Umgebungsvariable <envar>http_proxy</envar> benutzt." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:261 +#: apt.conf.5.xml:272 msgid "" "Three settings are provided for cache control with HTTP/1.1 compliant proxy " "caches. <literal>No-Cache</literal> tells the proxy to not use its cached " @@ -6309,7 +6377,7 @@ msgstr "" "unterstützt keine dieser Optionen." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:271 apt.conf.5.xml:335 +#: apt.conf.5.xml:282 apt.conf.5.xml:346 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method, this applies to all things including connection timeout and data " @@ -6320,7 +6388,7 @@ msgstr "" "Dinge, einschließlich Verbindungs- und Datenzeitüberschreitungen, angewandt." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:274 +#: apt.conf.5.xml:285 msgid "" "One setting is provided to control the pipeline depth in cases where the " "remote server is not RFC conforming or buggy (such as Squid 2.0.2). " @@ -6340,7 +6408,7 @@ msgstr "" "gegen RFC 2068." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:282 +#: apt.conf.5.xml:293 msgid "" "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</" "literal> which accepts integer values in kilobyte. The default value is 0 " @@ -6356,7 +6424,7 @@ msgstr "" "deaktiviert.)" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:287 +#: apt.conf.5.xml:298 msgid "" "<literal>Acquire::http::User-Agent</literal> can be used to set a different " "User-Agent for the http download method as some proxies allow access for " @@ -6368,12 +6436,12 @@ msgstr "" "bekannten Bezeichner verwendet." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:293 +#: apt.conf.5.xml:304 msgid "https" msgstr "https" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:294 +#: apt.conf.5.xml:305 msgid "" "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy " "options are the same as for <literal>http</literal> method and will also " @@ -6388,7 +6456,7 @@ msgstr "" "<literal>Pipeline-Depth</literal> wird noch nicht unterstützt." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:300 +#: apt.conf.5.xml:311 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is " @@ -6427,12 +6495,12 @@ msgstr "" "SslForceVersion</literal> ist die entsprechende per-Host-Option." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:318 sources.list.5.xml:150 +#: apt.conf.5.xml:329 sources.list.5.xml:150 msgid "ftp" msgstr "ftp" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:319 +#: apt.conf.5.xml:330 msgid "" "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard " "form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host " @@ -6467,7 +6535,7 @@ msgstr "" "entsprechenden URI-Bestandteil genommen." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:338 +#: apt.conf.5.xml:349 msgid "" "Several settings are provided to control passive mode. Generally it is safe " "to leave passive mode on, it works in nearly every environment. However " @@ -6484,7 +6552,7 @@ msgstr "" "Beispielskonfiguration, um Beispiele zu erhalten)." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:345 +#: apt.conf.5.xml:356 msgid "" "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</" "envar> environment variable to a http url - see the discussion of the http " @@ -6498,7 +6566,7 @@ msgstr "" "Effizienz nicht empfohlen FTP über HTTP zu benutzen." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:350 +#: apt.conf.5.xml:361 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@ -6514,18 +6582,18 @@ msgstr "" "Server RFC2428 unterstützen." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:357 sources.list.5.xml:132 +#: apt.conf.5.xml:368 sources.list.5.xml:132 msgid "cdrom" msgstr "cdrom" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:363 +#: apt.conf.5.xml:374 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "/cdrom/::Mount \"foo\";" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:358 +#: apt.conf.5.xml:369 msgid "" "CDROM URIs; the only setting for CDROM URIs is the mount point, " "<literal>cdrom::Mount</literal> which must be the mount point for the CDROM " @@ -6547,12 +6615,12 @@ msgstr "" "können per UMount angegeben werden." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:368 +#: apt.conf.5.xml:379 msgid "gpgv" msgstr "gpgv" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:369 +#: apt.conf.5.xml:380 msgid "" "GPGV URIs; the only option for GPGV URIs is the option to pass additional " "parameters to gpgv. <literal>gpgv::Options</literal> Additional options " @@ -6563,18 +6631,18 @@ msgstr "" "Zusätzliche Parameter werden an gpgv weitergeleitet." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:374 +#: apt.conf.5.xml:385 msgid "CompressionTypes" msgstr "CompressionTypes" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:380 +#: apt.conf.5.xml:391 #, no-wrap msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";" msgstr "Acquire::CompressionTypes::<replaceable>Dateierweiterung</replaceable> \"<replaceable>Methodenname</replaceable>\";" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:375 +#: apt.conf.5.xml:386 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@ -6594,19 +6662,19 @@ msgstr "" "\"synopsis\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:385 +#: apt.conf.5.xml:396 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "Acquire::CompressionTypes::Order:: \"gz\";" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:388 +#: apt.conf.5.xml:399 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:381 +#: apt.conf.5.xml:392 msgid "" "Also the <literal>Order</literal> subgroup can be used to define in which " "order the acquire system will try to download the compressed files. The " @@ -6637,13 +6705,13 @@ msgstr "" "explizit zur Liste hinzuzufügen, da es automatisch hinzufügt wird." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:392 +#: apt.conf.5.xml:403 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:390 +#: apt.conf.5.xml:401 msgid "" "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" "replaceable></literal> will be checked: If this setting exists the method " @@ -6669,7 +6737,7 @@ msgstr "" "diesen Typ nur vor die Liste setzen." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:397 +#: apt.conf.5.xml:408 msgid "" "While it is possible to add an empty compression type to the order list, but " "APT in its current version doesn't understand it correctly and will display " @@ -6686,12 +6754,12 @@ msgstr "" "unterstützen." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:403 +#: apt.conf.5.xml:414 msgid "Languages" msgstr "Sprachen" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:404 +#: apt.conf.5.xml:415 #, fuzzy #| msgid "" #| "The Languages subsection controls which <filename>Translation</filename> " @@ -6723,13 +6791,13 @@ msgstr "" "hier unmögliche Werte einsetzen." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting> -#: apt.conf.5.xml:420 +#: apt.conf.5.xml:431 #, no-wrap msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:410 +#: apt.conf.5.xml:421 #, fuzzy #| msgid "" #| "The default list includes \"environment\" and \"en\". " @@ -6791,7 +6859,7 @@ msgstr "" "Reihenfolge »fr, de, en«. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:217 +#: apt.conf.5.xml:228 msgid "" "The <literal>Acquire</literal> group of options controls the download of " "packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>" @@ -6801,12 +6869,12 @@ msgstr "" "id=\"0\"/>" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:427 +#: apt.conf.5.xml:438 msgid "Directories" msgstr "Verzeichnisse" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:429 +#: apt.conf.5.xml:440 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@ -6826,7 +6894,7 @@ msgstr "" "filename> oder <filename>./</filename> beginnen." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:436 +#: apt.conf.5.xml:447 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@ -6849,7 +6917,7 @@ msgstr "" "<literal>Dir::Cache</literal> enthalten." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:445 +#: apt.conf.5.xml:456 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@ -6864,7 +6932,7 @@ msgstr "" "Konfigurationsdatei erfolgt)." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:451 +#: apt.conf.5.xml:462 msgid "" "The <literal>Dir::Parts</literal> setting reads in all the config fragments " "in lexical order from the directory specified. After this is done then the " @@ -6876,7 +6944,7 @@ msgstr "" "geladen." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:455 +#: apt.conf.5.xml:466 msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" "Bin::Methods</literal> specifies the location of the method handlers and " @@ -6894,7 +6962,7 @@ msgstr "" "Programms an." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:463 +#: apt.conf.5.xml:474 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@ -6914,12 +6982,12 @@ msgstr "" "<filename>/tmp/staging/var/lib/dpkg/status</filename> nachgesehen." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:476 +#: apt.conf.5.xml:487 msgid "APT in DSelect" msgstr "APT in DSelect" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:478 +#: apt.conf.5.xml:489 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behaviour. These are in the <literal>DSelect</literal> " @@ -6930,12 +6998,12 @@ msgstr "" "<literal>DSelect</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:482 +#: apt.conf.5.xml:493 msgid "Clean" msgstr "Clean" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:483 +#: apt.conf.5.xml:494 msgid "" "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto " "and never. always and prompt will remove all packages from the cache after " @@ -6953,7 +7021,7 @@ msgstr "" "vor dem Herunterladen neuer Pakete durch." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:492 +#: apt.conf.5.xml:503 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the install phase." @@ -6962,12 +7030,12 @@ msgstr "" "übermittelt, wenn es für die Installationsphase durchlaufen wird." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:496 +#: apt.conf.5.xml:507 msgid "Updateoptions" msgstr "Updateoptions" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:497 +#: apt.conf.5.xml:508 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the update phase." @@ -6976,12 +7044,12 @@ msgstr "" "übermittelt, wenn es für die Aktualisierungsphase durchlaufen wird." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:501 +#: apt.conf.5.xml:512 msgid "PromptAfterUpdate" msgstr "PromptAfterUpdate" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:502 +#: apt.conf.5.xml:513 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." @@ -6990,12 +7058,12 @@ msgstr "" "nachfragen, um fortzufahren. Vorgabe ist es, nur bei Fehlern nachzufragen." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:508 +#: apt.conf.5.xml:519 msgid "How APT calls dpkg" msgstr "Wie APT Dpkg aufruft" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:509 +#: apt.conf.5.xml:520 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." @@ -7004,7 +7072,7 @@ msgstr "" "stehen im Abschnitt <literal>DPkg</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:514 +#: apt.conf.5.xml:525 msgid "" "This is a list of options to pass to dpkg. The options must be specified " "using the list notation and each list item is passed as a single argument to " @@ -7015,17 +7083,17 @@ msgstr "" "jedes Listenelement wird als einzelnes Argument an &dpkg; übermittelt." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:519 +#: apt.conf.5.xml:530 msgid "Pre-Invoke" msgstr "Pre-Invoke" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:519 +#: apt.conf.5.xml:530 msgid "Post-Invoke" msgstr "Post-Invoke" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:520 +#: apt.conf.5.xml:531 msgid "" "This is a list of shell commands to run before/after invoking &dpkg;. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -7039,12 +7107,12 @@ msgstr "" "APT abgebrochen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:526 +#: apt.conf.5.xml:537 msgid "Pre-Install-Pkgs" msgstr "Pre-Install-Pkgs" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:527 +#: apt.conf.5.xml:538 msgid "" "This is a list of shell commands to run before invoking dpkg. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -7061,7 +7129,7 @@ msgstr "" "pro Zeile." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:533 +#: apt.conf.5.xml:544 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@ -7077,12 +7145,12 @@ msgstr "" "literal> gegeben wird." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:540 +#: apt.conf.5.xml:551 msgid "Run-Directory" msgstr "Run-Directory" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:541 +#: apt.conf.5.xml:552 msgid "" "APT chdirs to this directory before invoking dpkg, the default is <filename>/" "</filename>." @@ -7091,12 +7159,12 @@ msgstr "" "die Vorgabe ist <filename>/</filename>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:545 +#: apt.conf.5.xml:556 msgid "Build-options" msgstr "Build-options" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:546 +#: apt.conf.5.xml:557 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages, the " "default is to disable signing and produce all binaries." @@ -7106,12 +7174,12 @@ msgstr "" "Programme werden erstellt." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt.conf.5.xml:551 +#: apt.conf.5.xml:562 msgid "dpkg trigger usage (and related options)" msgstr "Dpkd-Trigger-Benutzung (und zugehöriger Optionen)" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:552 +#: apt.conf.5.xml:563 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 " @@ -7137,7 +7205,7 @@ msgstr "" "Status 100% stehen, während es aktuell alle Pakete konfiguriert." #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:567 +#: apt.conf.5.xml:578 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@ -7151,7 +7219,7 @@ msgstr "" "DPkg::TriggersPending \"true\";" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:561 +#: apt.conf.5.xml:572 msgid "" "Note that it is not guaranteed that APT will support these options or that " "these options will not cause (big) trouble in the future. If you have " @@ -7176,12 +7244,12 @@ msgstr "" "wäre <placeholder type=\"literallayout\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:573 +#: apt.conf.5.xml:584 msgid "DPkg::NoTriggers" msgstr "DPkg::NoTriggers" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:574 +#: apt.conf.5.xml:585 msgid "" "Add the no triggers flag to all dpkg calls (except the ConfigurePending " "call). See &dpkg; if you are interested in what this actually means. In " @@ -7202,12 +7270,12 @@ msgstr "" "außerdem an die »unpack«- und »remove«-Aufrufe anhängen." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:581 +#: apt.conf.5.xml:592 msgid "PackageManager::Configure" msgstr "PackageManager::Configure" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:582 +#: apt.conf.5.xml:593 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@ -7236,12 +7304,12 @@ msgstr "" "mehr startbar sein könnte." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:592 +#: apt.conf.5.xml:603 msgid "DPkg::ConfigurePending" msgstr "DPkg::ConfigurePending" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:593 +#: apt.conf.5.xml:604 msgid "" "If this option is set apt will call <command>dpkg --configure --pending</" "command> to let dpkg handle all required configurations and triggers. This " @@ -7260,12 +7328,12 @@ msgstr "" "deaktivieren." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:599 +#: apt.conf.5.xml:610 msgid "DPkg::TriggersPending" msgstr "DPkg::TriggersPending" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:600 +#: apt.conf.5.xml:611 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@ -7281,12 +7349,12 @@ msgstr "" "benötigt werden." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:605 +#: apt.conf.5.xml:616 msgid "PackageManager::UnpackAll" msgstr "PackageManager::UnpackAll" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:606 +#: apt.conf.5.xml:617 msgid "" "As the configuration can be deferred to be done at the end by dpkg it can be " "tried to order the unpack series only by critical needs, e.g. by Pre-" @@ -7305,12 +7373,12 @@ msgstr "" "und weitere Verbesserungen benötigt, bevor sie wirklich nützlich wird." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:613 +#: apt.conf.5.xml:624 msgid "OrderList::Score::Immediate" msgstr "OrderList::Score::Immediate" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:621 +#: apt.conf.5.xml:632 #, no-wrap msgid "" "OrderList::Score {\n" @@ -7328,7 +7396,7 @@ msgstr "" "};" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:614 +#: apt.conf.5.xml:625 msgid "" "Essential packages (and there dependencies) should be configured immediately " "after unpacking. It will be a good idea to do this quite early in the " @@ -7352,12 +7420,12 @@ msgstr "" "mit ihren Vorgabewerten. <placeholder type=\"literallayout\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:634 +#: apt.conf.5.xml:645 msgid "Periodic and Archives options" msgstr "Periodische- und Archivoptionen" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:635 +#: apt.conf.5.xml:646 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@ -7371,12 +7439,12 @@ msgstr "" "Dokumentation dieser Optionen zu erhalten." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:643 +#: apt.conf.5.xml:654 msgid "Debug options" msgstr "Fehlersuchoptionen" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:645 +#: apt.conf.5.xml:656 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -7394,7 +7462,7 @@ msgstr "" "könnten es sein:" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:656 +#: apt.conf.5.xml:667 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@ -7405,7 +7473,7 @@ msgstr "" "getroffenen Entscheidungen ein." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:664 +#: apt.conf.5.xml:675 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@ -7416,7 +7484,7 @@ msgstr "" "<literal>apt-get -s install</literal>) als nicht root-Anwender auszuführen." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:673 +#: apt.conf.5.xml:684 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -7428,7 +7496,7 @@ msgstr "" #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:681 +#: apt.conf.5.xml:692 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CDROM IDs." @@ -7437,17 +7505,17 @@ msgstr "" "Daten in CD-ROM-IDs aus." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:691 +#: apt.conf.5.xml:702 msgid "A full list of debugging options to apt follows." msgstr "Eine vollständige Liste der Fehlersuchoptionen von APT folgt." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:696 +#: apt.conf.5.xml:707 msgid "<literal>Debug::Acquire::cdrom</literal>" msgstr "<literal>Debug::Acquire::cdrom</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:700 +#: apt.conf.5.xml:711 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" @@ -7455,48 +7523,48 @@ msgstr "" "literal>-Quellen beziehen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:707 +#: apt.conf.5.xml:718 msgid "<literal>Debug::Acquire::ftp</literal>" msgstr "<literal>Debug::Acquire::ftp</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:711 +#: apt.conf.5.xml:722 msgid "Print information related to downloading packages using FTP." msgstr "" "Gibt Informationen aus, die sich auf das Herunterladen von Paketen per FTP " "beziehen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:718 +#: apt.conf.5.xml:729 msgid "<literal>Debug::Acquire::http</literal>" msgstr "<literal>Debug::Acquire::http</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:722 +#: apt.conf.5.xml:733 msgid "Print information related to downloading packages using HTTP." msgstr "" "Gibt Informationen aus, die sich auf das Herunterladen von Paketen per HTTP " "beziehen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:729 +#: apt.conf.5.xml:740 msgid "<literal>Debug::Acquire::https</literal>" msgstr "<literal>Debug::Acquire::https</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:733 +#: apt.conf.5.xml:744 msgid "Print information related to downloading packages using HTTPS." msgstr "" "Gibt Informationen aus, die sich auf das Herunterladen von Paketen per HTTPS " "beziehen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:740 +#: apt.conf.5.xml:751 msgid "<literal>Debug::Acquire::gpgv</literal>" msgstr "<literal>Debug::Acquire::gpgv</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:744 +#: apt.conf.5.xml:755 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." @@ -7505,12 +7573,12 @@ msgstr "" "mittels <literal>gpg</literal> beziehen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:751 +#: apt.conf.5.xml:762 msgid "<literal>Debug::aptcdrom</literal>" msgstr "<literal>Debug::aptcdrom</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:755 +#: apt.conf.5.xml:766 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." @@ -7519,23 +7587,23 @@ msgstr "" "CD-ROMs gespeichert sind." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:762 +#: apt.conf.5.xml:773 msgid "<literal>Debug::BuildDeps</literal>" msgstr "<literal>Debug::BuildDeps</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:765 +#: apt.conf.5.xml:776 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" "Beschreibt den Prozess der Auflösung von Bauabhängigkeiten in &apt-get;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:772 +#: apt.conf.5.xml:783 msgid "<literal>Debug::Hashes</literal>" msgstr "<literal>Debug::Hashes</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:775 +#: apt.conf.5.xml:786 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." @@ -7544,12 +7612,12 @@ msgstr "" "Bibliotheken generiert wurde." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:782 +#: apt.conf.5.xml:793 msgid "<literal>Debug::IdentCDROM</literal>" msgstr "<literal>Debug::IdentCDROM</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:785 +#: apt.conf.5.xml:796 msgid "" "Do not include information from <literal>statfs</literal>, namely the number " "of used and free blocks on the CD-ROM filesystem, when generating an ID for " @@ -7560,12 +7628,12 @@ msgstr "" "ID für eine CD-ROM generiert wird." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:793 +#: apt.conf.5.xml:804 msgid "<literal>Debug::NoLocking</literal>" msgstr "<literal>Debug::NoLocking</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:796 +#: apt.conf.5.xml:807 msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." @@ -7575,24 +7643,24 @@ msgstr "" "gleichen Zeit laufen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:804 +#: apt.conf.5.xml:815 msgid "<literal>Debug::pkgAcquire</literal>" msgstr "<literal>Debug::pkgAcquire</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:808 +#: apt.conf.5.xml:819 msgid "Log when items are added to or removed from the global download queue." msgstr "" "Protokollieren, wenn Elemente aus der globalen Warteschlange zum " "Herunterladen hinzugefügt oder entfernt werden." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:815 +#: apt.conf.5.xml:826 msgid "<literal>Debug::pkgAcquire::Auth</literal>" msgstr "<literal>Debug::pkgAcquire::Auth</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:818 +#: apt.conf.5.xml:829 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." @@ -7601,12 +7669,12 @@ msgstr "" "und kryptografischen Signaturen von heruntergeladenen Dateien beziehen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:825 +#: apt.conf.5.xml:836 msgid "<literal>Debug::pkgAcquire::Diffs</literal>" msgstr "<literal>Debug::pkgAcquire::Diffs</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:828 +#: apt.conf.5.xml:839 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." @@ -7615,12 +7683,12 @@ msgstr "" "und Fehler, die die Paketindexlisten-Diffs betreffen, ausgeben." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:836 +#: apt.conf.5.xml:847 msgid "<literal>Debug::pkgAcquire::RRed</literal>" msgstr "<literal>Debug::pkgAcquire::RRed</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:840 +#: apt.conf.5.xml:851 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." @@ -7630,12 +7698,12 @@ msgstr "" "werden." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:847 +#: apt.conf.5.xml:858 msgid "<literal>Debug::pkgAcquire::Worker</literal>" msgstr "<literal>Debug::pkgAcquire::Worker</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:851 +#: apt.conf.5.xml:862 msgid "" "Log all interactions with the sub-processes that actually perform downloads." msgstr "" @@ -7643,12 +7711,12 @@ msgstr "" "durchführen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:858 +#: apt.conf.5.xml:869 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "<literal>Debug::pkgAutoRemove</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:862 +#: apt.conf.5.xml:873 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." @@ -7658,12 +7726,12 @@ msgstr "" "beziehen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:869 +#: apt.conf.5.xml:880 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "<literal>Debug::pkgDepCache::AutoInstall</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:872 +#: apt.conf.5.xml:883 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@ -7679,12 +7747,12 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:883 +#: apt.conf.5.xml:894 msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "<literal>Debug::pkgDepCache::Marker</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:886 +#: apt.conf.5.xml:897 msgid "" "Generate debug messages describing which package is marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@ -7716,23 +7784,23 @@ msgstr "" "erscheint." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:905 +#: apt.conf.5.xml:916 msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "<literal>Debug::pkgInitConfig</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:908 +#: apt.conf.5.xml:919 msgid "Dump the default configuration to standard error on startup." msgstr "" "Die Vorgabekonfiguration beim Start auf der Standardfehlerausgabe ausgeben." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:915 +#: apt.conf.5.xml:926 msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "<literal>Debug::pkgDPkgPM</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:918 +#: apt.conf.5.xml:929 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." @@ -7742,12 +7810,12 @@ msgstr "" "sind." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:926 +#: apt.conf.5.xml:937 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:929 +#: apt.conf.5.xml:940 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." @@ -7756,12 +7824,12 @@ msgstr "" "alle während deren Auswertung gefundenen Fehler ausgeben." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:936 +#: apt.conf.5.xml:947 msgid "<literal>Debug::pkgOrderList</literal>" msgstr "<literal>Debug::pkgOrderList</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:940 +#: apt.conf.5.xml:951 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." @@ -7771,12 +7839,12 @@ msgstr "" "soll." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:948 +#: apt.conf.5.xml:959 msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "<literal>Debug::pkgPackageManager</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:952 +#: apt.conf.5.xml:963 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" @@ -7784,22 +7852,22 @@ msgstr "" "von &dpkg; ausgeführt werden." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:959 +#: apt.conf.5.xml:970 msgid "<literal>Debug::pkgPolicy</literal>" msgstr "<literal>Debug::pkgPolicy</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:963 +#: apt.conf.5.xml:974 msgid "Output the priority of each package list on startup." msgstr "Die Priorität jeder Paketliste beim Start ausgeben." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:969 +#: apt.conf.5.xml:980 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "<literal>Debug::pkgProblemResolver</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:973 +#: apt.conf.5.xml:984 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." @@ -7809,12 +7877,12 @@ msgstr "" "aufgetreten ist)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:981 +#: apt.conf.5.xml:992 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "<literal>Debug::pkgProblemResolver::ShowScores</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:984 +#: apt.conf.5.xml:995 msgid "" "Display a list of all installed packages with their calculated score used by " "the pkgProblemResolver. The description of the package is the same as " @@ -7826,12 +7894,12 @@ msgstr "" "beschrieben." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:992 +#: apt.conf.5.xml:1003 msgid "<literal>Debug::sourceList</literal>" msgstr "<literal>Debug::sourceList</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:996 +#: apt.conf.5.xml:1007 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." @@ -7840,7 +7908,7 @@ msgstr "" "gelesenen Anbieter ausgeben." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1019 +#: apt.conf.5.xml:1030 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." @@ -7849,13 +7917,13 @@ msgstr "" "möglichen Optionen zeigen." #. type: Content of: <refentry><refsect1><variablelist> -#: apt.conf.5.xml:1026 +#: apt.conf.5.xml:1037 msgid "&file-aptconf;" msgstr "&file-aptconf;" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1031 +#: apt.conf.5.xml:1042 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-cache;, &apt-config;, &apt-preferences;." @@ -7926,25 +7994,36 @@ msgstr "" "APT-Einstellungsdatei beeinflusst die Wahl der Instanz nicht, nur die Wahl " "der Version." -#. type: Content of: <refentry><refsect1><refsect2><title> +#. type: Content of: <refentry><refsect1><para> #: apt_preferences.5.xml:56 +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." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt_preferences.5.xml:63 msgid "APT's Default Priority Assignments" msgstr "APTs Standardprioritätszuweisungen" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:71 +#: apt_preferences.5.xml:78 #, no-wrap msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n" msgstr "<command>apt-get install -t testing <replaceable>irgendein_Paket</replaceable></command>\n" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:74 +#: apt_preferences.5.xml:81 #, no-wrap msgid "APT::Default-Release \"stable\";\n" msgstr "APT::Default-Release \"stable\";\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:58 +#: apt_preferences.5.xml:65 msgid "" "If there is no preferences file or if there is no entry in the file that " "applies to a particular version then the priority assigned to that version " @@ -7972,22 +8051,22 @@ msgstr "" "\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:83 +#: apt_preferences.5.xml:90 msgid "priority 100" msgstr "Priorität 100" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:84 +#: apt_preferences.5.xml:91 msgid "to the version that is already installed (if any)." msgstr "zu der Version, die bereits installiert ist (wenn vorhanden)." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:88 +#: apt_preferences.5.xml:95 msgid "priority 500" msgstr "Priorität 500" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:89 +#: apt_preferences.5.xml:96 msgid "" "to the versions that are not installed and do not belong to the target " "release." @@ -7996,19 +8075,19 @@ msgstr "" "gehören." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:93 +#: apt_preferences.5.xml:100 msgid "priority 990" msgstr "Priorität 990" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:94 +#: apt_preferences.5.xml:101 msgid "" "to the versions that are not installed and belong to the target release." msgstr "" "zu den Versionen, die nicht installiert sind und zum Ziel-Release gehören." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:78 +#: apt_preferences.5.xml:85 msgid "" "If the target release has been specified then APT uses the following " "algorithm to set the priorities of the versions of a package. Assign: " @@ -8019,7 +8098,7 @@ msgstr "" "Zuweisung: <placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:99 +#: apt_preferences.5.xml:106 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 " @@ -8030,7 +8109,7 @@ msgstr "" "installierten Paketversionen eine Priorität von 500 zu." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:103 +#: apt_preferences.5.xml:110 msgid "" "APT then applies the following rules, listed in order of precedence, to " "determine which version of a package to install." @@ -8040,7 +8119,7 @@ msgstr "" "ist." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:106 +#: apt_preferences.5.xml:113 msgid "" "Never downgrade unless the priority of an available version exceeds 1000. " "(\"Downgrading\" is installing a less recent version of a package in place " @@ -8056,12 +8135,12 @@ msgstr "" "Downgrading eines Paketes riskant sein kann.)" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:112 +#: apt_preferences.5.xml:119 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:113 +#: apt_preferences.5.xml:120 msgid "" "If two or more versions have the same priority, install the most recent one " "(that is, the one with the higher version number)." @@ -8070,7 +8149,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:116 +#: apt_preferences.5.xml:123 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</" @@ -8082,7 +8161,7 @@ msgstr "" "installierte installiert." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:122 +#: apt_preferences.5.xml:129 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 " @@ -8098,7 +8177,7 @@ msgstr "" "upgrade</command> ausgeführt wird." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:129 +#: apt_preferences.5.xml:136 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 " @@ -8112,7 +8191,7 @@ msgstr "" "upgrade</command> ausgeführt wird." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:134 +#: apt_preferences.5.xml:141 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 " @@ -8132,12 +8211,12 @@ msgstr "" "hat." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:143 +#: apt_preferences.5.xml:150 msgid "The Effect of APT Preferences" msgstr "Die Auswirkungen von APT-Einstellungen" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:145 +#: apt_preferences.5.xml:152 msgid "" "The APT preferences file allows the system administrator to control the " "assignment of priorities. The file consists of one or more multi-line " @@ -8151,7 +8230,7 @@ msgstr "" "allgemeine Gestalt." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:151 +#: apt_preferences.5.xml:158 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 " @@ -8167,7 +8246,7 @@ msgstr "" "können durch Leerzeichen getrennt werden." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:158 +#: apt_preferences.5.xml:165 #, no-wrap msgid "" "Package: perl\n" @@ -8179,7 +8258,7 @@ msgstr "" "Pin-Priority: 1001\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:164 +#: apt_preferences.5.xml:171 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 " @@ -8194,7 +8273,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:170 +#: apt_preferences.5.xml:177 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 " @@ -8205,7 +8284,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:175 +#: apt_preferences.5.xml:182 #, no-wrap msgid "" "Package: *\n" @@ -8217,7 +8296,7 @@ msgstr "" "Pin-Priority: 999\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:180 +#: apt_preferences.5.xml:187 msgid "" "A note of caution: the keyword used here is \"<literal>origin</literal>\". " "This should not be confused with the Origin of a distribution as specified " @@ -8233,7 +8312,7 @@ msgstr "" "wie »Debian« oder »Ximian«." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:186 +#: apt_preferences.5.xml:193 msgid "" "The following record assigns a low priority to all package versions " "belonging to any distribution whose Archive name is \"<literal>unstable</" @@ -8244,7 +8323,7 @@ msgstr "" "Priorität zu." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:190 +#: apt_preferences.5.xml:197 #, no-wrap msgid "" "Package: *\n" @@ -8256,7 +8335,7 @@ msgstr "" "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:195 +#: apt_preferences.5.xml:202 msgid "" "The following record assigns a high priority to all package versions " "belonging to any distribution whose Codename is \"<literal>squeeze</literal>" @@ -8267,7 +8346,7 @@ msgstr "" "zu." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:199 +#: apt_preferences.5.xml:206 #, no-wrap msgid "" "Package: *\n" @@ -8279,7 +8358,7 @@ msgstr "" "Pin-Priority: 900\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:204 +#: apt_preferences.5.xml:211 msgid "" "The following record assigns a high priority to all package versions " "belonging to any release whose Archive name is \"<literal>stable</literal>\" " @@ -8290,7 +8369,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:209 +#: apt_preferences.5.xml:216 #, no-wrap msgid "" "Package: *\n" @@ -8302,17 +8381,17 @@ msgstr "" "Pin-Priority: 500\n" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:220 +#: apt_preferences.5.xml:227 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:228 +#: apt_preferences.5.xml:235 msgid "P > 1000" msgstr "P > 1000" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:229 +#: apt_preferences.5.xml:236 msgid "" "causes a version to be installed even if this constitutes a downgrade of the " "package" @@ -8321,12 +8400,12 @@ msgstr "" "des Pakets durchführt" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:233 +#: apt_preferences.5.xml:240 msgid "990 < P <=1000" msgstr "990 < P <=1000" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:234 +#: apt_preferences.5.xml:241 msgid "" "causes a version to be installed even if it does not come from the target " "release, unless the installed version is more recent" @@ -8335,12 +8414,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:239 +#: apt_preferences.5.xml:246 msgid "500 < P <=990" msgstr "500 < P <=990" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:240 +#: apt_preferences.5.xml:247 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" @@ -8350,12 +8429,12 @@ msgstr "" "neuer ist" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:245 +#: apt_preferences.5.xml:252 msgid "100 < P <=500" msgstr "100 < P <=500" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:246 +#: apt_preferences.5.xml:253 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" @@ -8365,12 +8444,12 @@ msgstr "" "installierte Version neuer ist" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:251 +#: apt_preferences.5.xml:258 msgid "0 < P <=100" msgstr "0 < P <=100" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:252 +#: apt_preferences.5.xml:259 msgid "" "causes a version to be installed only if there is no installed version of " "the package" @@ -8379,17 +8458,17 @@ msgstr "" "installierte Version des Pakets gibt" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:256 +#: apt_preferences.5.xml:263 msgid "P < 0" msgstr "P < 0" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:257 +#: apt_preferences.5.xml:264 msgid "prevents the version from being installed" msgstr "verhindert das Installieren der Version" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:223 +#: apt_preferences.5.xml:230 msgid "" "Priorities (P) assigned in the APT preferences file must be positive or " "negative integers. They are interpreted as follows (roughly speaking): " @@ -8400,7 +8479,7 @@ msgstr "" "(grob gesagt): <placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:262 +#: apt_preferences.5.xml:269 msgid "" "If any specific-form records match an available package version then the " "first such record determines the priority of the package version. Failing " @@ -8414,7 +8493,7 @@ msgstr "" "erste dieser Datensätze die Priorität der Paketversion fest." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:268 +#: apt_preferences.5.xml:275 msgid "" "For example, suppose the APT preferences file contains the three records " "presented earlier:" @@ -8423,7 +8502,7 @@ msgstr "" "bereits gezeigten Datensätze:" #. type: Content of: <refentry><refsect1><refsect2><programlisting> -#: apt_preferences.5.xml:272 +#: apt_preferences.5.xml:279 #, no-wrap msgid "" "Package: perl\n" @@ -8451,12 +8530,12 @@ msgstr "" "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:285 +#: apt_preferences.5.xml:292 msgid "Then:" msgstr "Dann:" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:287 +#: apt_preferences.5.xml:294 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 " @@ -8471,7 +8550,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:292 +#: apt_preferences.5.xml:299 msgid "" "A version of any package other than <literal>perl</literal> that is " "available from the local system has priority over other versions, even " @@ -8482,7 +8561,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:296 +#: apt_preferences.5.xml:303 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</" @@ -8496,12 +8575,12 @@ msgstr "" "Pakets installiert ist." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:306 +#: apt_preferences.5.xml:313 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:308 +#: apt_preferences.5.xml:315 msgid "" "The locations listed in the &sources-list; file should provide " "<filename>Packages</filename> and <filename>Release</filename> files to " @@ -8512,27 +8591,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:320 +#: apt_preferences.5.xml:327 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:321 +#: apt_preferences.5.xml:328 msgid "gives the package name" msgstr "gibt den Paketnamen an" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:324 apt_preferences.5.xml:374 +#: apt_preferences.5.xml:331 apt_preferences.5.xml:381 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:325 +#: apt_preferences.5.xml:332 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:312 +#: apt_preferences.5.xml:319 msgid "" "The <filename>Packages</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable>/" @@ -8553,12 +8632,12 @@ msgstr "" "Prioritäten relevant: <placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:341 +#: apt_preferences.5.xml:348 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:342 +#: apt_preferences.5.xml:349 msgid "" "names the archive to which all the packages in the directory tree belong. " "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies " @@ -8575,18 +8654,18 @@ msgstr "" "folgende Zeile benötigen:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:352 +#: apt_preferences.5.xml:359 #, 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:358 +#: apt_preferences.5.xml:365 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:359 +#: apt_preferences.5.xml:366 msgid "" "names the codename to which all the packages in the directory tree belong. " "For example, the line \"Codename: squeeze\" specifies that all of the " @@ -8602,13 +8681,13 @@ msgstr "" "die folgende Zeile benötigen:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:368 +#: apt_preferences.5.xml:375 #, no-wrap msgid "Pin: release n=squeeze\n" msgstr "Pin: release n=squeeze\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:375 +#: apt_preferences.5.xml:382 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 " @@ -8624,7 +8703,7 @@ msgstr "" "eine der folgenden Zeilen benötigen:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:384 +#: apt_preferences.5.xml:391 #, no-wrap msgid "" "Pin: release v=3.0\n" @@ -8636,12 +8715,12 @@ msgstr "" "Pin: release 3.0\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:393 +#: apt_preferences.5.xml:400 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:394 +#: apt_preferences.5.xml:401 msgid "" "names the licensing component associated with the packages in the directory " "tree of the <filename>Release</filename> file. For example, the line " @@ -8659,18 +8738,18 @@ msgstr "" "Zeilen benötigen:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:403 +#: apt_preferences.5.xml:410 #, 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:409 +#: apt_preferences.5.xml:416 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:410 +#: apt_preferences.5.xml:417 msgid "" "names the originator of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@ -8682,18 +8761,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:416 +#: apt_preferences.5.xml:423 #, 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:422 +#: apt_preferences.5.xml:429 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:423 +#: apt_preferences.5.xml:430 msgid "" "names the label of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@ -8706,13 +8785,13 @@ msgstr "" "die folgende Zeile benötigen:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:429 +#: apt_preferences.5.xml:436 #, 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:330 +#: apt_preferences.5.xml:337 msgid "" "The <filename>Release</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for " @@ -8734,7 +8813,7 @@ msgstr "" "relevant: <placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:436 +#: apt_preferences.5.xml:443 msgid "" "All of the <filename>Packages</filename> and <filename>Release</filename> " "files retrieved from locations listed in the &sources-list; file are stored " @@ -8760,12 +8839,12 @@ msgstr "" "Distribution heruntergeladen wurde." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:449 +#: apt_preferences.5.xml:456 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:451 +#: apt_preferences.5.xml:458 msgid "" "Each record in the APT preferences file can optionally begin with one or " "more lines beginning with the word <literal>Explanation:</literal>. This " @@ -8776,7 +8855,7 @@ msgstr "" "anfangen. Dieses stellt einen Platz für Kommentare bereit." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:455 +#: apt_preferences.5.xml:462 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 value " @@ -8790,12 +8869,12 @@ msgstr "" "anfängt." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:464 +#: apt_preferences.5.xml:471 msgid "Tracking Stable" msgstr "Stable verfolgen" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:472 +#: apt_preferences.5.xml:479 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated\n" @@ -8819,7 +8898,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:466 +#: apt_preferences.5.xml:473 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 " @@ -8834,8 +8913,8 @@ msgstr "" "Distribution gehören. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:489 apt_preferences.5.xml:535 -#: apt_preferences.5.xml:593 +#: apt_preferences.5.xml:496 apt_preferences.5.xml:542 +#: apt_preferences.5.xml:600 #, no-wrap msgid "" "apt-get install <replaceable>package-name</replaceable>\n" @@ -8847,7 +8926,7 @@ msgstr "" "apt-get dist-upgrade\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:484 +#: apt_preferences.5.xml:491 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 " @@ -8860,13 +8939,13 @@ msgstr "" "\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:501 +#: apt_preferences.5.xml:508 #, 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:495 +#: apt_preferences.5.xml:502 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>testing</literal> distribution; the package " @@ -8880,12 +8959,12 @@ msgstr "" "\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:507 +#: apt_preferences.5.xml:514 msgid "Tracking Testing or Unstable" msgstr "Testing oder Unstable verfolgen" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:516 +#: apt_preferences.5.xml:523 #, no-wrap msgid "" "Package: *\n" @@ -8913,7 +8992,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:509 +#: apt_preferences.5.xml:516 msgid "" "The following APT preferences file will cause APT to assign a high priority " "to package versions from the <literal>testing</literal> distribution, a " @@ -8930,7 +9009,7 @@ msgstr "" "\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:530 +#: apt_preferences.5.xml:537 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 " @@ -8943,13 +9022,13 @@ msgstr "" "\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:550 +#: apt_preferences.5.xml:557 #, 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:541 +#: apt_preferences.5.xml:548 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>unstable</literal> distribution. " @@ -8969,12 +9048,12 @@ msgstr "" "\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:557 +#: apt_preferences.5.xml:564 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:571 +#: apt_preferences.5.xml:578 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated package versions\n" @@ -9008,7 +9087,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:559 +#: apt_preferences.5.xml:566 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 " @@ -9034,7 +9113,7 @@ msgstr "" "benutzen. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:588 +#: apt_preferences.5.xml:595 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 " @@ -9047,13 +9126,13 @@ msgstr "" "durchzuführen. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:608 +#: apt_preferences.5.xml:615 #, 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:599 +#: apt_preferences.5.xml:606 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>sid</literal> distribution. Thereafter, " @@ -9073,12 +9152,12 @@ msgstr "" "\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><variablelist> -#: apt_preferences.5.xml:617 +#: apt_preferences.5.xml:624 msgid "&file-preferences;" msgstr "&file-preferences;" #. type: Content of: <refentry><refsect1><para> -#: apt_preferences.5.xml:623 +#: apt_preferences.5.xml:630 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;" msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;" @@ -11187,6 +11266,28 @@ 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 "" +#~ "<filename>apt.conf</filename> is the main configuration file for the APT " +#~ "suite of tools, all tools make use of the configuration file and a common " +#~ "command line parser to provide a uniform environment. When an APT tool " +#~ "starts up it will read the configuration specified by the " +#~ "<envar>APT_CONFIG</envar> environment variable (if any) and then read the " +#~ "files in <literal>Dir::Etc::Parts</literal> then read the main " +#~ "configuration file specified by <literal>Dir::Etc::main</literal> then " +#~ "finally apply the command line options to override the configuration " +#~ "directives, possibly loading even more config files." +#~ msgstr "" +#~ "<filename>apt.conf</filename> ist die Hauptkonfigurationsdatei für die " +#~ "APT-Werkzeugsammlung. Alle Werkzeuge benutzen die Konfigurationsdatei und " +#~ "einen gemeinsamen Befehlszeilenauswerter, um eine einheitliche Umgebung " +#~ "bereitzustellen. Wenn ein APT-Werkzeug startet, liest es die in der " +#~ "Umgebungsvariablen <envar>APT_CONFIG</envar> (falls vorhanden) angegebene " +#~ "Konfiguration, dann die Dateien in <literal>Dir::Etc::Parts</literal>, " +#~ "dann die durch <literal>Dir::Etc::main</literal> angegebene " +#~ "Konfigurationsdatei und übernimmt am Ende die Befehlszeilenoptionen, um " +#~ "Konfigurationsdirektiven zu überschreiben und möglicherweise sogar " +#~ "weitere Konfigurationsdateien zu laden." + #~ msgid "<filename>/etc/apt/trusted.gpg</filename>" #~ msgstr "<filename>/etc/apt/trusted.gpg</filename>" diff --git a/doc/po/es.po b/doc/po/es.po index c44bb7853..533978695 100644 --- a/doc/po/es.po +++ b/doc/po/es.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" -"POT-Creation-Date: 2010-01-11 15:12+0100\n" +"POT-Creation-Date: 2010-01-20 12:18+0100\n" "PO-Revision-Date: 2004-09-20 17:05+0000\n" "Last-Translator: Rubén Porras Campo <nahoo@inicia.es>\n" "Language-Team: <debian-l10n-spanish@lists.debian.org>\n" @@ -835,7 +835,7 @@ msgstr "" "Directorio donde se almacena información de estado por cada sitio especificado en &sources-list; Opción de Configuración: <literal>Dir::State::Lists</literal>." #. type: Plain text -#: apt.ent:368 +#: apt.ent:369 #, fuzzy, no-wrap msgid "" " <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n" @@ -858,6 +858,46 @@ msgstr "" "#-#-#-#-# apt-cdrom.es.8.sgml:1136 apt-cache.es.8.sgml:1136 apt-get.es.8.sgml:1136 #-#-#-#-#\n" "Directorio de almacenamiento para la información de estado en tránsito. Opción de Configuración: <literal>Dir::State::Lists</literal> (Implica partial)." +#. type: Plain text +#: apt.ent:371 +msgid "<!ENTITY translation-title \"TRANSLATION\">" +msgstr "" + +#. type: Plain text +#: apt.ent:380 +#, no-wrap, fuzzy +msgid "" +"<!-- TRANSLATOR: This is a placeholder. You should write here who has constributed\n" +" to the translation in the past, who is responsible now and maybe further information\n" +" specially related to your translation. -->\n" +"<!ENTITY translation-holder \"\n" +" The english translation was done by John Doe <email>john@doe.org</email> in 2009,\n" +" 2010 and Daniela Acme <email>daniela@acme.us</email> in 2010 together with the\n" +" Debian Dummy l10n Team <email>debian-l10n-dummy@lists.debian.org</email>.\n" +"\">\n" +msgstr "" +"<!ENTITY translation-holder \"\n" +" The spanish translation was written 2003 and 2004 by Ismael Fanlo (2003), Carlos Mestre (2003),\n" +" Rudy Godoy <email>rudy@kernel-panik.org</email> (2003),\n" +" Gustavo Saldumbide <email>gsal@adinet.com.uy</email> (2003),\n" +" Javier Fernández-Sanguino <email>jfs@computer.org</email> (2003)\n" +" and Rubén Porras Campo <email>nahoo@inicia.es</email> (2003, 2004)\n" +" under the aegis of the debian spanish-l10n-team <email>debian-l10n-spanish@lists.debian.org</email>.\n" +"\">\n" + +#. type: Plain text +#: apt.ent:387 +#, no-wrap +msgid "" +"<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n" +" in a shipped manpage will maybe appear english parts. -->\n" +"<!ENTITY translation-english \"\n" +" Note that this translated document may contain untranslated parts.\n" +" This is done on purpose, to avoid losing content when the\n" +" translation is lagging behind the original content.\n" +"\">\n" +msgstr "" + #. The last update date #. type: Content of: <refentry><refentryinfo> #: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13 @@ -1541,7 +1581,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 #: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89 -#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:491 apt.conf.5.xml:513 +#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524 #, fuzzy msgid "options" msgstr "Opciones" @@ -1817,7 +1857,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122 -#: apt.conf.5.xml:1024 apt_preferences.5.xml:615 +#: apt.conf.5.xml:1035 apt_preferences.5.xml:622 #, fuzzy msgid "Files" msgstr "Ficheros" @@ -1831,7 +1871,7 @@ msgstr "" #: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 #: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569 #: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 -#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1030 apt_preferences.5.xml:622 +#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:629 #: sources.list.5.xml:233 #, fuzzy msgid "See Also" @@ -3353,7 +3393,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1018 apt_preferences.5.xml:462 +#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1029 apt_preferences.5.xml:469 #: sources.list.5.xml:193 #, fuzzy msgid "Examples" @@ -5266,7 +5306,7 @@ msgid "" "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</" "firstname> <surname>Burrows</surname> <contrib>Initial documentation of " "Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-email; " -"&apt-product; <date>18 September 2009</date>" +"&apt-product; <date>16 January 2010</date>" msgstr "" #. type: Content of: <refentry><refnamediv><refname> @@ -5288,32 +5328,59 @@ msgstr "Programa para la consulta de configuración de APT" #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:40 -#, fuzzy msgid "" "<filename>apt.conf</filename> is the main configuration file for the APT " -"suite of tools, all tools make use of the configuration file and a common " -"command line parser to provide a uniform environment. When an APT tool " -"starts up it will read the configuration specified by the <envar>APT_CONFIG</" -"envar> environment variable (if any) and then read the files in " -"<literal>Dir::Etc::Parts</literal> then read the main configuration file " -"specified by <literal>Dir::Etc::main</literal> then finally apply the " -"command line options to override the configuration directives, possibly " -"loading even more config files." -msgstr "" -"<filename>apt.conf</filename> es el fichero principal de configuración del " -"conjunto de herramientas APT, todas las herramientas hacen uso del fichero " -"de configuración y un analizador común de sintaxis de la línea de órdenes " -"para proporcionar un entorno uniforme. Cuando se inicia una utilidad APT, " -"este leerá la configuración especificada en la variable de entorno " -"<envar>APT_CONFIG</envar> (si existe), luego leerá los ficheos en " -"<literal>Dir::Etc::Parts</literal>, entonces leerá el fichero de " -"configuración principal especificado por <literal>Dir::Etc::main</literal>, " -"finalmente aplicará las opciones de la línea de órdenes para reescribir la " -"directrices de la configuración, posiblemente cargando incluso más ficheros " -"de configuración." +"suite of tools, but by far not the only place changes to options can be " +"made. All tools therefore share the configuration files and also use a " +"common command line parser to provide a uniform environment." +msgstr "" + +#. type: Content of: <refentry><refsect1><orderedlist><para> +#: apt.conf.5.xml:45 +msgid "" +"When an APT tool starts up it will read the configuration files in the " +"following order:" +msgstr "" + +#. type: Content of: <refentry><refsect1><orderedlist><listitem><para> +#: apt.conf.5.xml:47 +msgid "" +"the file specified by the <envar>APT_CONFIG</envar> environment variable (if " +"any)" +msgstr "" + +#. type: Content of: <refentry><refsect1><orderedlist><listitem><para> +#: apt.conf.5.xml:49 +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." +msgstr "" + +#. type: Content of: <refentry><refsect1><orderedlist><listitem><para> +#: apt.conf.5.xml:54 +#, fuzzy +msgid "" +"the main configuration file specified by <literal>Dir::Etc::main</literal>" +msgstr "" +"Fichero de configuración de APT. Opción de Configuración: <literal>Dir::Etc::" +"Main</literal>." + +#. type: Content of: <refentry><refsect1><orderedlist><listitem><para> +#: apt.conf.5.xml:56 +msgid "" +"the command line options are applied to override the configuration " +"directives or to load even more configuration files." +msgstr "" + +#. type: Content of: <refentry><refsect1><title> +#: apt.conf.5.xml:60 +msgid "Syntax" +msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:50 +#: apt.conf.5.xml:61 #, fuzzy msgid "" "The configuration file is organized in a tree with options organized into " @@ -5329,7 +5396,7 @@ msgstr "" "Las opciones no son heredadas de sus grupos padres." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:56 +#: apt.conf.5.xml:67 msgid "" "Syntactically the configuration language is modeled after what the ISC tools " "such as bind and dhcp use. Lines starting with <literal>//</literal> are " @@ -5345,7 +5412,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><informalexample><programlisting> -#: apt.conf.5.xml:70 +#: apt.conf.5.xml:81 #, fuzzy, no-wrap msgid "" "APT {\n" @@ -5365,7 +5432,7 @@ msgstr "" "};\n" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:78 +#: apt.conf.5.xml:89 #, fuzzy msgid "" "with newlines placed to make it more readable. Lists can be created by " @@ -5379,7 +5446,7 @@ msgstr "" "punto y coma. <informalexample>" #. type: Content of: <refentry><refsect1><informalexample><programlisting> -#: apt.conf.5.xml:83 +#: apt.conf.5.xml:94 #, fuzzy, no-wrap msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n" msgstr "" @@ -5388,7 +5455,7 @@ msgstr "" "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:86 +#: apt.conf.5.xml:97 #, fuzzy msgid "" "In general the sample configuration file in <filename>&docdir;examples/apt." @@ -5399,14 +5466,14 @@ msgstr "" "entender su aspecto." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:90 +#: apt.conf.5.xml:101 msgid "" "The names of the configuration items are not case-sensitive. So in the " "previous example you could use <literal>dpkg::pre-install-pkgs</literal>." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:93 +#: apt.conf.5.xml:104 msgid "" "Names for the configuration items are optional if a list is defined as it " "can be see in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. " @@ -5416,7 +5483,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:98 +#: apt.conf.5.xml:109 #, fuzzy msgid "" "Two specials are allowed, <literal>#include</literal> (which is deprecated " @@ -5434,7 +5501,7 @@ msgstr "" "para suprimir la lista de nombres." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:106 +#: apt.conf.5.xml:117 msgid "" "The #clear command is the only way to delete a list or a complete scope. " "Reopening a scope or the ::-style described below will <emphasis>not</" @@ -5444,7 +5511,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:111 +#: apt.conf.5.xml:122 #, fuzzy msgid "" "All of the APT tools take a -o option which allows an arbitrary " @@ -5462,7 +5529,7 @@ msgstr "" "lista." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:118 +#: apt.conf.5.xml:129 msgid "" "Note that you can use :: only for appending one item per line to a list and " "that you should not use it in combination with the scope syntax. (The scope " @@ -5479,13 +5546,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:130 +#: apt.conf.5.xml:141 #, fuzzy msgid "The APT Group" msgstr "El grupo APT" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:131 +#: apt.conf.5.xml:142 #, fuzzy msgid "" "This group of options controls general APT behavior as well as holding the " @@ -5495,13 +5562,13 @@ msgstr "" "mantenimiento de las opciones para todas las utilidades." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:135 +#: apt.conf.5.xml:146 #, fuzzy msgid "Architecture" msgstr "Arquitectura" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:136 +#: apt.conf.5.xml:147 #, fuzzy msgid "" "System Architecture; sets the architecture to use when fetching files and " @@ -5513,12 +5580,12 @@ msgstr "" "la arquitectura para la que ha sido compilado apt." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:141 +#: apt.conf.5.xml:152 msgid "Default-Release" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:142 +#: apt.conf.5.xml:153 msgid "" "Default release to install packages from if more than one version available. " "Contains release name, codename or release version. Examples: 'stable', " @@ -5527,13 +5594,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:146 +#: apt.conf.5.xml:157 #, fuzzy msgid "Ignore-Hold" msgstr "Ignore-Hold" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:147 +#: apt.conf.5.xml:158 #, fuzzy msgid "" "Ignore Held packages; This global option causes the problem resolver to " @@ -5543,13 +5610,13 @@ msgstr "" "problemas ignore paquetes retenidos cuando tome decisiones." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:151 +#: apt.conf.5.xml:162 #, fuzzy msgid "Clean-Installed" msgstr "Clean-Installed" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:152 +#: apt.conf.5.xml:163 #, fuzzy msgid "" "Defaults to on. When turned on the autoclean feature will remove any " @@ -5564,13 +5631,13 @@ msgstr "" "para reinstalarlos." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:158 +#: apt.conf.5.xml:169 #, fuzzy msgid "Immediate-Configure" msgstr "Immediate-Configure" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:159 +#: apt.conf.5.xml:170 msgid "" "Defaults to on which will cause APT to install essential and important " "packages as fast as possible in the install/upgrade operation. This is done " @@ -5603,13 +5670,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:181 +#: apt.conf.5.xml:192 #, fuzzy msgid "Force-LoopBreak" msgstr "Force-LoopBreak" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:182 +#: apt.conf.5.xml:193 #, fuzzy msgid "" "Never Enable this option unless you -really- know what you are doing. It " @@ -5627,13 +5694,13 @@ msgstr "" "bash o cualquier otro del que dependan estos paquetes." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:190 +#: apt.conf.5.xml:201 #, fuzzy msgid "Cache-Limit" msgstr "Cache-Limit" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:191 +#: apt.conf.5.xml:202 #, fuzzy msgid "" "APT uses a fixed size memory mapped cache file to store the 'available' " @@ -5643,13 +5710,13 @@ msgstr "" "la información disponible. Esto fija el tamaño de esa caché." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:195 +#: apt.conf.5.xml:206 #, fuzzy msgid "Build-Essential" msgstr "Build-Essential" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:196 +#: apt.conf.5.xml:207 #, fuzzy msgid "Defines which package(s) are considered essential build dependencies." msgstr "" @@ -5657,13 +5724,13 @@ msgstr "" "esenciales." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:199 +#: apt.conf.5.xml:210 #, fuzzy msgid "Get" msgstr "Get" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:200 +#: apt.conf.5.xml:211 #, fuzzy msgid "" "The Get subsection controls the &apt-get; tool, please see its documentation " @@ -5673,13 +5740,13 @@ msgstr "" "documentación para más información sobre esta opción." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:204 +#: apt.conf.5.xml:215 #, fuzzy msgid "Cache" msgstr "check" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:205 +#: apt.conf.5.xml:216 #, fuzzy msgid "" "The Cache subsection controls the &apt-cache; tool, please see its " @@ -5689,13 +5756,13 @@ msgstr "" "documentación para más información sobre esta opción." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:209 +#: apt.conf.5.xml:220 #, fuzzy msgid "CDROM" msgstr "CDROM" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:210 +#: apt.conf.5.xml:221 #, fuzzy msgid "" "The CDROM subsection controls the &apt-cdrom; tool, please see its " @@ -5705,25 +5772,25 @@ msgstr "" "documentación para más información sobre esta opción." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:216 +#: apt.conf.5.xml:227 #, fuzzy msgid "The Acquire Group" msgstr "El grupo Acquire" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:221 +#: apt.conf.5.xml:232 msgid "PDiffs" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:222 +#: apt.conf.5.xml:233 msgid "" "Try to download deltas called <literal>PDiffs</literal> for Packages or " "Sources files instead of downloading whole ones. True by default." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:225 +#: apt.conf.5.xml:236 msgid "" "Two sub-options to limit the use of PDiffs are also available: With " "<literal>FileLimit</literal> can be specified how many PDiff files are " @@ -5734,13 +5801,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:234 +#: apt.conf.5.xml:245 #, fuzzy msgid "Queue-Mode" msgstr "Queue-Mode" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:235 +#: apt.conf.5.xml:246 #, fuzzy msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</" @@ -5756,13 +5823,13 @@ msgstr "" "será abierta una conexión por cada tipo de URI." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:242 +#: apt.conf.5.xml:253 #, fuzzy msgid "Retries" msgstr "Retries" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:243 +#: apt.conf.5.xml:254 #, fuzzy msgid "" "Number of retries to perform. If this is non-zero APT will retry failed " @@ -5772,13 +5839,13 @@ msgstr "" "los ficheros fallidos el número de veces dado." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:247 +#: apt.conf.5.xml:258 #, fuzzy msgid "Source-Symlinks" msgstr "Source-Symlinks" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:248 +#: apt.conf.5.xml:259 #, fuzzy msgid "" "Use symlinks for source archives. If set to true then source archives will " @@ -5788,13 +5855,13 @@ msgstr "" "fuente se enlazarán a ser posible, en vez de copiarse. Por omisión es true." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:252 sources.list.5.xml:139 +#: apt.conf.5.xml:263 sources.list.5.xml:139 #, fuzzy msgid "http" msgstr "http" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:253 +#: apt.conf.5.xml:264 #, fuzzy msgid "" "HTTP URIs; http::Proxy is the default http proxy to use. It is in the " @@ -5812,7 +5879,7 @@ msgstr "" "de entorno <envar>http_proxy</envar> modifica todas las preferencias." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:261 +#: apt.conf.5.xml:272 #, fuzzy msgid "" "Three settings are provided for cache control with HTTP/1.1 compliant proxy " @@ -5837,7 +5904,7 @@ msgstr "" "Nota: Squid 2.0.2 no soporta ninguna de estas opciones." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:271 apt.conf.5.xml:335 +#: apt.conf.5.xml:282 apt.conf.5.xml:346 #, fuzzy msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " @@ -5849,7 +5916,7 @@ msgstr "" "realizar la conexión y para recibir datos." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:274 +#: apt.conf.5.xml:285 #, fuzzy msgid "" "One setting is provided to control the pipeline depth in cases where the " @@ -5869,7 +5936,7 @@ msgstr "" "necesiten esto violan el RFC 2068." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:282 +#: apt.conf.5.xml:293 msgid "" "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</" "literal> which accepts integer values in kilobyte. The default value is 0 " @@ -5879,7 +5946,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:287 +#: apt.conf.5.xml:298 msgid "" "<literal>Acquire::http::User-Agent</literal> can be used to set a different " "User-Agent for the http download method as some proxies allow access for " @@ -5887,13 +5954,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:293 +#: apt.conf.5.xml:304 #, fuzzy msgid "https" msgstr "http" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:294 +#: apt.conf.5.xml:305 msgid "" "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy " "options are the same as for <literal>http</literal> method and will also " @@ -5903,7 +5970,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:300 +#: apt.conf.5.xml:311 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is " @@ -5924,13 +5991,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:318 sources.list.5.xml:150 +#: apt.conf.5.xml:329 sources.list.5.xml:150 #, fuzzy msgid "ftp" msgstr "ftp" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:319 +#: apt.conf.5.xml:330 #, fuzzy msgid "" "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard " @@ -5962,7 +6029,7 @@ msgstr "" "de la URI correspondiente." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:338 +#: apt.conf.5.xml:349 #, fuzzy msgid "" "Several settings are provided to control passive mode. Generally it is safe " @@ -5979,7 +6046,7 @@ msgstr "" "fichero de configuración de muestra para ver ejemplos)." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:345 +#: apt.conf.5.xml:356 #, fuzzy msgid "" "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</" @@ -5994,7 +6061,7 @@ msgstr "" "eficiencia." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:350 +#: apt.conf.5.xml:361 #, fuzzy msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " @@ -6010,19 +6077,19 @@ msgstr "" "la mayoría de los servidores FTP no soportan RFC2428." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:357 sources.list.5.xml:132 +#: apt.conf.5.xml:368 sources.list.5.xml:132 #, fuzzy msgid "cdrom" msgstr "apt-cdrom" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:363 +#: apt.conf.5.xml:374 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:358 +#: apt.conf.5.xml:369 #, fuzzy msgid "" "CDROM URIs; the only setting for CDROM URIs is the mount point, " @@ -6042,12 +6109,12 @@ msgstr "" "antiguas). Respecto a la sintaxis se pone" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:368 +#: apt.conf.5.xml:379 msgid "gpgv" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:369 +#: apt.conf.5.xml:380 msgid "" "GPGV URIs; the only option for GPGV URIs is the option to pass additional " "parameters to gpgv. <literal>gpgv::Options</literal> Additional options " @@ -6055,18 +6122,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:374 +#: apt.conf.5.xml:385 msgid "CompressionTypes" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:380 +#: apt.conf.5.xml:391 #, no-wrap msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:375 +#: apt.conf.5.xml:386 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@ -6078,19 +6145,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:385 +#: apt.conf.5.xml:396 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:388 +#: apt.conf.5.xml:399 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:381 +#: apt.conf.5.xml:392 msgid "" "Also the <literal>Order</literal> subgroup can be used to define in which " "order the acquire system will try to download the compressed files. The " @@ -6107,13 +6174,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:392 +#: apt.conf.5.xml:403 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:390 +#: apt.conf.5.xml:401 msgid "" "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" "replaceable></literal> will be checked: If this setting exists the method " @@ -6128,7 +6195,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:397 +#: apt.conf.5.xml:408 msgid "" "While it is possible to add an empty compression type to the order list, but " "APT in its current version doesn't understand it correctly and will display " @@ -6138,12 +6205,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:403 +#: apt.conf.5.xml:414 msgid "Languages" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:404 +#: apt.conf.5.xml:415 msgid "" "The Languages subsection controls which <filename>Translation</filename> " "files are downloaded and in which order APT tries to display the Description-" @@ -6156,13 +6223,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting> -#: apt.conf.5.xml:420 +#: apt.conf.5.xml:431 #, no-wrap msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:410 +#: apt.conf.5.xml:421 msgid "" "The default list includes \"environment\" and \"en\". " "\"<literal>environment</literal>\" has a special meaning here: It will be " @@ -6185,7 +6252,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:217 +#: apt.conf.5.xml:228 #, fuzzy msgid "" "The <literal>Acquire</literal> group of options controls the download of " @@ -6195,13 +6262,13 @@ msgstr "" "paquetes y los manejadores de URI." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:427 +#: apt.conf.5.xml:438 #, fuzzy msgid "Directories" msgstr "Directorios" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:429 +#: apt.conf.5.xml:440 #, fuzzy msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " @@ -6222,7 +6289,7 @@ msgstr "" "filename> o <filename>./</filename>." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:436 +#: apt.conf.5.xml:447 #, fuzzy msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " @@ -6244,7 +6311,7 @@ msgstr "" "literal> el directorio predeterminado está en <literal>Dir::Cache</literal>" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:445 +#: apt.conf.5.xml:456 #, fuzzy msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " @@ -6261,7 +6328,7 @@ msgstr "" "envar>)." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:451 +#: apt.conf.5.xml:462 #, fuzzy msgid "" "The <literal>Dir::Parts</literal> setting reads in all the config fragments " @@ -6273,7 +6340,7 @@ msgstr "" "esto se carga el fichero principal de configuración." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:455 +#: apt.conf.5.xml:466 #, fuzzy msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" @@ -6291,7 +6358,7 @@ msgstr "" "respectivos programas." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:463 +#: apt.conf.5.xml:474 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@ -6304,13 +6371,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:476 +#: apt.conf.5.xml:487 #, fuzzy msgid "APT in DSelect" msgstr "APT con DSelect" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:478 +#: apt.conf.5.xml:489 #, fuzzy msgid "" "When APT is used as a &dselect; method several configuration directives " @@ -6322,13 +6389,13 @@ msgstr "" "la sección <literal>DSelect</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:482 +#: apt.conf.5.xml:493 #, fuzzy msgid "Clean" msgstr "clean" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:483 +#: apt.conf.5.xml:494 #, fuzzy msgid "" "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto " @@ -6346,7 +6413,7 @@ msgstr "" "descargar los paquetes nuevos." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:492 +#: apt.conf.5.xml:503 #, fuzzy msgid "" "The contents of this variable is passed to &apt-get; as command line options " @@ -6356,13 +6423,13 @@ msgstr "" "ordenes cuando se ejecuta en la fase de instalación." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:496 +#: apt.conf.5.xml:507 #, fuzzy msgid "Updateoptions" msgstr "Opciones" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:497 +#: apt.conf.5.xml:508 #, fuzzy msgid "" "The contents of this variable is passed to &apt-get; as command line options " @@ -6372,13 +6439,13 @@ msgstr "" "ordenes cuando se ejecuta en la fase de actualización." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:501 +#: apt.conf.5.xml:512 #, fuzzy msgid "PromptAfterUpdate" msgstr "PromptAfterUpdate" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:502 +#: apt.conf.5.xml:513 #, fuzzy msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " @@ -6388,13 +6455,13 @@ msgstr "" "continuar. Por omisión sólo pregunta en caso de error." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:508 +#: apt.conf.5.xml:519 #, fuzzy msgid "How APT calls dpkg" msgstr "Como APT llama a dpkg" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:509 +#: apt.conf.5.xml:520 #, fuzzy msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " @@ -6404,7 +6471,7 @@ msgstr "" "encuentran en la sección <literal>DPkg</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:514 +#: apt.conf.5.xml:525 #, fuzzy msgid "" "This is a list of options to pass to dpkg. The options must be specified " @@ -6416,19 +6483,19 @@ msgstr "" "como un sólo argumento." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:519 +#: apt.conf.5.xml:530 #, fuzzy msgid "Pre-Invoke" msgstr "Pre-Invoke" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:519 +#: apt.conf.5.xml:530 #, fuzzy msgid "Post-Invoke" msgstr "Post-Invoke" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:520 +#: apt.conf.5.xml:531 #, fuzzy msgid "" "This is a list of shell commands to run before/after invoking &dpkg;. Like " @@ -6442,13 +6509,13 @@ msgstr "" "si alguna falla APT abortará." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:526 +#: apt.conf.5.xml:537 #, fuzzy msgid "Pre-Install-Pkgs" msgstr "Pre-Install-Pkgs" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:527 +#: apt.conf.5.xml:538 #, fuzzy msgid "" "This is a list of shell commands to run before invoking dpkg. Like " @@ -6464,7 +6531,7 @@ msgstr "" "todos los .deb que va ha instalar por la entrada estándar, uno por línea." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:533 +#: apt.conf.5.xml:544 #, fuzzy msgid "" "Version 2 of this protocol dumps more information, including the protocol " @@ -6480,13 +6547,13 @@ msgstr "" "dada a <literal>Pre-Install-Pkgs</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:540 +#: apt.conf.5.xml:551 #, fuzzy msgid "Run-Directory" msgstr "Run-Directory" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:541 +#: apt.conf.5.xml:552 #, fuzzy msgid "" "APT chdirs to this directory before invoking dpkg, the default is <filename>/" @@ -6496,13 +6563,13 @@ msgstr "" "omisión es <filename>/</filename>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:545 +#: apt.conf.5.xml:556 #, fuzzy msgid "Build-options" msgstr "Opciones" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:546 +#: apt.conf.5.xml:557 #, fuzzy msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages, the " @@ -6513,12 +6580,12 @@ msgstr "" "binarios." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt.conf.5.xml:551 +#: apt.conf.5.xml:562 msgid "dpkg trigger usage (and related options)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:552 +#: apt.conf.5.xml:563 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 " @@ -6533,7 +6600,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:567 +#: apt.conf.5.xml:578 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@ -6543,7 +6610,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:561 +#: apt.conf.5.xml:572 msgid "" "Note that it is not guaranteed that APT will support these options or that " "these options will not cause (big) trouble in the future. If you have " @@ -6557,12 +6624,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:573 +#: apt.conf.5.xml:584 msgid "DPkg::NoTriggers" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:574 +#: apt.conf.5.xml:585 msgid "" "Add the no triggers flag to all dpkg calls (except the ConfigurePending " "call). See &dpkg; if you are interested in what this actually means. In " @@ -6574,12 +6641,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:581 +#: apt.conf.5.xml:592 msgid "PackageManager::Configure" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:582 +#: apt.conf.5.xml:593 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@ -6595,12 +6662,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:592 +#: apt.conf.5.xml:603 msgid "DPkg::ConfigurePending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:593 +#: apt.conf.5.xml:604 msgid "" "If this option is set apt will call <command>dpkg --configure --pending</" "command> to let dpkg handle all required configurations and triggers. This " @@ -6611,12 +6678,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:599 +#: apt.conf.5.xml:610 msgid "DPkg::TriggersPending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:600 +#: apt.conf.5.xml:611 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@ -6626,12 +6693,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:605 +#: apt.conf.5.xml:616 msgid "PackageManager::UnpackAll" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:606 +#: apt.conf.5.xml:617 msgid "" "As the configuration can be deferred to be done at the end by dpkg it can be " "tried to order the unpack series only by critical needs, e.g. by Pre-" @@ -6643,12 +6710,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:613 +#: apt.conf.5.xml:624 msgid "OrderList::Score::Immediate" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:621 +#: apt.conf.5.xml:632 #, no-wrap msgid "" "OrderList::Score {\n" @@ -6660,7 +6727,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:614 +#: apt.conf.5.xml:625 msgid "" "Essential packages (and there dependencies) should be configured immediately " "after unpacking. It will be a good idea to do this quite early in the " @@ -6674,12 +6741,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:634 +#: apt.conf.5.xml:645 msgid "Periodic and Archives options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:635 +#: apt.conf.5.xml:646 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@ -6688,13 +6755,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:643 +#: apt.conf.5.xml:654 #, fuzzy msgid "Debug options" msgstr "Opciones" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:645 +#: apt.conf.5.xml:656 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -6705,7 +6772,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:656 +#: apt.conf.5.xml:667 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@ -6713,7 +6780,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:664 +#: apt.conf.5.xml:675 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@ -6721,7 +6788,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:673 +#: apt.conf.5.xml:684 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -6731,120 +6798,120 @@ msgstr "" #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:681 +#: apt.conf.5.xml:692 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CDROM IDs." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:691 +#: apt.conf.5.xml:702 msgid "A full list of debugging options to apt follows." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:696 +#: apt.conf.5.xml:707 #, fuzzy msgid "<literal>Debug::Acquire::cdrom</literal>" msgstr "La línea <literal>Archive:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:700 +#: apt.conf.5.xml:711 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:707 +#: apt.conf.5.xml:718 #, fuzzy msgid "<literal>Debug::Acquire::ftp</literal>" msgstr "La línea <literal>Archive:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:711 +#: apt.conf.5.xml:722 msgid "Print information related to downloading packages using FTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:718 +#: apt.conf.5.xml:729 #, fuzzy msgid "<literal>Debug::Acquire::http</literal>" msgstr "La línea <literal>Archive:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:722 +#: apt.conf.5.xml:733 msgid "Print information related to downloading packages using HTTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:729 +#: apt.conf.5.xml:740 #, fuzzy msgid "<literal>Debug::Acquire::https</literal>" msgstr "La línea <literal>Archive:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:733 +#: apt.conf.5.xml:744 msgid "Print information related to downloading packages using HTTPS." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:740 +#: apt.conf.5.xml:751 #, fuzzy msgid "<literal>Debug::Acquire::gpgv</literal>" msgstr "La línea <literal>Archive:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:744 +#: apt.conf.5.xml:755 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:751 +#: apt.conf.5.xml:762 #, fuzzy msgid "<literal>Debug::aptcdrom</literal>" msgstr "La línea <literal>Version:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:755 +#: apt.conf.5.xml:766 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:762 +#: apt.conf.5.xml:773 #, fuzzy msgid "<literal>Debug::BuildDeps</literal>" msgstr "La línea <literal>Label:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:765 +#: apt.conf.5.xml:776 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:772 +#: apt.conf.5.xml:783 #, fuzzy msgid "<literal>Debug::Hashes</literal>" msgstr "La línea <literal>Label:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:775 +#: apt.conf.5.xml:786 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:782 +#: apt.conf.5.xml:793 #, fuzzy msgid "<literal>Debug::IdentCDROM</literal>" msgstr "La línea <literal>Label:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:785 +#: apt.conf.5.xml:796 msgid "" "Do not include information from <literal>statfs</literal>, namely the number " "of used and free blocks on the CD-ROM filesystem, when generating an ID for " @@ -6852,99 +6919,99 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:793 +#: apt.conf.5.xml:804 #, fuzzy msgid "<literal>Debug::NoLocking</literal>" msgstr "La línea <literal>Origin:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:796 +#: apt.conf.5.xml:807 msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:804 +#: apt.conf.5.xml:815 #, fuzzy msgid "<literal>Debug::pkgAcquire</literal>" msgstr "La línea <literal>Archive:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:808 +#: apt.conf.5.xml:819 msgid "Log when items are added to or removed from the global download queue." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:815 +#: apt.conf.5.xml:826 #, fuzzy msgid "<literal>Debug::pkgAcquire::Auth</literal>" msgstr "La línea <literal>Archive:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:818 +#: apt.conf.5.xml:829 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:825 +#: apt.conf.5.xml:836 #, fuzzy msgid "<literal>Debug::pkgAcquire::Diffs</literal>" msgstr "La línea <literal>Archive:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:828 +#: apt.conf.5.xml:839 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:836 +#: apt.conf.5.xml:847 #, fuzzy msgid "<literal>Debug::pkgAcquire::RRed</literal>" msgstr "La línea <literal>Archive:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:840 +#: apt.conf.5.xml:851 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:847 +#: apt.conf.5.xml:858 #, fuzzy msgid "<literal>Debug::pkgAcquire::Worker</literal>" msgstr "La línea <literal>Archive:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:851 +#: apt.conf.5.xml:862 msgid "" "Log all interactions with the sub-processes that actually perform downloads." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:858 +#: apt.conf.5.xml:869 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:862 +#: apt.conf.5.xml:873 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:869 +#: apt.conf.5.xml:880 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:872 +#: apt.conf.5.xml:883 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@ -6954,12 +7021,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:883 +#: apt.conf.5.xml:894 msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:886 +#: apt.conf.5.xml:897 msgid "" "Generate debug messages describing which package is marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@ -6976,96 +7043,96 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:905 +#: apt.conf.5.xml:916 #, fuzzy msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "La línea <literal>Version:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:908 +#: apt.conf.5.xml:919 msgid "Dump the default configuration to standard error on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:915 +#: apt.conf.5.xml:926 #, fuzzy msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "La línea <literal>Package:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:918 +#: apt.conf.5.xml:929 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:926 +#: apt.conf.5.xml:937 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:929 +#: apt.conf.5.xml:940 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:936 +#: apt.conf.5.xml:947 #, fuzzy msgid "<literal>Debug::pkgOrderList</literal>" msgstr "La línea <literal>Origin:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:940 +#: apt.conf.5.xml:951 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:948 +#: apt.conf.5.xml:959 #, fuzzy msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "La línea <literal>Package:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:952 +#: apt.conf.5.xml:963 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:959 +#: apt.conf.5.xml:970 #, fuzzy msgid "<literal>Debug::pkgPolicy</literal>" msgstr "La línea <literal>Label:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:963 +#: apt.conf.5.xml:974 msgid "Output the priority of each package list on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:969 +#: apt.conf.5.xml:980 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:973 +#: apt.conf.5.xml:984 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:981 +#: apt.conf.5.xml:992 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:984 +#: apt.conf.5.xml:995 msgid "" "Display a list of all installed packages with their calculated score used by " "the pkgProblemResolver. The description of the package is the same as " @@ -7073,20 +7140,20 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:992 +#: apt.conf.5.xml:1003 #, fuzzy msgid "<literal>Debug::sourceList</literal>" msgstr "La línea <literal>Version:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:996 +#: apt.conf.5.xml:1007 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1019 +#: apt.conf.5.xml:1030 #, fuzzy msgid "" "&configureindex; is a configuration file showing example values for all " @@ -7096,14 +7163,14 @@ msgstr "" "los valores predeterminados para todas las opciones posibles." #. type: Content of: <refentry><refsect1><variablelist> -#: apt.conf.5.xml:1026 +#: apt.conf.5.xml:1037 #, fuzzy msgid "&file-aptconf;" msgstr "apt-cdrom" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1031 +#: apt.conf.5.xml:1042 #, fuzzy msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-cache; &apt-conf;" @@ -7175,14 +7242,25 @@ msgstr "" "listado primero en el fichero &sources-list;. El fichero de preferencias de " "APT no modifica la elección del ejemplar, sólo la elección de la versión." -#. type: Content of: <refentry><refsect1><refsect2><title> +#. type: Content of: <refentry><refsect1><para> #: apt_preferences.5.xml:56 +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." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt_preferences.5.xml:63 #, fuzzy msgid "APT's Default Priority Assignments" msgstr "¿Cómo asigna APT las prioridades?" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:71 +#: apt_preferences.5.xml:78 #, fuzzy, no-wrap msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n" msgstr "" @@ -7190,7 +7268,7 @@ msgstr "" "<command>apt-get install -t testing <replaceable>paquete</replaceable></command>\n" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:74 +#: apt_preferences.5.xml:81 #, fuzzy, no-wrap msgid "APT::Default-Release \"stable\";\n" msgstr "" @@ -7198,7 +7276,7 @@ msgstr "" "APT::Default-Release \"stable\";\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:58 +#: apt_preferences.5.xml:65 #, fuzzy msgid "" "If there is no preferences file or if there is no entry in the file that " @@ -7223,25 +7301,25 @@ msgstr "" "(<filename>/etc/apt/apt.conf</filename>). Por ejemplo," #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:83 +#: apt_preferences.5.xml:90 #, fuzzy msgid "priority 100" msgstr "prioridad 100" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:84 +#: apt_preferences.5.xml:91 #, fuzzy msgid "to the version that is already installed (if any)." msgstr "a la versión instalada (si existe)." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:88 +#: apt_preferences.5.xml:95 #, fuzzy msgid "priority 500" msgstr "prioridad 500" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:89 +#: apt_preferences.5.xml:96 #, fuzzy msgid "" "to the versions that are not installed and do not belong to the target " @@ -7250,13 +7328,13 @@ msgstr "" "a la versión que ni está instalada ni pertenece a la distribución objetivo." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:93 +#: apt_preferences.5.xml:100 #, fuzzy msgid "priority 990" msgstr "prioridad 990" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:94 +#: apt_preferences.5.xml:101 #, fuzzy msgid "" "to the versions that are not installed and belong to the target release." @@ -7265,7 +7343,7 @@ msgstr "" "distribución objetivo." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:78 +#: apt_preferences.5.xml:85 #, fuzzy msgid "" "If the target release has been specified then APT uses the following " @@ -7277,7 +7355,7 @@ msgstr "" "Asigna:" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:99 +#: apt_preferences.5.xml:106 #, fuzzy msgid "" "If the target release has not been specified then APT simply assigns " @@ -7288,7 +7366,7 @@ msgstr "" "todas las versiones de los paquetes instalados y 500 al resto." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:103 +#: apt_preferences.5.xml:110 #, fuzzy msgid "" "APT then applies the following rules, listed in order of precedence, to " @@ -7298,7 +7376,7 @@ msgstr "" "determinar qué versión del paquete debe instalar." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:106 +#: apt_preferences.5.xml:113 #, fuzzy msgid "" "Never downgrade unless the priority of an available version exceeds 1000. " @@ -7315,13 +7393,13 @@ msgstr "" "ser peligroso)." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:112 +#: apt_preferences.5.xml:119 #, fuzzy msgid "Install the highest priority version." msgstr "Instalar la versión de mayor prioridad." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:113 +#: apt_preferences.5.xml:120 #, fuzzy msgid "" "If two or more versions have the same priority, install the most recent one " @@ -7331,7 +7409,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:116 +#: apt_preferences.5.xml:123 #, fuzzy msgid "" "If two or more versions have the same priority and version number but either " @@ -7343,7 +7421,7 @@ msgstr "" "<literal>--reinstall</literal> se instala la que no está instalada." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:122 +#: apt_preferences.5.xml:129 #, fuzzy msgid "" "In a typical situation, the installed version of a package (priority 100) " @@ -7359,7 +7437,7 @@ msgstr "" "get upgrade</command>." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:129 +#: apt_preferences.5.xml:136 #, fuzzy msgid "" "More rarely, the installed version of a package is <emphasis>more</emphasis> " @@ -7374,7 +7452,7 @@ msgstr "" "get upgrade</command>." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:134 +#: apt_preferences.5.xml:141 #, fuzzy msgid "" "Sometimes the installed version of a package is more recent than the version " @@ -7394,13 +7472,13 @@ msgstr "" "mayor que la versión instalada." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:143 +#: apt_preferences.5.xml:150 #, fuzzy 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:145 +#: apt_preferences.5.xml:152 #, fuzzy msgid "" "The APT preferences file allows the system administrator to control the " @@ -7414,7 +7492,7 @@ msgstr "" "registros pueden tener una o dos formas: una específica y otra general." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:151 +#: apt_preferences.5.xml:158 #, fuzzy msgid "" "The specific form assigns a priority (a \"Pin-Priority\") to one or more " @@ -7430,7 +7508,7 @@ msgstr "" "\"<literal>5.8</literal>\"." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:158 +#: apt_preferences.5.xml:165 #, fuzzy, no-wrap msgid "" "Package: perl\n" @@ -7443,7 +7521,7 @@ msgstr "" "Pin-Priority: 1001\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:164 +#: apt_preferences.5.xml:171 #, fuzzy msgid "" "The general form assigns a priority to all of the package versions in a " @@ -7459,7 +7537,7 @@ msgstr "" "nombre de dominio." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:170 +#: apt_preferences.5.xml:177 #, fuzzy msgid "" "This general-form entry in the APT preferences file applies only to groups " @@ -7471,7 +7549,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:175 +#: apt_preferences.5.xml:182 #, fuzzy, no-wrap msgid "" "Package: *\n" @@ -7484,7 +7562,7 @@ msgstr "" "Pin-Priority: 999\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:180 +#: apt_preferences.5.xml:187 #, fuzzy msgid "" "A note of caution: the keyword used here is \"<literal>origin</literal>\". " @@ -7501,7 +7579,7 @@ msgstr "" "\"Debian\" o \"Ximian\"." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:186 +#: apt_preferences.5.xml:193 #, fuzzy msgid "" "The following record assigns a low priority to all package versions " @@ -7513,7 +7591,7 @@ msgstr "" "Archivo \"<literal>unstable</literal>\"." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:190 +#: apt_preferences.5.xml:197 #, fuzzy, no-wrap msgid "" "Package: *\n" @@ -7526,7 +7604,7 @@ msgstr "" "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:195 +#: apt_preferences.5.xml:202 #, fuzzy msgid "" "The following record assigns a high priority to all package versions " @@ -7538,7 +7616,7 @@ msgstr "" "Archivo \"<literal>unstable</literal>\"." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:199 +#: apt_preferences.5.xml:206 #, fuzzy, no-wrap msgid "" "Package: *\n" @@ -7551,7 +7629,7 @@ msgstr "" "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:204 +#: apt_preferences.5.xml:211 #, fuzzy msgid "" "The following record assigns a high priority to all package versions " @@ -7564,7 +7642,7 @@ msgstr "" "literal>\"." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:209 +#: apt_preferences.5.xml:216 #, fuzzy, no-wrap msgid "" "Package: *\n" @@ -7577,19 +7655,19 @@ msgstr "" "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:220 +#: apt_preferences.5.xml:227 #, fuzzy 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:228 +#: apt_preferences.5.xml:235 #, fuzzy msgid "P > 1000" msgstr "P > 1000" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:229 +#: apt_preferences.5.xml:236 #, fuzzy msgid "" "causes a version to be installed even if this constitutes a downgrade of the " @@ -7599,13 +7677,13 @@ msgstr "" "el sistema." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:233 +#: apt_preferences.5.xml:240 #, fuzzy msgid "990 < P <=1000" msgstr "990 < P <=1000" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:234 +#: apt_preferences.5.xml:241 #, fuzzy msgid "" "causes a version to be installed even if it does not come from the target " @@ -7615,13 +7693,13 @@ msgstr "" "que la versión instalada sea más reciente." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:239 +#: apt_preferences.5.xml:246 #, fuzzy msgid "500 < P <=990" msgstr "500 < P <=990" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:240 +#: apt_preferences.5.xml:247 #, fuzzy msgid "" "causes a version to be installed unless there is a version available " @@ -7632,13 +7710,13 @@ msgstr "" "reciente." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:245 +#: apt_preferences.5.xml:252 #, fuzzy msgid "100 < P <=500" msgstr "100 < P <=500" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:246 +#: apt_preferences.5.xml:253 #, fuzzy msgid "" "causes a version to be installed unless there is a version available " @@ -7648,13 +7726,13 @@ msgstr "" "distribución o la versión instalada sea más reciente." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:251 +#: apt_preferences.5.xml:258 #, fuzzy msgid "0 < P <=100" msgstr "0 < P <=100" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:252 +#: apt_preferences.5.xml:259 #, fuzzy msgid "" "causes a version to be installed only if there is no installed version of " @@ -7663,19 +7741,19 @@ msgstr "" "la versión sólo se instala si no hay ninguna versión del paquete instalado." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:256 +#: apt_preferences.5.xml:263 #, fuzzy msgid "P < 0" msgstr "P < 0" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:257 +#: apt_preferences.5.xml:264 #, fuzzy msgid "prevents the version from being installed" msgstr "la versión nunca se instala." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:223 +#: apt_preferences.5.xml:230 #, fuzzy msgid "" "Priorities (P) assigned in the APT preferences file must be positive or " @@ -7686,7 +7764,7 @@ msgstr "" "números enteros. Se interpretan (en general) del siguiente modo:" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:262 +#: apt_preferences.5.xml:269 #, fuzzy msgid "" "If any specific-form records match an available package version then the " @@ -7701,7 +7779,7 @@ msgstr "" "prioridad de la versión del paquete." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:268 +#: apt_preferences.5.xml:275 #, fuzzy msgid "" "For example, suppose the APT preferences file contains the three records " @@ -7711,7 +7789,7 @@ msgstr "" "registros antes mencionados:" #. type: Content of: <refentry><refsect1><refsect2><programlisting> -#: apt_preferences.5.xml:272 +#: apt_preferences.5.xml:279 #, fuzzy, no-wrap msgid "" "Package: perl\n" @@ -7740,12 +7818,12 @@ msgstr "" "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:285 +#: apt_preferences.5.xml:292 msgid "Then:" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:287 +#: apt_preferences.5.xml:294 #, fuzzy msgid "" "The most recent available version of the <literal>perl</literal> package " @@ -7761,7 +7839,7 @@ msgstr "" "entonces se instala la versión5.8*." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:292 +#: apt_preferences.5.xml:299 #, fuzzy msgid "" "A version of any package other than <literal>perl</literal> that is " @@ -7773,7 +7851,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:296 +#: apt_preferences.5.xml:303 #, fuzzy msgid "" "A version of a package whose origin is not the local system but some other " @@ -7787,7 +7865,7 @@ msgstr "" "versión del paquete instalado." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:306 +#: apt_preferences.5.xml:313 #, fuzzy msgid "Determination of Package Version and Distribution Properties" msgstr "" @@ -7795,7 +7873,7 @@ msgstr "" "distribución" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:308 +#: apt_preferences.5.xml:315 #, fuzzy msgid "" "The locations listed in the &sources-list; file should provide " @@ -7807,31 +7885,31 @@ 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:320 +#: apt_preferences.5.xml:327 #, fuzzy 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:321 +#: apt_preferences.5.xml:328 #, fuzzy 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:324 apt_preferences.5.xml:374 +#: apt_preferences.5.xml:331 apt_preferences.5.xml:381 #, fuzzy 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:325 +#: apt_preferences.5.xml:332 #, fuzzy 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:312 +#: apt_preferences.5.xml:319 #, fuzzy msgid "" "The <filename>Packages</filename> file is normally found in the directory " @@ -7853,13 +7931,13 @@ msgstr "" "cada registro:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:341 +#: apt_preferences.5.xml:348 #, fuzzy msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line" msgstr "La línea <literal>Archive:</literal> " #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:342 +#: apt_preferences.5.xml:349 #, fuzzy msgid "" "names the archive to which all the packages in the directory tree belong. " @@ -7878,7 +7956,7 @@ msgstr "" "preferencias de APT:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:352 +#: apt_preferences.5.xml:359 #, fuzzy, no-wrap msgid "Pin: release a=stable\n" msgstr "" @@ -7886,13 +7964,13 @@ msgstr "" "Pin: release a=stable\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:358 +#: apt_preferences.5.xml:365 #, fuzzy msgid "the <literal>Codename:</literal> line" msgstr "La línea <literal>Component:</literal> " #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:359 +#: apt_preferences.5.xml:366 #, fuzzy msgid "" "names the codename to which all the packages in the directory tree belong. " @@ -7910,13 +7988,13 @@ msgstr "" "preferencias de APT:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:368 +#: apt_preferences.5.xml:375 #, no-wrap msgid "Pin: release n=squeeze\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:375 +#: apt_preferences.5.xml:382 #, fuzzy msgid "" "names the release version. For example, the packages in the tree might " @@ -7933,7 +8011,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:384 +#: apt_preferences.5.xml:391 #, fuzzy, no-wrap msgid "" "Pin: release v=3.0\n" @@ -7946,13 +8024,13 @@ msgstr "" "Pin: release 3.0\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:393 +#: apt_preferences.5.xml:400 #, fuzzy 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:394 +#: apt_preferences.5.xml:401 #, fuzzy msgid "" "names the licensing component associated with the packages in the directory " @@ -7971,7 +8049,7 @@ msgstr "" "de APT:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:403 +#: apt_preferences.5.xml:410 #, fuzzy, no-wrap msgid "Pin: release c=main\n" msgstr "" @@ -7979,13 +8057,13 @@ msgstr "" "Pin: release c=main\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:409 +#: apt_preferences.5.xml:416 #, fuzzy 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:410 +#: apt_preferences.5.xml:417 #, fuzzy msgid "" "names the originator of the packages in the directory tree of the " @@ -7999,7 +8077,7 @@ msgstr "" "tendrá que poner la siguiente línea en el fichero de preferencias de APT:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:416 +#: apt_preferences.5.xml:423 #, fuzzy, no-wrap msgid "Pin: release o=Debian\n" msgstr "" @@ -8007,13 +8085,13 @@ msgstr "" "Pin: release o=Debian\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:422 +#: apt_preferences.5.xml:429 #, fuzzy 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:423 +#: apt_preferences.5.xml:430 #, fuzzy msgid "" "names the label of the packages in the directory tree of the " @@ -8027,7 +8105,7 @@ msgstr "" "la siguiente línea en el fichero de preferencias de APT:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:429 +#: apt_preferences.5.xml:436 #, fuzzy, no-wrap msgid "Pin: release l=Debian\n" msgstr "" @@ -8035,7 +8113,7 @@ msgstr "" "Pin: release l=Debian\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:330 +#: apt_preferences.5.xml:337 #, fuzzy msgid "" "The <filename>Release</filename> file is normally found in the directory " @@ -8057,7 +8135,7 @@ msgstr "" "<filename>Release</filename> son relevantes para las prioridades de APT:" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:436 +#: apt_preferences.5.xml:443 #, fuzzy msgid "" "All of the <filename>Packages</filename> and <filename>Release</filename> " @@ -8083,13 +8161,13 @@ msgstr "" "la distribución <literal>inestable</literal>." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:449 +#: apt_preferences.5.xml:456 #, fuzzy msgid "Optional Lines in an APT Preferences Record" msgstr "Líneas opcionales en un registro de preferencias de APT" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:451 +#: apt_preferences.5.xml:458 #, fuzzy msgid "" "Each record in the APT preferences file can optionally begin with one or " @@ -8101,7 +8179,7 @@ msgstr "" "Útil para comentarios." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:455 +#: apt_preferences.5.xml:462 #, fuzzy msgid "" "The <literal>Pin-Priority:</literal> line in each APT preferences record is " @@ -8114,13 +8192,13 @@ msgstr "" "una línea que empieze con <literal>Pin-Priority: release ...</literal>." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:464 +#: apt_preferences.5.xml:471 #, fuzzy msgid "Tracking Stable" msgstr "Siguiendo la distribución estable" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:472 +#: apt_preferences.5.xml:479 #, fuzzy, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated\n" @@ -8145,7 +8223,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:466 +#: apt_preferences.5.xml:473 #, fuzzy msgid "" "The following APT preferences file will cause APT to assign a priority " @@ -8160,8 +8238,8 @@ msgstr "" "de las distribuciones <literal>Debian</literal>." #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:489 apt_preferences.5.xml:535 -#: apt_preferences.5.xml:593 +#: apt_preferences.5.xml:496 apt_preferences.5.xml:542 +#: apt_preferences.5.xml:600 #, fuzzy, no-wrap msgid "" "apt-get install <replaceable>package-name</replaceable>\n" @@ -8174,7 +8252,7 @@ msgstr "" "apt-get dist-upgrade\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:484 +#: apt_preferences.5.xml:491 #, fuzzy msgid "" "With a suitable &sources-list; file and the above preferences file, any of " @@ -8188,13 +8266,13 @@ msgstr "" "última versión <literal>estable</literal>." #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:501 +#: apt_preferences.5.xml:508 #, fuzzy, no-wrap msgid "apt-get install <replaceable>package</replaceable>/testing\n" msgstr "rdepends <replaceable>paquetes(s)</replaceable>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:495 +#: apt_preferences.5.xml:502 #, fuzzy msgid "" "The following command will cause APT to upgrade the specified package to the " @@ -8207,13 +8285,13 @@ msgstr "" "de nuevo amenos que se ejecute de nuevo la orden." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:507 +#: apt_preferences.5.xml:514 #, fuzzy msgid "Tracking Testing or Unstable" msgstr "Siguiendo la distribución de pruebas o inestable" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:516 +#: apt_preferences.5.xml:523 #, fuzzy, no-wrap msgid "" "Package: *\n" @@ -8242,7 +8320,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:509 +#: apt_preferences.5.xml:516 #, fuzzy msgid "" "The following APT preferences file will cause APT to assign a high priority " @@ -8259,7 +8337,7 @@ msgstr "" "de <literal>Debian</literal>." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:530 +#: apt_preferences.5.xml:537 #, fuzzy msgid "" "With a suitable &sources-list; file and the above preferences file, any of " @@ -8273,13 +8351,13 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:550 +#: apt_preferences.5.xml:557 #, fuzzy, no-wrap msgid "apt-get install <replaceable>package</replaceable>/unstable\n" msgstr "rdepends <replaceable>paquetes(s)</replaceable>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:541 +#: apt_preferences.5.xml:548 #, fuzzy msgid "" "The following command will cause APT to upgrade the specified package to the " @@ -8299,12 +8377,12 @@ msgstr "" "versión instalada." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:557 +#: apt_preferences.5.xml:564 msgid "Tracking the evolution of a codename release" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:571 +#: apt_preferences.5.xml:578 #, fuzzy, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated package versions\n" @@ -8334,7 +8412,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:559 +#: apt_preferences.5.xml:566 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 " @@ -8349,7 +8427,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:588 +#: apt_preferences.5.xml:595 #, fuzzy msgid "" "With a suitable &sources-list; file and the above preferences file, any of " @@ -8363,13 +8441,13 @@ msgstr "" "última versión <literal>estable</literal>." #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:608 +#: apt_preferences.5.xml:615 #, fuzzy, no-wrap msgid "apt-get install <replaceable>package</replaceable>/sid\n" msgstr "rdepends <replaceable>paquetes(s)</replaceable>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:599 +#: apt_preferences.5.xml:606 #, fuzzy msgid "" "The following command will cause APT to upgrade the specified package to the " @@ -8389,13 +8467,13 @@ msgstr "" "versión instalada." #. type: Content of: <refentry><refsect1><variablelist> -#: apt_preferences.5.xml:617 +#: apt_preferences.5.xml:624 #, fuzzy msgid "&file-preferences;" msgstr "apt_preferences" #. type: Content of: <refentry><refsect1><para> -#: apt_preferences.5.xml:623 +#: apt_preferences.5.xml:630 #, fuzzy msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;" msgstr "&apt-conf;, &apt-get;, &sources-list;" @@ -9975,6 +10053,30 @@ msgstr "" msgid "Which will use the already fetched archives on the disc." msgstr "" +#, fuzzy +#~ msgid "" +#~ "<filename>apt.conf</filename> is the main configuration file for the APT " +#~ "suite of tools, all tools make use of the configuration file and a common " +#~ "command line parser to provide a uniform environment. When an APT tool " +#~ "starts up it will read the configuration specified by the " +#~ "<envar>APT_CONFIG</envar> environment variable (if any) and then read the " +#~ "files in <literal>Dir::Etc::Parts</literal> then read the main " +#~ "configuration file specified by <literal>Dir::Etc::main</literal> then " +#~ "finally apply the command line options to override the configuration " +#~ "directives, possibly loading even more config files." +#~ msgstr "" +#~ "<filename>apt.conf</filename> es el fichero principal de configuración " +#~ "del conjunto de herramientas APT, todas las herramientas hacen uso del " +#~ "fichero de configuración y un analizador común de sintaxis de la línea de " +#~ "órdenes para proporcionar un entorno uniforme. Cuando se inicia una " +#~ "utilidad APT, este leerá la configuración especificada en la variable de " +#~ "entorno <envar>APT_CONFIG</envar> (si existe), luego leerá los ficheos en " +#~ "<literal>Dir::Etc::Parts</literal>, entonces leerá el fichero de " +#~ "configuración principal especificado por <literal>Dir::Etc::main</" +#~ "literal>, finalmente aplicará las opciones de la línea de órdenes para " +#~ "reescribir la directrices de la configuración, posiblemente cargando " +#~ "incluso más ficheros de configuración." + #, fuzzy #~ msgid "<filename>/etc/apt/trusted.gpg</filename>" #~ msgstr "<filename>/etc/apt/apt.conf</filename>" @@ -10250,14 +10352,6 @@ msgstr "" #~ "<arg rep=\"norepeat\" choice=\"opt\">clean</arg>\n" #~ "<arg rep=\"norepeat\" choice=\"opt\">autoclean</arg>" -#, fuzzy -#~ msgid "" -#~ "APT configuration file. Configuration Item: <literal>Dir::Etc::Main</" -#~ "literal>." -#~ msgstr "" -#~ "Fichero de configuración de APT. Opción de Configuración: <literal>Dir::" -#~ "Etc::Main</literal>." - #, fuzzy #~ msgid "<filename>/etc/apt/apt.conf.d/</filename>" #~ msgstr "<filename>/etc/apt/apt.conf.d/</filename>" diff --git a/doc/po/fr.po b/doc/po/fr.po index a8897e073..1e9b42e02 100644 --- a/doc/po/fr.po +++ b/doc/po/fr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2009-12-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-20 12:18+0100\n" "PO-Revision-Date: 2010-01-15 18:53+0100\n" "Last-Translator: Christian Perrier <bubulle@debian.org>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" @@ -359,12 +359,6 @@ msgstr "" #. type: Plain text #: apt.ent:84 #, no-wrap -#| msgid "" -#| "<!ENTITY dpkg \"<citerefentry>\n" -#| " <refentrytitle><command>dpkg</command></refentrytitle>\n" -#| " <manvolnum>8</manvolnum>\n" -#| " </citerefentry>\"\n" -#| ">\n" msgid "" "<!ENTITY dpkg \"<citerefentry>\n" " <refentrytitle><command>dpkg</command></refentrytitle>\n" @@ -413,12 +407,6 @@ msgstr "" #. type: Plain text #: apt.ent:102 #, no-wrap -#| msgid "" -#| "<!ENTITY dpkg-scanpackages \"<citerefentry>\n" -#| " <refentrytitle><command>dpkg-scanpackages</command></refentrytitle>\n" -#| " <manvolnum>8</manvolnum>\n" -#| " </citerefentry>\"\n" -#| ">\n" msgid "" "<!ENTITY dpkg-scanpackages \"<citerefentry>\n" " <refentrytitle><command>dpkg-scanpackages</command></refentrytitle>\n" @@ -435,12 +423,6 @@ msgstr "" #. type: Plain text #: apt.ent:108 #, no-wrap -#| msgid "" -#| "<!ENTITY dpkg-scansources \"<citerefentry>\n" -#| " <refentrytitle><command>dpkg-scansources</command></refentrytitle>\n" -#| " <manvolnum>8</manvolnum>\n" -#| " </citerefentry>\"\n" -#| ">\n" msgid "" "<!ENTITY dpkg-scansources \"<citerefentry>\n" " <refentrytitle><command>dpkg-scansources</command></refentrytitle>\n" @@ -457,12 +439,6 @@ msgstr "" #. type: Plain text #: apt.ent:114 #, no-wrap -#| msgid "" -#| "<!ENTITY dselect \"<citerefentry>\n" -#| " <refentrytitle><command>dselect</command></refentrytitle>\n" -#| " <manvolnum>8</manvolnum>\n" -#| " </citerefentry>\"\n" -#| ">\n" msgid "" "<!ENTITY dselect \"<citerefentry>\n" " <refentrytitle><command>dselect</command></refentrytitle>\n" @@ -1065,7 +1041,7 @@ msgstr "" " </varlistentry>\n" #. type: Plain text -#: apt.ent:355 +#: apt.ent:356 #, no-wrap msgid "" " <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n" @@ -1080,7 +1056,89 @@ msgstr "" " </varlistentry>\n" "\">\n" -#. The last update date +#. type: Plain text +#: apt.ent:362 +#, fuzzy, no-wrap +#| msgid "" +#| "<!ENTITY file-sourceslist \"\n" +#| " <varlistentry><term><filename>/etc/apt/sources.list</filename></term>\n" +#| " <listitem><para>Locations to fetch packages from.\n" +#| " Configuration Item: <literal>Dir::Etc::SourceList</literal>.</para></listitem>\n" +#| " </varlistentry>\n" +msgid "" +"<!ENTITY file-trustedgpg \"\n" +" <varlistentry><term><filename>/etc/apt/trusted.gpg</filename></term>\n" +" <listitem><para>Keyring of local trusted keys, new keys will be added here.\n" +" Configuration Item: <literal>Dir::Etc::Trusted</literal>.</para></listitem>\n" +" </varlistentry>\n" +msgstr "" +"<!ENTITY file-sourceslist \"\n" +" <varlistentry><term><filename>/etc/apt/sources.list</filename></term>\n" +" <listitem><para>Emplacement pour la récupération des paquets.\n" +" Élément de configuration : <literal>Dir::Etc::SourceList</literal>.</para></listitem>\n" +" </varlistentry>\n" + +#. type: Plain text +#: apt.ent:369 +#, fuzzy, no-wrap +#| msgid "" +#| " <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n" +#| " <listitem><para>File fragments for locations to fetch packages from.\n" +#| " Configuration Item: <literal>Dir::Etc::SourceParts</literal>.</para></listitem>\n" +#| " </varlistentry>\n" +#| "\">\n" +msgid "" +" <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n" +" <listitem><para>File fragments for the trusted keys, additional keyrings can\n" +" be stored here (by other packages or the administrator).\n" +" Configuration Item <literal>Dir::Etc::TrustedParts</literal>.</para></listitem>\n" +" </varlistentry>\n" +"\">\n" +msgstr "" +" <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n" +" <listitem><para>Fragments de fichiers définissant les emplacements de récupération de paquets.\n" +" Élément de configuration : <literal>Dir::Etc::SourceParts</literal>.</para></listitem>\n" +" </varlistentry>\n" +"\">\n" + +#. type: Plain text +#: apt.ent:371 +msgid "<!ENTITY translation-title \"TRANSLATION\">" +msgstr "<!ENTITY translation-title \"Traducteurs\">" +"" + +#. type: Plain text +#: apt.ent:380 +#, no-wrap +msgid "" +"<!-- TRANSLATOR: This is a placeholder. You should write here who has constributed\n" +" to the translation in the past, who is responsible now and maybe further information\n" +" specially related to your translation. -->\n" +"<!ENTITY translation-holder \"\n" +" The english translation was done by John Doe <email>john@doe.org</email> in 2009,\n" +" 2010 and Daniela Acme <email>daniela@acme.us</email> in 2010 together with the\n" +" Debian Dummy l10n Team <email>debian-l10n-dummy@lists.debian.org</email>.\n" +"\">\n" +msgstr "" +"<!ENTITY translation-holder \"\n" +" Jérôme Marant, Philippe Batailler, Christian Perrier <email>bubulle@debian.org</email> (2000, 2005, 2009, 2010),\n" +" Équipe de traduction francophone de Debian <email>debian-l10n-french@lists.debian.org</email>\n" +"\">\n" + +#. type: Plain text +#: apt.ent:387 +#, no-wrap +msgid "" +"<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n" +" in a shipped manpage will maybe appear english parts. -->\n" +"<!ENTITY translation-english \"\n" +" Note that this translated document may contain untranslated parts.\n" +" This is done on purpose, to avoid losing content when the\n" +" translation is lagging behind the original content.\n" +"\">\n" +msgstr "" + +#. The last update date #. type: Content of: <refentry><refentryinfo> #: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13 #: apt-sortpkgs.1.xml:13 sources.list.5.xml:13 @@ -1163,7 +1221,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47 #: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:55 apt-get.8.xml:125 -#: apt-key.8.xml:34 apt-mark.8.xml:52 apt-secure.8.xml:40 +#: apt-key.8.xml:35 apt-mark.8.xml:52 apt-secure.8.xml:40 #: apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33 #: sources.list.5.xml:33 msgid "Description" @@ -1379,12 +1437,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> #: apt-cache.8.xml:152 -#| msgid "" -#| "<literal>Missing</literal> is the number of package names that were " -#| "referenced in a dependency but were not provided by any package. Missing " -#| "packages may be in evidence if a full distribution is not accessed, or if " -#| "a package (real or virtual) has been dropped from the distribution. " -#| "Usually they are referenced from Conflicts or Breaks statements." msgid "" "<literal>Missing</literal> is the number of package names that were " "referenced in a dependency but were not provided by any package. Missing " @@ -1584,10 +1636,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:234 -#| msgid "" -#| "Note that a package which APT knows of is not nessasarily available to " -#| "download, installable or installed, e.g. virtual packages are also listed " -#| "in the generated list." msgid "" "Note that a package which APT knows of is not necessarily available to " "download, installable or installed, e.g. virtual packages are also listed in " @@ -1707,7 +1755,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 #: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89 -#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:484 apt.conf.5.xml:506 +#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524 msgid "options" msgstr "options" @@ -1946,14 +1994,14 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist> #: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98 -#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:556 apt-get.8.xml:554 +#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:568 apt-get.8.xml:554 #: apt-sortpkgs.1.xml:64 msgid "&apt-commonoptions;" msgstr "&apt-commonoptions;" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122 -#: apt.conf.5.xml:1017 apt_preferences.5.xml:615 +#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122 +#: apt.conf.5.xml:1035 apt_preferences.5.xml:622 msgid "Files" msgstr "Fichiers" @@ -1964,9 +2012,9 @@ msgstr "&file-sourceslist; &file-statelists;" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 -#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:572 apt-get.8.xml:569 -#: apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181 -#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1023 apt_preferences.5.xml:622 +#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569 +#: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 +#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:629 #: sources.list.5.xml:233 msgid "See Also" msgstr "Voir aussi" @@ -1978,7 +2026,7 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;." #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108 -#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:576 apt-get.8.xml:575 +#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:588 apt-get.8.xml:575 #: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73 msgid "Diagnostics" msgstr "Diagnostics" @@ -2108,7 +2156,7 @@ msgstr "" "\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><title> -#: apt-cdrom.8.xml:91 +#: apt-cdrom.8.xml:91 apt-key.8.xml:139 msgid "Options" msgstr "Options" @@ -2358,7 +2406,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:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:573 +#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:585 #: apt-sortpkgs.1.xml:70 msgid "&apt-conf;" msgstr "&apt-conf;" @@ -2448,10 +2496,6 @@ msgstr "<option>--tempdir</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-extracttemplates.1.xml:62 -#| msgid "" -#| "Temporary directory in which to write extracted debconf template files " -#| "and config scripts Configuration Item: <literal>APT::ExtractTemplates::" -#| "TempDir</literal>" msgid "" "Temporary directory in which to write extracted debconf template files and " "config scripts. Configuration Item: <literal>APT::ExtractTemplates::" @@ -2470,12 +2514,9 @@ msgstr "" "<command>apt-extracttemplates</command> retourne zéro si tout se passe bien, " "le nombre 100 en cas d'erreur." -#. The last update date +#. The last update date #. type: Content of: <refentry><refentryinfo> #: apt-ftparchive.1.xml:13 -#| msgid "" -#| "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>2 " -#| "November 2007</date>" msgid "" "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>17 " "August 2009</date>" @@ -2597,7 +2638,8 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:82 apt-ftparchive.1.xml:106 -msgid "The option <option>--db</option> can be used to specify a binary caching DB." +msgid "" +"The option <option>--db</option> can be used to specify a binary caching DB." msgstr "" "On peut se servir de l'option <option>--db</option> pour demander un cache " "binaire." @@ -2752,8 +2794,10 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt-ftparchive.1.xml:155 -msgid "The generate configuration has 4 separate sections, each described below." -msgstr "Ce fichier de configuration possède quatre sections, décrites ci-dessous." +msgid "" +"The generate configuration has 4 separate sections, each described below." +msgstr "" +"Ce fichier de configuration possède quatre sections, décrites ci-dessous." #. type: Content of: <refentry><refsect1><refsect2><title> #: apt-ftparchive.1.xml:157 @@ -2762,11 +2806,6 @@ msgstr "La section Dir" #. type: Content of: <refentry><refsect1><refsect2><para> #: apt-ftparchive.1.xml:159 -#| msgid "" -#| "The <literal>Dir</literal> section defines the standard directories " -#| "needed to locate the files required during the generation process. These " -#| "directories are prepended to certain relative paths defined in later " -#| "sections to produce a complete an absolute path." msgid "" "The <literal>Dir</literal> section defines the standard directories needed " "to locate the files required during the generation process. These " @@ -3055,8 +3094,12 @@ msgstr "Sources" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:288 +#, fuzzy +#| msgid "" +#| "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/" +#| "source/Sources</filename>" msgid "" -"Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/" +"Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/" "source/Sources</filename>" msgstr "" "Indique le fichier « Packages » crée. Par défaut, c'est <filename>$(DIST)/" @@ -3197,27 +3240,37 @@ msgstr "" "peuvent s'utiliser dans la section <literal>Tree</literal> ainsi que les " "trois nouvelles variables suivantes." -#. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:351 -msgid "" -"When processing a <literal>Tree</literal> section <command>apt-ftparchive</" -"command> performs an operation similar to:" -msgstr "" -"Quand il exécute la section <literal>Tree</literal>, <command>apt-" -"ftparchive</command> agit ainsi :" - -#. type: Content of: <refentry><refsect1><refsect2><para><informalexample><programlisting> +#. type: Content of: <refentry><refsect1><refsect2><para><programlisting> #: apt-ftparchive.1.xml:354 -#, no-wrap +#, fuzzy, no-wrap +#| msgid "" +#| "for i in Sections do \n" +#| " for j in Architectures do\n" +#| " Generate for DIST=scope SECTION=i ARCH=j\n" msgid "" "for i in Sections do \n" " for j in Architectures do\n" " Generate for DIST=scope SECTION=i ARCH=j\n" +" " msgstr "" "for i in Sections do \n" " for j in Architectures do\n" " Generate for DIST=scope SECTION=i ARCH=j\n" +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt-ftparchive.1.xml:351 +#, fuzzy +#| msgid "" +#| "When processing a <literal>Tree</literal> section <command>apt-" +#| "ftparchive</command> performs an operation similar to:" +msgid "" +"When processing a <literal>Tree</literal> section <command>apt-ftparchive</" +"command> performs an operation similar to: <placeholder type=\"programlisting" +"\" id=\"0\"/>" +msgstr "" +"Quand il exécute la section <literal>Tree</literal>, <command>apt-" +"ftparchive</command> agit ainsi :" + #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> #: apt-ftparchive.1.xml:360 msgid "Sections" @@ -3573,13 +3626,33 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-ftparchive.1.xml:547 -#| msgid "<option>--version</option>" -msgid "<option>APT::FTPArchive::LongDescription</option>" +#, fuzzy +#| msgid "<option>APT::FTPArchive::LongDescription</option>" +msgid "<option>APT::FTPArchive::AlwaysStat</option>" msgstr "<option>APT::FTPArchive::LongDescription</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:549 msgid "" +"&apt-ftparchive; caches as much as possible of metadata in it is cachedb. If " +"packages are recompiled and/or republished with the same version again, this " +"will lead to problems as the now outdated cached metadata like size and " +"checksums will be used. With this option enabled this will no longer happen " +"as it will be checked if the file was changed. Note that this option is set " +"to \"<literal>false</literal>\" by default as it is not recommend to upload " +"multiply versions/builds of a package with the same versionnumber, so in " +"theory nobody will have these problems and therefore all these extra checks " +"are useless." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:559 +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:561 +msgid "" "This configuration option defaults to \"<literal>true</literal>\" and should " "only be set to <literal>\"false\"</literal> if the Archive generated with " "&apt-ftparchive; also provides <filename>Translation</filename> files. Note " @@ -3593,19 +3666,19 @@ msgstr "" "pas possible de créer ces fichiers avec <command>apt-ftparchive</command>." #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:561 apt.conf.5.xml:1011 apt_preferences.5.xml:462 +#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1029 apt_preferences.5.xml:469 #: sources.list.5.xml:193 msgid "Examples" msgstr "Exemples" #. type: Content of: <refentry><refsect1><para><programlisting> -#: apt-ftparchive.1.xml:567 +#: apt-ftparchive.1.xml:579 #, 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:563 +#: apt-ftparchive.1.xml:575 msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" @@ -3614,7 +3687,7 @@ msgstr "" "paquets binaires (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:577 +#: apt-ftparchive.1.xml:589 msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@ -3622,7 +3695,7 @@ msgstr "" "<command>apt-ftparchive</command> retourne zéro si tout se passe bien, le " "nombre 100 en cas d'erreur." -#. The last update date +#. The last update date #. type: Content of: <refentry><refentryinfo> #: apt-get.8.xml:13 msgid "" @@ -3640,7 +3713,8 @@ msgstr "apt-get" #. type: Content of: <refentry><refnamediv><refpurpose> #: apt-get.8.xml:30 msgid "APT package handling utility -- command-line interface" -msgstr "Utilitaire APT pour la gestion des paquets -- interface en ligne de commande." +msgstr "" +"Utilitaire APT pour la gestion des paquets -- interface en ligne de commande." #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> #: apt-get.8.xml:36 @@ -3721,7 +3795,7 @@ msgstr "" "existent, comme dselect, aptitude, synaptic, gnome-apt ou wajig." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:135 apt-key.8.xml:123 +#: apt-get.8.xml:135 apt-key.8.xml:124 msgid "update" msgstr "update" @@ -3986,14 +4060,6 @@ msgstr "source" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:251 -#| msgid "" -#| "<literal>source</literal> causes <command>apt-get</command> to fetch " -#| "source packages. APT will examine the available packages to decide which " -#| "source package to fetch. It will then find and download into the current " -#| "directory the newest available version of that source package while " -#| "respect the default release, set with the option <literal>APT::Default-" -#| "Release</literal>, the <option>-t</option> option or per package with " -#| "with the <literal>pkg/release</literal> syntax, if possible." msgid "" "<literal>source</literal> causes <command>apt-get</command> to fetch source " "packages. APT will examine the available packages to decide which source " @@ -4190,18 +4256,31 @@ msgstr "<option>--fix-broken</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:334 +#, fuzzy +#| msgid "" +#| "Fix; attempt to correct a system with broken dependencies in place. This " +#| "option, when used with install/remove, can omit any packages to permit " +#| "APT to deduce a likely solution. Any Package that are specified must " +#| "completely correct the problem. The option is sometimes necessary when " +#| "running APT for the first time; APT itself does not allow broken package " +#| "dependencies to exist on a system. It is possible that a system's " +#| "dependency structure can be so corrupt as to require manual intervention " +#| "(which usually means using &dselect; or <command>dpkg --remove</command> " +#| "to eliminate some of the offending packages). Use of this option together " +#| "with <option>-m</option> may produce an error in some situations. " +#| "Configuration Item: <literal>APT::Get::Fix-Broken</literal>." msgid "" "Fix; attempt to correct a system with broken dependencies in place. This " "option, when used with install/remove, can omit any packages to permit APT " -"to deduce a likely solution. Any Package that are specified must completely " -"correct the problem. The option is sometimes necessary when running APT for " -"the first time; APT itself does not allow broken package dependencies to " -"exist on a system. It is possible that a system's dependency structure can " -"be so corrupt as to require manual intervention (which usually means using " -"&dselect; or <command>dpkg --remove</command> to eliminate some of the " -"offending packages). Use of this option together with <option>-m</option> " -"may produce an error in some situations. Configuration Item: <literal>APT::" -"Get::Fix-Broken</literal>." +"to deduce a likely solution. If packages are specified, these have to " +"completely correct the problem. The option is sometimes necessary when " +"running APT for the first time; APT itself does not allow broken package " +"dependencies to exist on a system. It is possible that a system's dependency " +"structure can be so corrupt as to require manual intervention (which usually " +"means using &dselect; or <command>dpkg --remove</command> to eliminate some " +"of the offending packages). Use of this option together with <option>-m</" +"option> may produce an error in some situations. Configuration Item: " +"<literal>APT::Get::Fix-Broken</literal>." msgstr "" "Correction ; cette option demande de réparer un système où existent des " "dépendances défectueuses. Utilisée avec install ou remove, elle peut exclure " @@ -4308,14 +4387,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:386 -#| msgid "" -#| "Simulation run as user will deactivate locking (<literal>Debug::" -#| "NoLocking</literal>) automatical. Also a notice will be displayed " -#| "indicating that this is only a simulation, if the option <literal>APT::" -#| "Get::Show-User-Simulation-Note</literal> is set (Default: true) Neigther " -#| "NoLocking nor the notice will be triggered if run as root (root should " -#| "know what he is doing without further warnings by <literal>apt-get</" -#| "literal>)." msgid "" "Simulation run as user will deactivate locking (<literal>Debug::NoLocking</" "literal>) automatic. Also a notice will be displayed indicating that this " @@ -4335,11 +4406,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:392 -#| msgid "" -#| "Simulate prints out a series of lines each one representing a dpkg " -#| "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square " -#| "brackets indicate broken packages with and empty set of square brackets " -#| "meaning breaks that are of no consequence (rare)." msgid "" "Simulate prints out a series of lines each one representing a dpkg " "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets " @@ -4552,10 +4618,17 @@ msgstr "<option>--purge</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:467 +#, fuzzy +#| msgid "" +#| "Use purge instead of remove for anything that would be removed. An " +#| "asterisk (\"*\") will be displayed next to packages which are scheduled " +#| "to be purged. <option>remove --purge</option> is equivalent for " +#| "<option>purge</option> command. Configuration Item: <literal>APT::Get::" +#| "Purge</literal>." msgid "" "Use purge instead of remove for anything that would be removed. An asterisk " "(\"*\") will be displayed next to packages which are scheduled to be purged. " -"<option>remove --purge</option> is equivalent for <option>purge</option> " +"<option>remove --purge</option> is equivalent to the <option>purge</option> " "command. Configuration Item: <literal>APT::Get::Purge</literal>." msgstr "" "Utiliser « purge » à la place de « remove » pour supprimer tout ce qui peut " @@ -4828,8 +4901,14 @@ msgstr "Utilitaire de gestion des clés d'APT" #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> #: apt-key.8.xml:28 +#, fuzzy +#| msgid "" +#| "<command>apt-key</command> <arg><replaceable>command</replaceable>/</arg> " +#| "<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></" +#| "option></arg>" msgid "" -"<command>apt-key</command> <arg><replaceable>command</replaceable>/</arg> " +"<command>apt-key</command> <arg><option>--keyring <replaceable>filename</" +"replaceable></option></arg> <arg><replaceable>command</replaceable></arg> " "<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></option></" "arg>" msgstr "" @@ -4838,7 +4917,7 @@ msgstr "" "arg>" #. type: Content of: <refentry><refsect1><para> -#: apt-key.8.xml:36 +#: apt-key.8.xml:37 msgid "" "<command>apt-key</command> is used to manage the list of keys used by apt to " "authenticate packages. Packages which have been authenticated using these " @@ -4848,17 +4927,17 @@ msgstr "" "les paquets. Les paquets authentifiés par ces clés seront réputés fiables." #. type: Content of: <refentry><refsect1><title> -#: apt-key.8.xml:42 +#: apt-key.8.xml:43 msgid "Commands" msgstr "Commandes" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:44 +#: apt-key.8.xml:45 msgid "add <replaceable>filename</replaceable>" msgstr "add <replaceable>fichier</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:48 +#: apt-key.8.xml:49 msgid "" "Add a new key to the list of trusted keys. The key is read from " "<replaceable>filename</replaceable>, or standard input if " @@ -4869,62 +4948,62 @@ msgstr "" "<replaceable>fichier</replaceable> est <literal>-</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:56 +#: apt-key.8.xml:57 msgid "del <replaceable>keyid</replaceable>" msgstr "del <replaceable>clé</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:60 +#: apt-key.8.xml:61 msgid "Remove a key from the list of trusted keys." msgstr "Supprimer une clé de la liste des clés fiables." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:67 +#: apt-key.8.xml:68 msgid "export <replaceable>keyid</replaceable>" msgstr "export <replaceable>clé</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:71 +#: apt-key.8.xml:72 msgid "Output the key <replaceable>keyid</replaceable> to standard output." msgstr "Afficher la clé <replaceable>clé</replaceable> sur la sortie standard." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:78 +#: apt-key.8.xml:79 msgid "exportall" msgstr "exportall" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:82 +#: apt-key.8.xml:83 msgid "Output all trusted keys to standard output." msgstr "Afficher toutes les clés fiables sur la sortie standard." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:89 +#: apt-key.8.xml:90 msgid "list" msgstr "list" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:93 +#: apt-key.8.xml:94 msgid "List trusted keys." msgstr "Afficher la liste des clés fiables." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:100 +#: apt-key.8.xml:101 msgid "finger" msgstr "finger" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:104 +#: apt-key.8.xml:105 msgid "List fingerprints of trusted keys." msgstr "Afficher les empreintes des clés fiables." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:111 +#: apt-key.8.xml:112 msgid "adv" msgstr "adv" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:115 +#: apt-key.8.xml:116 msgid "" "Pass advanced options to gpg. With adv --recv-key you can download the " "public key." @@ -4933,7 +5012,7 @@ msgstr "" "possible de télécharger une clé publique." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:127 +#: apt-key.8.xml:128 msgid "" "Update the local keyring with the keyring of Debian archive keys and removes " "from the keyring the archive keys which are no longer valid." @@ -4941,57 +5020,76 @@ 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> +#. type: Content of: <refentry><refsect1><para> #: apt-key.8.xml:140 -msgid "<filename>/etc/apt/trusted.gpg</filename>" -msgstr "<filename>/etc/apt/trusted.gpg</filename>" +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:142 +#, fuzzy +#| msgid "add <replaceable>filename</replaceable>" +msgid "--keyring <replaceable>filename</replaceable>" +msgstr "add <replaceable>fichier</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:141 -msgid "Keyring of local trusted keys, new keys will be added here." -msgstr "Trousseau de clés locales fiables : les nouvelles clés y seront ajoutées." +#: apt-key.8.xml:143 +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 " +"<filename>trusted.gpg</filename> file as well as on all parts in the " +"<filename>trusted.gpg.d</filename> directory, through <filename>trusted.gpg</" +"filename> is the primary keyring which means that e.g. new keys are added to " +"this one." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist> +#: apt-key.8.xml:156 +msgid "&file-trustedgpg;" +msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:144 +#: apt-key.8.xml:158 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:145 +#: apt-key.8.xml:159 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:148 +#: apt-key.8.xml:162 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:149 +#: apt-key.8.xml:163 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:152 -msgid "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" -msgstr "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" +#: apt-key.8.xml:166 +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:153 +#: apt-key.8.xml:167 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:164 +#: apt-key.8.xml:176 msgid "&apt-get;, &apt-secure;" msgstr "&apt-get;, &apt-secure;" -#. The last update date +#. The last update date #. type: Content of: <refentry><refentryinfo> #: apt-mark.8.xml:13 -#| msgid "" -#| "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>2 " -#| "November 2007</date>" msgid "" "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 " "August 2009</date>" @@ -5011,11 +5109,6 @@ msgstr "Indiquer si un paquet a été installé automatiquement ou non" #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> #: apt-mark.8.xml:36 -#| msgid "" -#| "<command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-" -#| "f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"req" -#| "\"><arg>markauto</arg><arg>unmarkauto</arg></group> <arg choice=\"plain\" " -#| "rep=\"repeat\"><replaceable>package</replaceable></arg>" msgid "" " <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-" "f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain" @@ -5042,12 +5135,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt-mark.8.xml:57 -#| 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 being automatically installed. Once these automatically " -#| "installed packages are no longer depended on by any manually installed " -#| "packages, they will be removed." 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 " @@ -5101,10 +5188,6 @@ msgstr "showauto" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-mark.8.xml:82 -#| msgid "" -#| "<literal>autoremove</literal> is used to remove packages that were " -#| "automatically installed to satisfy dependencies for some package and that " -#| "are no more needed." msgid "" "<literal>showauto</literal> is used to print a list of automatically " "installed packages with each package on a new line." @@ -5114,8 +5197,10 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-mark.8.xml:93 -msgid "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>" -msgstr "<option>-f=<filename><replaceable>FICHIER</replaceable></filename></option>" +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:94 @@ -5128,11 +5213,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-mark.8.xml:97 -#| msgid "" -#| "Read/Write package stats from <filename>FILENAME</filename> instead of " -#| "the default location, which is <filename>extended_status</filename> in " -#| "the directory defined by the Configuration Item: <literal>Dir::State</" -#| "literal>." msgid "" "Read/Write package stats from <filename><replaceable>FILENAME</replaceable></" "filename> instead of the default location, which is " @@ -5176,7 +5256,6 @@ msgstr "Affiche la version du programme." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-mark.8.xml:124 -#| msgid "<filename>/etc/apt/preferences</filename>" msgid "<filename>/var/lib/apt/extended_states</filename>" msgstr "<filename>/var/lib/apt/extended_states</filename>" @@ -5193,7 +5272,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt-mark.8.xml:134 -#| msgid "&apt-cache; &apt-conf;" msgid "&apt-get;,&aptitude;,&apt-conf;" msgstr "&apt-get;,&aptitude;,&apt-conf;" @@ -5261,13 +5339,6 @@ msgstr "Trusted archives" #. type: Content of: <refentry><refsect1><para> #: apt-secure.8.xml:67 -#| msgid "" -#| "The chain of trust from an apt archive to the end user is made up of " -#| "different steps. <command>apt-secure</command> is the last step in this " -#| "chain, trusting an archive does not mean that the packages that you trust " -#| "it do not contain malicious code but means that you trust the archive " -#| "maintainer. Its the archive maintainer responsibility to ensure that the " -#| "archive integrity is correct." msgid "" "The chain of trust from an apt archive to the end user is made up of " "different steps. <command>apt-secure</command> is the last step in this " @@ -5316,14 +5387,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt-secure.8.xml:92 -#| msgid "" -#| "Once the uploaded package is verified and included in the archive, the " -#| "maintainer signature is stripped off, an MD5 sum of the package is " -#| "computed and put in the Packages file. The MD5 sum of all of the packages " -#| "files are then computed and put into the Release file. The Release file " -#| "is then signed by the archive key (which is created once a year and " -#| "distributed through the FTP server. This key is also on the Debian " -#| "keyring." msgid "" "Once the uploaded package is verified and included in the archive, the " "maintainer signature is stripped off, an MD5 sum of the package is computed " @@ -5452,10 +5515,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para> #: apt-secure.8.xml:160 -#| msgid "" -#| "<literal>Create a toplevel Release file</literal>. if it does not exist " -#| "already. You can do this by running <command>apt-ftparchive release</" -#| "command> (provided in apt-utils)." msgid "" "<emphasis>Create a toplevel Release file</emphasis>, if it does not exist " "already. You can do this by running <command>apt-ftparchive release</" @@ -5467,9 +5526,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para> #: apt-secure.8.xml:165 -#| msgid "" -#| "<literal>Sign it</literal>. 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 -abs -" "o Release.gpg Release</command>." @@ -5479,10 +5535,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para> #: apt-secure.8.xml:168 -#| msgid "" -#| "<literal>Publish the key fingerprint</literal>, that way your users will " -#| "know what key they need to import in order to authenticate the files in " -#| "the archive." msgid "" "<emphasis>Publish the key fingerprint</emphasis>, that way your users will " "know what key they need to import in order to authenticate the files in the " @@ -5608,19 +5660,20 @@ msgstr "" "<command>apt-sortpkgs</command> retourne zéro si tout se passe bien ou 100 " "en cas d'erreur." -#. The last update date +#. The last update date #. type: Content of: <refentry><refentryinfo> #: apt.conf.5.xml:13 +#, fuzzy #| msgid "" #| "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</" #| "firstname> <surname>Burrows</surname> <contrib>Initial documentation of " #| "Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-" -#| "email; &apt-product; <date>10 December 2008</date>" +#| "email; &apt-product; <date>18 September 2009</date>" msgid "" "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</" "firstname> <surname>Burrows</surname> <contrib>Initial documentation of " "Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-email; " -"&apt-product; <date>18 September 2009</date>" +"&apt-product; <date>16 January 2010</date>" msgstr "" "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</" "firstname> <surname>Burrows</surname> <contrib>Documentation d'origine de " @@ -5646,35 +5699,60 @@ msgstr "Fichier de configuration pour APT" #: apt.conf.5.xml:40 msgid "" "<filename>apt.conf</filename> is the main configuration file for the APT " -"suite of tools, all tools make use of the configuration file and a common " -"command line parser to provide a uniform environment. When an APT tool " -"starts up it will read the configuration specified by the <envar>APT_CONFIG</" -"envar> environment variable (if any) and then read the files in " -"<literal>Dir::Etc::Parts</literal> then read the main configuration file " -"specified by <literal>Dir::Etc::main</literal> then finally apply the " -"command line options to override the configuration directives, possibly " -"loading even more config files." -msgstr "" -"Le fichier <filename>apt.conf</filename> est le principal fichier de " -"configuration de la collection d'outils que constitue APT ; tous les outils " -"font appel à ce fichier de configuration et utilisent un analyseur " -"syntaxique en ligne de commande commun afin de fournir un environnement " -"uniforme. Quand un outil d'APT démarre, il lit la configuration désignée par " -"variable d'environnement <envar>APT_CONFIG</envar> (si elle existe), puis il " -"lit les fichiers situés dans <literal>Dir::Etc::Parts</literal> ainsi que le " -"principal fichier de configuration indiqué par <literal>Dir::Etc::main</" -"literal> ; enfin il applique les options de la ligne de commande qui " -"prévalent sur les directives de configuration, chargeant si nécessaire " -"d'autres fichiers de configuration." +"suite of tools, but by far not the only place changes to options can be " +"made. All tools therefore share the configuration files and also use a " +"common command line parser to provide a uniform environment." +msgstr "" -#. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:50 +#. type: Content of: <refentry><refsect1><orderedlist><para> +#: apt.conf.5.xml:45 +msgid "" +"When an APT tool starts up it will read the configuration files in the " +"following order:" +msgstr "" + +#. type: Content of: <refentry><refsect1><orderedlist><listitem><para> +#: apt.conf.5.xml:47 +msgid "" +"the file specified by the <envar>APT_CONFIG</envar> environment variable (if " +"any)" +msgstr "" + +#. type: Content of: <refentry><refsect1><orderedlist><listitem><para> +#: apt.conf.5.xml:49 +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." +msgstr "" + +#. type: Content of: <refentry><refsect1><orderedlist><listitem><para> +#: apt.conf.5.xml:54 +#, fuzzy #| msgid "" -#| "The configuration file is organized in a tree with options organized into " -#| "functional groups. option specification is given with a double colon " -#| "notation, for instance <literal>APT::Get::Assume-Yes</literal> is an " -#| "option within the APT tool group, for the Get tool. options do not " -#| "inherit from their parent groups." +#| "APT configuration file. Configuration Item: <literal>Dir::Etc::Main</" +#| "literal>." +msgid "" +"the main configuration file specified by <literal>Dir::Etc::main</literal>" +msgstr "" +"Fichier de configuration d'APT. Élément de configuration : <literal>Dir::" +"Etc::Main</literal>." + +#. type: Content of: <refentry><refsect1><orderedlist><listitem><para> +#: apt.conf.5.xml:56 +msgid "" +"the command line options are applied to override the configuration " +"directives or to load even more configuration files." +msgstr "" + +#. type: Content of: <refentry><refsect1><title> +#: apt.conf.5.xml:60 +msgid "Syntax" +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:61 msgid "" "The configuration file is organized in a tree with options organized into " "functional groups. Option specification is given with a double colon " @@ -5689,15 +5767,7 @@ msgstr "" "Get. Il n'y a pas d'héritage des options des groupes parents." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:56 -#| msgid "" -#| "Syntactically the configuration language is modeled after what the ISC " -#| "tools such as bind and dhcp use. Lines starting with <literal>//</" -#| "literal> are treated as comments (ignored), as well as all text between " -#| "<literal>/*</literal> and <literal>*/</literal>, just like C/C++ " -#| "comments. Each line is of the form <literal>APT::Get::Assume-Yes \"true" -#| "\";</literal> The trailing semicolon is required and the quotes are " -#| "optional. A new scope can be opened with curly braces, like:" +#: apt.conf.5.xml:67 msgid "" "Syntactically the configuration language is modeled after what the ISC tools " "such as bind and dhcp use. Lines starting with <literal>//</literal> are " @@ -5727,7 +5797,7 @@ msgstr "" "avec des accolades, comme suit :" #. type: Content of: <refentry><refsect1><informalexample><programlisting> -#: apt.conf.5.xml:70 +#: apt.conf.5.xml:81 #, no-wrap msgid "" "APT {\n" @@ -5745,7 +5815,7 @@ msgstr "" "};\n" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:78 +#: apt.conf.5.xml:89 msgid "" "with newlines placed to make it more readable. Lists can be created by " "opening a scope and including a single string enclosed in quotes followed by " @@ -5756,13 +5826,13 @@ msgstr "" "guillemets suivie d'un point virgule pour chaque élément de la liste." #. type: Content of: <refentry><refsect1><informalexample><programlisting> -#: apt.conf.5.xml:83 +#: apt.conf.5.xml:94 #, no-wrap msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n" msgstr "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:86 +#: apt.conf.5.xml:97 msgid "" "In general the sample configuration file in <filename>&docdir;examples/apt." "conf</filename> &configureindex; is a good guide for how it should look." @@ -5772,7 +5842,7 @@ msgstr "" "configuration." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:90 +#: apt.conf.5.xml:101 msgid "" "The names of the configuration items are not case-sensitive. So in the " "previous example you could use <literal>dpkg::pre-install-pkgs</literal>." @@ -5782,7 +5852,7 @@ msgstr "" "<literal>dpkg::pre-install-pkgs</literal>." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:93 +#: apt.conf.5.xml:104 msgid "" "Names for the configuration items are optional if a list is defined as it " "can be see in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. " @@ -5798,14 +5868,7 @@ msgstr "" "réaffectant une valeur." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:98 -#| msgid "" -#| "Two specials are allowed, <literal>#include</literal> and " -#| "<literal>#clear</literal> <literal>#include</literal> will include the " -#| "given file, unless the filename ends in a slash, then the whole directory " -#| "is included. <literal>#clear</literal> is used to erase a part of the " -#| "configuration tree. The specified element and all its descendents are " -#| "erased." +#: apt.conf.5.xml:109 msgid "" "Two specials are allowed, <literal>#include</literal> (which is deprecated " "and not supported by alternative implementations) and <literal>#clear</" @@ -5825,7 +5888,7 @@ msgstr "" "également se terminer avec un point-virgule." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:106 +#: apt.conf.5.xml:117 msgid "" "The #clear command is the only way to delete a list or a complete scope. " "Reopening a scope or the ::-style described below will <emphasis>not</" @@ -5841,13 +5904,7 @@ msgstr "" "remplacés mais seulement effacés." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:111 -#| msgid "" -#| "All of the APT tools take a -o option which allows an arbitrary " -#| "configuration directive to be specified on the command line. The syntax " -#| "is a full option name (<literal>APT::Get::Assume-Yes</literal> for " -#| "instance) followed by an equals sign then the new value of the option. " -#| "Lists can be appended too by adding a trailing :: to the list name." +#: apt.conf.5.xml:122 msgid "" "All of the APT tools take a -o option which allows an arbitrary " "configuration directive to be specified on the command line. The syntax is a " @@ -5865,7 +5922,7 @@ msgstr "" "peut pas être indiquée à la ligne de commande." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:118 +#: apt.conf.5.xml:129 msgid "" "Note that you can use :: only for appending one item per line to a list and " "that you should not use it in combination with the scope syntax. (The scope " @@ -5885,23 +5942,23 @@ msgstr "" "avec la syntaxe de champ d'action (« scope ») qui inclut implicitement « :: ». " "L'utilisation simultanée des deux syntaxes déclenchera un bogue dont " "certains utilisateurs se servent comme d'une fonctionnalité : une option " -"avec le nom inhabituel « <literal>::</literal> » se comportera comme toute autre option nommée. " -"Cela risque d'avoir de nombreux problèmes comme conséquence, par exemple si " -"un utilisateur écrit plusieurs lignes avec cette syntaxe <emphasis>erronée</" -"emphasis> afin de faire un ajout à la liste, l'effet obtenu sera inverse " -"puisque seule la dernière valeur pour l'option « <literal>::</literal> » sera utilisée. Les " -"futures versions d'APT retourneront une erreur et l'exécution sera " -"interrompue si cette utilisation incorrecte est rencontrée. Il est donc " -"conseillé de corriger ces défauts tant qu'APT ne s'en plaint pas " -"explicitement." +"avec le nom inhabituel « <literal>::</literal> » se comportera comme toute " +"autre option nommée. Cela risque d'avoir de nombreux problèmes comme " +"conséquence, par exemple si un utilisateur écrit plusieurs lignes avec cette " +"syntaxe <emphasis>erronée</emphasis> afin de faire un ajout à la liste, " +"l'effet obtenu sera inverse puisque seule la dernière valeur pour l'option " +"« <literal>::</literal> » sera utilisée. Les futures versions d'APT " +"retourneront une erreur et l'exécution sera interrompue si cette utilisation " +"incorrecte est rencontrée. Il est donc conseillé de corriger ces défauts " +"tant qu'APT ne s'en plaint pas explicitement." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:130 +#: apt.conf.5.xml:141 msgid "The APT Group" msgstr "Le groupe APT" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:131 +#: apt.conf.5.xml:142 msgid "" "This group of options controls general APT behavior as well as holding the " "options for all of the tools." @@ -5910,12 +5967,12 @@ msgstr "" "également des options communes à tous les outils." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:135 +#: apt.conf.5.xml:146 msgid "Architecture" msgstr "Architecture" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:136 +#: apt.conf.5.xml:147 msgid "" "System Architecture; sets the architecture to use when fetching files and " "parsing package lists. The internal default is the architecture apt was " @@ -5926,12 +5983,12 @@ msgstr "" "valeur interne par défaut est l'architecture pour laquelle APT a été compilé." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:141 +#: apt.conf.5.xml:152 msgid "Default-Release" msgstr "Default-Release" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:142 +#: apt.conf.5.xml:153 msgid "" "Default release to install packages from if more than one version available. " "Contains release name, codename or release version. Examples: 'stable', " @@ -5944,12 +6001,12 @@ msgstr "" "« lenny », « squeeze », « 4.0 », « 5.0* ». Voir aussi &apt-preferences;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:146 +#: apt.conf.5.xml:157 msgid "Ignore-Hold" msgstr "Ignore-Hold" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:147 +#: apt.conf.5.xml:158 msgid "" "Ignore Held packages; This global option causes the problem resolver to " "ignore held packages in its decision making." @@ -5959,12 +6016,12 @@ msgstr "" "décision." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:151 +#: apt.conf.5.xml:162 msgid "Clean-Installed" msgstr "Clean-Installed" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:152 +#: apt.conf.5.xml:163 msgid "" "Defaults to on. When turned on the autoclean feature will remove any " "packages which can no longer be downloaded from the cache. If turned off " @@ -5978,12 +6035,43 @@ msgstr "" "les réinstaller." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:158 +#: apt.conf.5.xml:169 msgid "Immediate-Configure" msgstr "Immediate-Configure" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:159 +#: apt.conf.5.xml:170 +#, fuzzy +#| msgid "" +#| "Defaults to on which will cause APT to install essential and important " +#| "packages as fast as possible in the install/upgrade operation. This is " +#| "done to limit the effect of a failing &dpkg; call: If this option is " +#| "disabled APT does treat an important package in the same way as an extra " +#| "package: Between the unpacking of the important package A and his " +#| "configuration can then be many other unpack or configuration calls, e.g. " +#| "for package B which has no relation to A, but causes the dpkg call to " +#| "fail (e.g. because maintainer script of package B generates an error) " +#| "which results in a system state in which package A is unpacked but " +#| "unconfigured - each package depending on A is now no longer guaranteed to " +#| "work as their dependency on A is not longer satisfied. The immediate " +#| "configuration marker is also applied to all dependencies which can " +#| "generate a problem if the dependencies e.g. form a circle as a dependency " +#| "with the immediate flag is comparable with a Pre-Dependency. So in theory " +#| "it is possible that APT encounters a situation in which it is unable to " +#| "perform immediate configuration, error out and refers to this option so " +#| "the user can deactivate the immediate configuration temporary to be able " +#| "to perform an install/upgrade again. Note the use of the word \"theory\" " +#| "here as this problem was only encountered by now in real world a few " +#| "times in non-stable distribution versions and caused by wrong " +#| "dependencies of the package in question or by a system in an already " +#| "broken state, so you should not blindly disable this option as the " +#| "mentioned scenario above is not the only problem immediate configuration " +#| "can help to prevent in the first place. Before a big operation like " +#| "<literal>dist-upgrade</literal> is run with this option disabled it " +#| "should be tried to explicitly <literal>install</literal> the package APT " +#| "is unable to configure immediately, but please make sure to report your " +#| "problem also to your distribution and to the APT team with the buglink " +#| "below so they can work on improving or correcting the upgrade process." msgid "" "Defaults to on which will cause APT to install essential and important " "packages as fast as possible in the install/upgrade operation. This is done " @@ -5999,13 +6087,13 @@ msgid "" "dependencies which can generate a problem if the dependencies e.g. form a " "circle as a dependency with the immediate flag is comparable with a Pre-" "Dependency. So in theory it is possible that APT encounters a situation in " -"which it is unable to perform immediate configuration, error out and refers " +"which it is unable to perform immediate configuration, errors out and refers " "to this option so the user can deactivate the immediate configuration " -"temporary to be able to perform an install/upgrade again. Note the use of " +"temporarily to be able to perform an install/upgrade again. Note the use of " "the word \"theory\" here as this problem was only encountered by now in real " -"world a few times in non-stable distribution versions and caused by wrong " -"dependencies of the package in question or by a system in an already broken " -"state, so you should not blindly disable this option as the mentioned " +"world a few times in non-stable distribution versions and was caused by " +"wrong dependencies of the package in question or by a system in an already " +"broken state, so you should not blindly disable this option as the mentioned " "scenario above is not the only problem immediate configuration can help to " "prevent in the first place. Before a big operation like <literal>dist-" "upgrade</literal> is run with this option disabled it should be tried to " @@ -6046,12 +6134,12 @@ msgstr "" "de la distribution utilisée afin qu'il soit étudié et corrigé." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:181 +#: apt.conf.5.xml:192 msgid "Force-LoopBreak" msgstr "Force-LoopBreak" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:182 +#: apt.conf.5.xml:193 msgid "" "Never Enable this option unless you -really- know what you are doing. It " "permits APT to temporarily remove an essential package to break a Conflicts/" @@ -6063,18 +6151,18 @@ msgstr "" "Ne jamais activer cette option à moins que vous ne sachiez - réellement - ce " "que vous faites. Elle autorise APT à supprimer temporairement un paquet " "essentiel pour mettre fin à une boucle Conflicts / Conflicts ou Conflicts / " -"Pre-Depends entre deux paquets essentiels. Une telle boucle ne devrait jamais " -"se produire : c'est un bogue très important. Cette option fonctionne si les paquets " -"essentiels ne sont pas tar, gzip, libc, dpkg, bash ou tous les paquets dont " -"ces paquets dépendent." +"Pre-Depends entre deux paquets essentiels. Une telle boucle ne devrait " +"jamais se produire : c'est un bogue très important. Cette option fonctionne " +"si les paquets essentiels ne sont pas tar, gzip, libc, dpkg, bash ou tous " +"les paquets dont ces paquets dépendent." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:190 +#: apt.conf.5.xml:201 msgid "Cache-Limit" msgstr "Cache-Limit" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:191 +#: apt.conf.5.xml:202 msgid "" "APT uses a fixed size memory mapped cache file to store the 'available' " "information. This sets the size of that cache (in bytes)." @@ -6084,24 +6172,24 @@ msgstr "" "mémoire allouée (en octets) pour le chargement de ce cache." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:195 +#: apt.conf.5.xml:206 msgid "Build-Essential" msgstr "Build-Essential" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:196 +#: apt.conf.5.xml:207 msgid "Defines which package(s) are considered essential build dependencies." msgstr "" "Cette option définit les paquets qui sont considérés comme faisant partie " "des dépendances essentielles pour la construction de paquets." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:199 +#: apt.conf.5.xml:210 msgid "Get" msgstr "Get" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:200 +#: apt.conf.5.xml:211 msgid "" "The Get subsection controls the &apt-get; tool, please see its documentation " "for more information about the options here." @@ -6111,12 +6199,12 @@ msgstr "" "question." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:204 +#: apt.conf.5.xml:215 msgid "Cache" msgstr "Cache" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:205 +#: apt.conf.5.xml:216 msgid "" "The Cache subsection controls the &apt-cache; tool, please see its " "documentation for more information about the options here." @@ -6126,12 +6214,12 @@ msgstr "" "options en question." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:209 +#: apt.conf.5.xml:220 msgid "CDROM" msgstr "CDROM" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:210 +#: apt.conf.5.xml:221 msgid "" "The CDROM subsection controls the &apt-cdrom; tool, please see its " "documentation for more information about the options here." @@ -6141,17 +6229,17 @@ msgstr "" "options en question." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:216 +#: apt.conf.5.xml:227 msgid "The Acquire Group" msgstr "Le groupe Acquire" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:221 +#: apt.conf.5.xml:232 msgid "PDiffs" msgstr "PDiffs" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:222 +#: apt.conf.5.xml:233 msgid "" "Try to download deltas called <literal>PDiffs</literal> for Packages or " "Sources files instead of downloading whole ones. True by default." @@ -6160,13 +6248,24 @@ msgstr "" "literal> pour les paquets ou les fichiers sources, plutôt que de les " "télécharger entièrement. Par défaut à « true »." +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:236 +msgid "" +"Two sub-options to limit the use of PDiffs are also available: With " +"<literal>FileLimit</literal> can be specified how many PDiff files are " +"downloaded at most to patch a file. <literal>SizeLimit</literal> on the " +"other hand is the maximum precentage of the size of all patches compared to " +"the size of the targeted file. If one of these limits is exceeded the " +"complete file is downloaded instead of the patches." +msgstr "" + #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:227 +#: apt.conf.5.xml:245 msgid "Queue-Mode" msgstr "Queue-Mode" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:228 +#: apt.conf.5.xml:246 msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</" "literal> or <literal>access</literal> which determines how APT parallelizes " @@ -6182,12 +6281,12 @@ msgstr "" "initiée." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:235 +#: apt.conf.5.xml:253 msgid "Retries" msgstr "Retries" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:236 +#: apt.conf.5.xml:254 msgid "" "Number of retries to perform. If this is non-zero APT will retry failed " "files the given number of times." @@ -6197,12 +6296,12 @@ msgstr "" "échoué." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:240 +#: apt.conf.5.xml:258 msgid "Source-Symlinks" msgstr "Source-Symlinks" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:241 +#: apt.conf.5.xml:259 msgid "" "Use symlinks for source archives. If set to true then source archives will " "be symlinked when possible instead of copying. True is the default." @@ -6212,19 +6311,12 @@ msgstr "" "archives de sources au lieu de les copier. Par défaut à « true »." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:245 sources.list.5.xml:139 +#: apt.conf.5.xml:263 sources.list.5.xml:139 msgid "http" msgstr "http" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:246 -#| msgid "" -#| "HTTP URIs; http::Proxy is the default http proxy to use. It is in the " -#| "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. " -#| "Per host proxies can also be specified by using the form <literal>http::" -#| "Proxy::<host></literal> with the special keyword <literal>DIRECT</" -#| "literal> meaning to use no proxies. The <envar>http_proxy</envar> " -#| "environment variable will override all settings." +#: apt.conf.5.xml:264 msgid "" "HTTP URIs; http::Proxy is the default http proxy to use. It is in the " "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per " @@ -6239,12 +6331,12 @@ msgstr "" "mandataire particulier par hôte distant en utilisant la syntaxe : " "<literal>http::Proxy::<hôte></literal>. Le mot-clé spécial " "<literal>DIRECT</literal> indique alors de n'utiliser aucun mandataire pour " -"l'hôte. Si aucun des paramètres précédents n'est défini, la variable d'environnement " -"<envar>http_proxy</envar> annule et remplace toutes les options de " -"mandataire HTTP." +"l'hôte. Si aucun des paramètres précédents n'est défini, la variable " +"d'environnement <envar>http_proxy</envar> annule et remplace toutes les " +"options de mandataire HTTP." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:254 +#: apt.conf.5.xml:272 msgid "" "Three settings are provided for cache control with HTTP/1.1 compliant proxy " "caches. <literal>No-Cache</literal> tells the proxy to not use its cached " @@ -6269,25 +6361,18 @@ msgstr "" "en compte aucune de ces options." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:264 apt.conf.5.xml:328 +#: apt.conf.5.xml:282 apt.conf.5.xml:346 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method, this applies to all things including connection timeout and data " "timeout." msgstr "" -"L'option <literal>timeout</literal> positionne le compteur d'expiration du délai " -"(timeout) utilisé par la méthode. Cela vaut pour tout, connexion et données." +"L'option <literal>timeout</literal> positionne le compteur d'expiration du " +"délai (timeout) utilisé par la méthode. Cela vaut pour tout, connexion et " +"données." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:267 -#| msgid "" -#| "One setting is provided to control the pipeline depth in cases where the " -#| "remote server is not RFC conforming or buggy (such as Squid 2.0.2) " -#| "<literal>Acquire::http::Pipeline-Depth</literal> can be a value from 0 to " -#| "5 indicating how many outstanding requests APT should send. A value of " -#| "zero MUST be specified if the remote host does not properly linger on TCP " -#| "connections - otherwise data corruption will occur. Hosts which require " -#| "this are in violation of RFC 2068." +#: apt.conf.5.xml:285 msgid "" "One setting is provided to control the pipeline depth in cases where the " "remote server is not RFC conforming or buggy (such as Squid 2.0.2). " @@ -6302,12 +6387,12 @@ msgstr "" "(comme Squid 2.0.2). <literal>Acquire::http::Pipeline-Depth </literal> a une " "valeur comprise entre 0 et 5 : elle indique le nombre de requêtes en attente " "qui peuvent être émises. Quand la machine distante ne conserve pas " -"correctement les connexions TCP, la valeur doit égale à 0. " -"Dans le cas contraire, des données seront corrompues. Les machines qui ont besoin de cette " -"option ne respectent pas la RFC 2068." +"correctement les connexions TCP, la valeur doit égale à 0. Dans le cas " +"contraire, des données seront corrompues. Les machines qui ont besoin de " +"cette option ne respectent pas la RFC 2068." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:275 +#: apt.conf.5.xml:293 msgid "" "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</" "literal> which accepts integer values in kilobyte. The default value is 0 " @@ -6322,7 +6407,7 @@ msgstr "" "implicitement le téléchargement simultané depuis plusieurs serveurs." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:280 +#: apt.conf.5.xml:298 msgid "" "<literal>Acquire::http::User-Agent</literal> can be used to set a different " "User-Agent for the http download method as some proxies allow access for " @@ -6334,16 +6419,12 @@ msgstr "" "n'autorisent l'accès qu'aux client s'identifiant de manière spécifique.." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:286 +#: apt.conf.5.xml:304 msgid "https" msgstr "https" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:287 -#| msgid "" -#| "HTTPS URIs. Cache-control and proxy options are the same as for " -#| "<literal>http</literal> method. <literal>Pipeline-Depth</literal> option " -#| "is not supported yet." +#: apt.conf.5.xml:305 msgid "" "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy " "options are the same as for <literal>http</literal> method and will also " @@ -6351,14 +6432,15 @@ msgid "" "not explicitly set for https. <literal>Pipeline-Depth</literal> option is " "not supported yet." msgstr "" -"URI HTTPS. Les options de contrôle de cache, de délai limite, d'autorisation de redirection, de Dl-Limit et " -"de mandataire (proxy) sont les mêmes que pour la méthode <literal>http</" -"literal>. Les valeurs par défaut sont les mêmes que pour l'option " -"<literal>http</literal> sauf si des valeurs spécifiques à https sont " -"indiquées. L'option <literal>Pipeline-Depth</literal> n'est pas encore gérée." +"URI HTTPS. Les options de contrôle de cache, de délai limite, d'autorisation " +"de redirection, de Dl-Limit et de mandataire (proxy) sont les mêmes que pour " +"la méthode <literal>http</literal>. Les valeurs par défaut sont les mêmes " +"que pour l'option <literal>http</literal> sauf si des valeurs spécifiques à " +"https sont indiquées. L'option <literal>Pipeline-Depth</literal> n'est pas " +"encore gérée." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:293 +#: apt.conf.5.xml:311 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is " @@ -6390,24 +6472,12 @@ msgstr "" "ou 'SSLv3'." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:311 sources.list.5.xml:150 +#: apt.conf.5.xml:329 sources.list.5.xml:150 msgid "ftp" msgstr "ftp" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:312 -#| msgid "" -#| "FTP URIs; ftp::Proxy is the default proxy server to use. It is in the " -#| "standard form of <literal>ftp://[[user][:pass]@]host[:port]/</literal> " -#| "and is overridden by the <envar>ftp_proxy</envar> environment variable. " -#| "To use a ftp proxy you will have to set the <literal>ftp::ProxyLogin</" -#| "literal> script in the configuration file. This entry specifies the " -#| "commands to send to tell the proxy server what to connect to. Please see " -#| "&configureindex; for an example of how to do this. The substitution " -#| "variables available are <literal>$(PROXY_USER)</literal> <literal>" -#| "$(PROXY_PASS)</literal> <literal>$(SITE_USER)</literal> <literal>" -#| "$(SITE_PASS)</literal> <literal>$(SITE)</literal> and <literal>" -#| "$(SITE_PORT)</literal> Each is taken from it's respective URI component." +#: apt.conf.5.xml:330 msgid "" "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard " "form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host " @@ -6429,20 +6499,20 @@ msgstr "" "port]/</literal>. On peut spécifier un mandataire particulier par hôte " "distant en utilisant la syntaxe : <literal>ftp::Proxy::<hôte></" "literal>. Le mot-clé spécial <literal>DIRECT</literal> indique alors de " -"n'utiliser aucun mandataire pour l'hôte. Si aucun des paramètres précédents n'est définis, la " -"variable d'environnement <envar>ftp_proxy</envar> annule et replace toutes " -"les options de mandataire FTP. Pour utiliser un mandataire FTP, vous devrez " -"renseigner l'entrée <literal>ftp::ProxyLogin</literal> dans le fichier de " -"configuration. Cette entrée spécifie les commandes à envoyer au mandataire " -"pour lui préciser à quoi il doit se connecter. Voyez &configureindex; pour " -"savoir comment faire. Les variables de substitution disponibles sont : " -"<literal>$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, <literal>" -"$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, <literal>$(SITE)</" -"literal> et <literal>$(SITE_PORT)</literal>. Chacune correspond à l'élément " -"respectif de l'URI." +"n'utiliser aucun mandataire pour l'hôte. Si aucun des paramètres précédents " +"n'est définis, la variable d'environnement <envar>ftp_proxy</envar> annule " +"et replace toutes les options de mandataire FTP. Pour utiliser un mandataire " +"FTP, vous devrez renseigner l'entrée <literal>ftp::ProxyLogin</literal> dans " +"le fichier de configuration. Cette entrée spécifie les commandes à envoyer " +"au mandataire pour lui préciser à quoi il doit se connecter. Voyez " +"&configureindex; pour savoir comment faire. Les variables de substitution " +"disponibles sont : <literal>$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</" +"literal>, <literal>$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, " +"<literal>$(SITE)</literal> et <literal>$(SITE_PORT)</literal>. Chacune " +"correspond à l'élément respectif de l'URI." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:331 +#: apt.conf.5.xml:349 msgid "" "Several settings are provided to control passive mode. Generally it is safe " "to leave passive mode on, it works in nearly every environment. However " @@ -6459,7 +6529,7 @@ msgstr "" "modèle de fichier de configuration)." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:338 +#: apt.conf.5.xml:356 msgid "" "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</" "envar> environment variable to a http url - see the discussion of the http " @@ -6470,11 +6540,11 @@ msgstr "" "positionnant la variable d'environnement <envar>ftp_proxy</envar> à une URL " "HTTP -- consultez la méthode http ci-dessus pour la syntaxe. On ne peut pas " "le faire dans le fichier de configuration et il n'est de toute façon pas " -"recommandé d'utiliser FTP au travers de HTTP en raison de la faible efficacité " -"de cette méthode." +"recommandé d'utiliser FTP au travers de HTTP en raison de la faible " +"efficacité de cette méthode." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:343 +#: apt.conf.5.xml:361 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@ -6490,19 +6560,18 @@ msgstr "" "des serveurs FTP ne suivent pas la RFC 2428." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:350 sources.list.5.xml:132 +#: apt.conf.5.xml:368 sources.list.5.xml:132 msgid "cdrom" msgstr "cdrom" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:356 +#: apt.conf.5.xml:374 #, no-wrap -#| msgid "\"/cdrom/\"::Mount \"foo\";" msgid "/cdrom/::Mount \"foo\";" msgstr "/cdrom/::Mount \"foo\";" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:351 +#: apt.conf.5.xml:369 msgid "" "CDROM URIs; the only setting for CDROM URIs is the mount point, " "<literal>cdrom::Mount</literal> which must be the mount point for the CDROM " @@ -6516,20 +6585,20 @@ msgstr "" "URI CD ; la seule option de configuration pour les URI de CD est le point de " "montage : <literal>cdrom::Mount</literal> ; il doit représenter le point de " "montage du lecteur de CD-ROM indiqué dans <filename>/etc/fstab</filename>. " -"D'autres commandes de montage et de démontage peuvent être fournies quand le point " -"de montage ne peut être listé dans le fichier <filename>/etc/fstab</" +"D'autres commandes de montage et de démontage peuvent être fournies quand le " +"point de montage ne peut être listé dans le fichier <filename>/etc/fstab</" "filename> (par exemple, un montage SMB). Syntaxiquement, il faut placer " "<placeholder type=\"literallayout\" id=\"0\"/> dans le bloc cdrom. La barre " "oblique finale est importante. Les commandes de démontage peuvent être " "spécifiées en utilisant <literal>UMount</literal>." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:361 +#: apt.conf.5.xml:379 msgid "gpgv" msgstr "gpgv" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:362 +#: apt.conf.5.xml:380 msgid "" "GPGV URIs; the only option for GPGV URIs is the option to pass additional " "parameters to gpgv. <literal>gpgv::Options</literal> Additional options " @@ -6540,18 +6609,18 @@ msgstr "" "supplémentaires passées à gpgv." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:367 +#: apt.conf.5.xml:385 msgid "CompressionTypes" msgstr "CompressionTypes" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:373 +#: apt.conf.5.xml:391 #, no-wrap msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";" msgstr "Acquire::CompressionTypes::<replaceable>ExtensionFichier</replaceable> \"<replaceable>NomMethode</replaceable>\";" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:368 +#: apt.conf.5.xml:386 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@ -6563,27 +6632,27 @@ msgid "" msgstr "" "Cette option indique la liste des types de compression comprises par les " "méthodes d'acquisition. Des fichiers comme <filename>Packages</filename> " -"peuvent être disponibles dans divers formats de compression. Par défaut, " -"les méthodes d'acquisition décompressent les fichiers compressés avec " +"peuvent être disponibles dans divers formats de compression. Par défaut, les " +"méthodes d'acquisition décompressent les fichiers compressés avec " "<command>bzip2</command>, <command>lzma</command> et <command>gzip</" "command>. Ce réglage permet d'ajouter à la volée des formats supplémentaires " "ou de modifier la méthode utilisée. La syntaxe à utiliser est : <placeholder " "type=\"synopsis\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:378 +#: apt.conf.5.xml:396 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "Acquire::CompressionTypes::Order:: \"gz\";" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:381 +#: apt.conf.5.xml:399 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:374 +#: apt.conf.5.xml:392 msgid "" "Also the <literal>Order</literal> subgroup can be used to define in which " "order the acquire system will try to download the compressed files. The " @@ -6614,13 +6683,13 @@ msgstr "" "<literal>bz2</literal> à liste car il sera ajouté automatiquement." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:385 +#: apt.conf.5.xml:403 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:383 +#: apt.conf.5.xml:401 msgid "" "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" "replaceable></literal> will be checked: If this setting exists the method " @@ -6646,7 +6715,7 @@ msgstr "" "simplement préfixée avec l'option en question." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:390 +#: apt.conf.5.xml:408 msgid "" "While it is possible to add an empty compression type to the order list, but " "APT in its current version doesn't understand it correctly and will display " @@ -6662,18 +6731,28 @@ msgstr "" "non compressés afin de gérer des miroirs locaux." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:396 +#: apt.conf.5.xml:414 msgid "Languages" msgstr "Langues" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:397 +#: apt.conf.5.xml:415 +#, fuzzy +#| msgid "" +#| "The Languages subsection controls which <filename>Translation</filename> " +#| "files are downloaded and in which order APT tries to display the " +#| "Description-Translations. APT will try to display the first available " +#| "Description for the Language which is listed at first. Languages can be " +#| "defined with their short or long Languagecodes. Note that not all " +#| "archives provide <filename>Translation</filename> files for every " +#| "Language - especially the long Languagecodes are rare, so please inform " +#| "you which ones are available before you set here impossible values." msgid "" "The Languages subsection controls which <filename>Translation</filename> " "files are downloaded and in which order APT tries to display the Description-" -"Translations. APT will try to display the first available Description for " -"the Language which is listed at first. Languages can be defined with their " -"short or long Languagecodes. Note that not all archives provide " +"Translations. APT will try to display the first available Description in the " +"Language which is listed at first. Languages can be defined with their short " +"or long Languagecodes. Note that not all archives provide " "<filename>Translation</filename> files for every Language - especially the " "long Languagecodes are rare, so please inform you which ones are available " "before you set here impossible values." @@ -6685,22 +6764,43 @@ msgstr "" "choisie en premier. Les langues peuvent être indiquées par leur code long ou " "court. Veuillez noter que tous les dépôts ne fournissent pas les fichiers " "<filename>Translation</filename> pour toutes les langues, particulièrement " -"pour les code de langues long sont rares. Il est donc conseillé de vous renseigner sur ce " -"qui est disponible avant d'établir des réglages impossibles." +"pour les code de langues long sont rares. Il est donc conseillé de vous " +"renseigner sur ce qui est disponible avant d'établir des réglages " +"impossibles." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting> -#: apt.conf.5.xml:413 +#: apt.conf.5.xml:431 #, no-wrap msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" msgstr "Acquire::Languages { \"environment\"; \"fr\"; \"en\"; \"none\"; \"de\"; };" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:403 +#: apt.conf.5.xml:421 +#, fuzzy +#| msgid "" +#| "The default list includes \"environment\" and \"en\". " +#| "\"<literal>environment</literal>\" has a special meaning here: It will be " +#| "replaced at runtime with the languagecodes extracted from the " +#| "<literal>LC_MESSAGES</literal> enviroment variable. It will also ensure " +#| "that these codes are not included twice in the list. If " +#| "<literal>LC_MESSAGES</literal> is set to \"C\" only the " +#| "<filename>Translation-en</filename> file (if available) will be used. To " +#| "force apt to use no Translation file use the setting <literal>Acquire::" +#| "Languages=none</literal>. \"<literal>none</literal>\" is another special " +#| "meaning code which will stop the search for a fitting " +#| "<filename>Translation</filename> file. This can be used by the system " +#| "administrator to let APT know that it should download also this files " +#| "without actually use them if not the environment specifies this " +#| "languages. So the following example configuration will result in the " +#| "order \"en, de\" in an english and in \"de, en\" in a german " +#| "localization. Note that \"fr\" is downloaded, but not used if APT is not " +#| "used in a french localization, in such an environment the order would be " +#| "\"fr, de, en\". <placeholder type=\"programlisting\" id=\"0\"/>" msgid "" "The default list includes \"environment\" and \"en\". " "\"<literal>environment</literal>\" has a special meaning here: It will be " "replaced at runtime with the languagecodes extracted from the " -"<literal>LC_MESSAGES</literal> enviroment variable. It will also ensure " +"<literal>LC_MESSAGES</literal> environment variable. It will also ensure " "that these codes are not included twice in the list. If " "<literal>LC_MESSAGES</literal> is set to \"C\" only the " "<filename>Translation-en</filename> file (if available) will be used. To " @@ -6709,7 +6809,7 @@ msgid "" "meaning code which will stop the search for a fitting <filename>Translation</" "filename> file. This can be used by the system administrator to let APT " "know that it should download also this files without actually use them if " -"not the environment specifies this languages. So the following example " +"the environment doesn't specify this languages. So the following example " "configuration will result in the order \"en, de\" in an english and in \"de, " "en\" in a german localization. Note that \"fr\" is downloaded, but not used " "if APT is not used in a french localization, in such an environment the " @@ -6737,7 +6837,7 @@ msgstr "" "\"/>" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:217 +#: apt.conf.5.xml:228 msgid "" "The <literal>Acquire</literal> group of options controls the download of " "packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>" @@ -6747,12 +6847,12 @@ msgstr "" "id=\"0\"/>" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:420 +#: apt.conf.5.xml:438 msgid "Directories" msgstr "Les répertoires" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:422 +#: apt.conf.5.xml:440 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@ -6772,7 +6872,7 @@ msgstr "" "filename>." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:429 +#: apt.conf.5.xml:447 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@ -6788,14 +6888,14 @@ msgstr "" "<literal>srcpkgcache</literal> et <literal>pkgcache</literal>, ainsi que " "l'endroit où sont placées les archives téléchargées, <literal>Dir::Cache::" "archives</literal>. On peut empêcher la création des caches en saisissant un " -"nom vide. Cela ralentit le démarrage mais économise de l'espace disque. Il vaut " -"mieux se passer du cache <literal>pkgcache</literal> plutôt que se passer du " -"cache <literal>srcpkgcache</literal>. Comme pour <literal>Dir::State</" -"literal>, le répertoire par défaut est contenu dans <literal>Dir::Cache</" -"literal>." +"nom vide. Cela ralentit le démarrage mais économise de l'espace disque. Il " +"vaut mieux se passer du cache <literal>pkgcache</literal> plutôt que se " +"passer du cache <literal>srcpkgcache</literal>. Comme pour <literal>Dir::" +"State</literal>, le répertoire par défaut est contenu dans <literal>Dir::" +"Cache</literal>." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:438 +#: apt.conf.5.xml:456 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@ -6810,7 +6910,7 @@ msgstr "" "fichier de configuration indiqué par la variable <envar>APT_CONFIG</envar>)." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:444 +#: apt.conf.5.xml:462 msgid "" "The <literal>Dir::Parts</literal> setting reads in all the config fragments " "in lexical order from the directory specified. After this is done then the " @@ -6821,14 +6921,7 @@ msgstr "" "configuration est chargé." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:448 -#| msgid "" -#| "Binary programs are pointed to by <literal>Dir::Bin</literal>. " -#| "<literal>Dir::Bin::Methods</literal> specifies the location of the method " -#| "handlers and <literal>gzip</literal>, <literal>dpkg</literal>, " -#| "<literal>apt-get</literal> <literal>dpkg-source</literal> <literal>dpkg-" -#| "buildpackage</literal> and <literal>apt-cache</literal> specify the " -#| "location of the respective programs." +#: apt.conf.5.xml:466 msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" "Bin::Methods</literal> specifies the location of the method handlers and " @@ -6846,7 +6939,7 @@ msgstr "" "programmes correspondants." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:456 +#: apt.conf.5.xml:474 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@ -6868,12 +6961,12 @@ msgstr "" "staging/var/lib/dpkg/status</filename>." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:469 +#: apt.conf.5.xml:487 msgid "APT in DSelect" msgstr "APT et DSelect" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:471 +#: apt.conf.5.xml:489 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behaviour. These are in the <literal>DSelect</literal> " @@ -6884,12 +6977,12 @@ msgstr "" "<literal>DSelect</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:475 +#: apt.conf.5.xml:493 msgid "Clean" msgstr "Clean" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:476 +#: apt.conf.5.xml:494 msgid "" "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto " "and never. always and prompt will remove all packages from the cache after " @@ -6907,7 +7000,7 @@ msgstr "" "supprime avant de récupérer de nouveaux paquets." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:485 +#: apt.conf.5.xml:503 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the install phase." @@ -6916,12 +7009,12 @@ msgstr "" "&apt-get; lors de la phase d'installation." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:489 +#: apt.conf.5.xml:507 msgid "Updateoptions" msgstr "UpdateOptions" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:490 +#: apt.conf.5.xml:508 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the update phase." @@ -6930,12 +7023,12 @@ msgstr "" "&apt-get; lors de la phase de mise à jour." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:494 +#: apt.conf.5.xml:512 msgid "PromptAfterUpdate" msgstr "PromptAfterUpdate" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:495 +#: apt.conf.5.xml:513 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." @@ -6945,12 +7038,12 @@ msgstr "" "d'erreur que l'on propose à l'utilisateur d'intervenir." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:501 +#: apt.conf.5.xml:519 msgid "How APT calls dpkg" msgstr "Méthode d'appel de &dpkg; par APT" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:502 +#: apt.conf.5.xml:520 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." @@ -6959,7 +7052,7 @@ msgstr "" "&dpkg; : elles figurent dans la section <literal>DPkg</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:507 +#: apt.conf.5.xml:525 msgid "" "This is a list of options to pass to dpkg. The options must be specified " "using the list notation and each list item is passed as a single argument to " @@ -6970,17 +7063,17 @@ msgstr "" "est passé comme un seul paramètre à &dpkg;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:512 +#: apt.conf.5.xml:530 msgid "Pre-Invoke" msgstr "Pre-Invoke" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:512 +#: apt.conf.5.xml:530 msgid "Post-Invoke" msgstr "Post-Invoke" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:513 +#: apt.conf.5.xml:531 msgid "" "This is a list of shell commands to run before/after invoking &dpkg;. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -6993,12 +7086,12 @@ msgstr "" "<filename>/bin/sh</filename> : APT s'arrête dès que l'une d'elles échoue." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:519 +#: apt.conf.5.xml:537 msgid "Pre-Install-Pkgs" msgstr "Pre-Install-Pkgs" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:520 +#: apt.conf.5.xml:538 msgid "" "This is a list of shell commands to run before invoking dpkg. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -7014,7 +7107,7 @@ msgstr "" "qu'il va installer, à raison d'un par ligne." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:526 +#: apt.conf.5.xml:544 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@ -7030,12 +7123,12 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:533 +#: apt.conf.5.xml:551 msgid "Run-Directory" msgstr "Run-Directory" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:534 +#: apt.conf.5.xml:552 msgid "" "APT chdirs to this directory before invoking dpkg, the default is <filename>/" "</filename>." @@ -7044,12 +7137,12 @@ msgstr "" "le répertoire <filename>/</filename>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:538 +#: apt.conf.5.xml:556 msgid "Build-options" msgstr "Build-options" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:539 +#: apt.conf.5.xml:557 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages, the " "default is to disable signing and produce all binaries." @@ -7059,14 +7152,14 @@ msgstr "" "créés." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt.conf.5.xml:544 +#: apt.conf.5.xml:562 msgid "dpkg trigger usage (and related options)" msgstr "" "utilisation des actions différées (« triggers ») de dpkg (et options " "associées)" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:545 +#: apt.conf.5.xml:563 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 " @@ -7093,7 +7186,7 @@ msgstr "" "configuration des paquets." #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:560 +#: apt.conf.5.xml:578 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@ -7107,7 +7200,7 @@ msgstr "" "DPkg::TriggersPending \"true\";" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:554 +#: apt.conf.5.xml:572 msgid "" "Note that it is not guaranteed that APT will support these options or that " "these options will not cause (big) trouble in the future. If you have " @@ -7131,12 +7224,12 @@ msgstr "" "type=\"literallayout\" id=\"0\"/>." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:566 +#: apt.conf.5.xml:584 msgid "DPkg::NoTriggers" msgstr "DPkg::NoTriggers" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:567 +#: apt.conf.5.xml:585 msgid "" "Add the no triggers flag to all dpkg calls (except the ConfigurePending " "call). See &dpkg; if you are interested in what this actually means. In " @@ -7158,13 +7251,12 @@ msgstr "" "options « unpack » et « remove »." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:574 -#| msgid "Packages::Compress" +#: apt.conf.5.xml:592 msgid "PackageManager::Configure" msgstr "PackageManager::Configure" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:575 +#: apt.conf.5.xml:593 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@ -7192,12 +7284,12 @@ msgstr "" "configuré et donc éventuellement non amorçable." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:585 +#: apt.conf.5.xml:603 msgid "DPkg::ConfigurePending" msgstr "DPkg::ConfigurePending" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:586 +#: apt.conf.5.xml:604 msgid "" "If this option is set apt will call <command>dpkg --configure --pending</" "command> to let dpkg handle all required configurations and triggers. This " @@ -7216,12 +7308,12 @@ msgstr "" "peut conserver l'option active." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:592 +#: apt.conf.5.xml:610 msgid "DPkg::TriggersPending" msgstr "DPkg::TriggersPending" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:593 +#: apt.conf.5.xml:611 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@ -7239,12 +7331,12 @@ msgstr "" "celles concernant le paquet en cours de traitement." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:598 +#: apt.conf.5.xml:616 msgid "PackageManager::UnpackAll" msgstr "PackageManager::UnpackAll" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:599 +#: apt.conf.5.xml:617 msgid "" "As the configuration can be deferred to be done at the end by dpkg it can be " "tried to order the unpack series only by critical needs, e.g. by Pre-" @@ -7269,12 +7361,12 @@ msgstr "" "traduction n'est pas exclu...)." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:606 +#: apt.conf.5.xml:624 msgid "OrderList::Score::Immediate" msgstr "OrderList::Score::Immediate" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:614 +#: apt.conf.5.xml:632 #, no-wrap msgid "" "OrderList::Score {\n" @@ -7292,7 +7384,7 @@ msgstr "" "};" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:607 +#: apt.conf.5.xml:625 msgid "" "Essential packages (and there dependencies) should be configured immediately " "after unpacking. It will be a good idea to do this quite early in the " @@ -7318,12 +7410,12 @@ msgstr "" "id=\"0\"/>" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:627 +#: apt.conf.5.xml:645 msgid "Periodic and Archives options" msgstr "Options « Periodic » et « Archive »" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:628 +#: apt.conf.5.xml:646 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@ -7335,12 +7427,12 @@ msgstr "" "script <literal>/etc/cron.daily/apt</literal>, lancé quotidiennement." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:636 +#: apt.conf.5.xml:654 msgid "Debug options" msgstr "Les options de débogage" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:638 +#: apt.conf.5.xml:656 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -7358,7 +7450,7 @@ msgstr "" "peuvent tout de même être utiles :" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:649 +#: apt.conf.5.xml:667 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@ -7369,7 +7461,7 @@ msgstr "" "upgrade, upgrade, install, remove et purge</literal>." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:657 +#: apt.conf.5.xml:675 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@ -7381,7 +7473,7 @@ msgstr "" "superutilisateur." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:666 +#: apt.conf.5.xml:684 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -7391,9 +7483,9 @@ msgstr "" #. TODO: provide a #. motivating example, except I haven't a clue why you'd want -#. to do this. +#. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:674 +#: apt.conf.5.xml:692 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CDROM IDs." @@ -7402,59 +7494,62 @@ msgstr "" "type statfs dans les identifiants de CD." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:684 +#: apt.conf.5.xml:702 msgid "A full list of debugging options to apt follows." msgstr "Liste complète des options de débogage de APT :" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:689 +#: apt.conf.5.xml:707 msgid "<literal>Debug::Acquire::cdrom</literal>" msgstr "<literal>Debug::Acquire::cdrom</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:693 -msgid "Print information related to accessing <literal>cdrom://</literal> sources." +#: apt.conf.5.xml:711 +msgid "" +"Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" "Affiche les informations concernant les sources de type <literal>cdrom://</" "literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:700 +#: apt.conf.5.xml:718 msgid "<literal>Debug::Acquire::ftp</literal>" msgstr "<literal>Debug::Acquire::ftp</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:704 +#: apt.conf.5.xml:722 msgid "Print information related to downloading packages using FTP." -msgstr "Affiche les informations concernant le téléchargement de paquets par FTP." +msgstr "" +"Affiche les informations concernant le téléchargement de paquets par FTP." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:711 +#: apt.conf.5.xml:729 msgid "<literal>Debug::Acquire::http</literal>" msgstr "<literal>Debug::Acquire::http</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:715 +#: apt.conf.5.xml:733 msgid "Print information related to downloading packages using HTTP." -msgstr "Affiche les informations concernant le téléchargement de paquets par HTTP." +msgstr "" +"Affiche les informations concernant le téléchargement de paquets par HTTP." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:722 +#: apt.conf.5.xml:740 msgid "<literal>Debug::Acquire::https</literal>" msgstr "<literal>Debug::Acquire::https</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:726 +#: apt.conf.5.xml:744 msgid "Print information related to downloading packages using HTTPS." msgstr "Print information related to downloading packages using HTTPS." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:733 +#: apt.conf.5.xml:751 msgid "<literal>Debug::Acquire::gpgv</literal>" msgstr "<literal>Debug::Acquire::gpgv</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:737 +#: apt.conf.5.xml:755 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." @@ -7463,12 +7558,12 @@ msgstr "" "cryptographiques avec <literal>gpg</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:744 +#: apt.conf.5.xml:762 msgid "<literal>Debug::aptcdrom</literal>" msgstr "<literal>Debug::aptcdrom</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:748 +#: apt.conf.5.xml:766 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." @@ -7477,24 +7572,24 @@ msgstr "" "stockées sur CD." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:755 +#: apt.conf.5.xml:773 msgid "<literal>Debug::BuildDeps</literal>" msgstr "<literal>Debug::BuildDeps</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:758 +#: apt.conf.5.xml:776 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" "Décrit le processus de résolution des dépendances pour la construction de " "paquets source ( « build-dependencies » ) par &apt-get;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:765 +#: apt.conf.5.xml:783 msgid "<literal>Debug::Hashes</literal>" msgstr "<literal>Debug::Hashes</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:768 +#: apt.conf.5.xml:786 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." @@ -7503,12 +7598,12 @@ msgstr "" "librairies d'<literal>apt</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:775 +#: apt.conf.5.xml:793 msgid "<literal>Debug::IdentCDROM</literal>" msgstr "<literal>Debug::IdentCDROM</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:778 +#: apt.conf.5.xml:796 msgid "" "Do not include information from <literal>statfs</literal>, namely the number " "of used and free blocks on the CD-ROM filesystem, when generating an ID for " @@ -7519,12 +7614,12 @@ msgstr "" "utilisés sur le système de fichier du CD." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:786 +#: apt.conf.5.xml:804 msgid "<literal>Debug::NoLocking</literal>" msgstr "<literal>Debug::NoLocking</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:789 +#: apt.conf.5.xml:807 msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." @@ -7534,24 +7629,24 @@ msgstr "" "temps." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:797 +#: apt.conf.5.xml:815 msgid "<literal>Debug::pkgAcquire</literal>" msgstr "<literal>Debug::pkgAcquire</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:801 +#: apt.conf.5.xml:819 msgid "Log when items are added to or removed from the global download queue." msgstr "" "Trace les ajouts et suppressions d'éléments de la queue globale de " "téléchargement." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:808 +#: apt.conf.5.xml:826 msgid "<literal>Debug::pkgAcquire::Auth</literal>" msgstr "<literal>Debug::pkgAcquire::Auth</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:811 +#: apt.conf.5.xml:829 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." @@ -7561,12 +7656,12 @@ msgstr "" "éventuelles." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:818 +#: apt.conf.5.xml:836 msgid "<literal>Debug::pkgAcquire::Diffs</literal>" msgstr "<literal>Debug::pkgAcquire::Diffs</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:821 +#: apt.conf.5.xml:839 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." @@ -7576,12 +7671,12 @@ msgstr "" "éventuelles." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:829 +#: apt.conf.5.xml:847 msgid "<literal>Debug::pkgAcquire::RRed</literal>" msgstr "<literal>Debug::pkgAcquire::RRed</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:833 +#: apt.conf.5.xml:851 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." @@ -7591,24 +7686,25 @@ msgstr "" "place des fichiers complets." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:840 +#: apt.conf.5.xml:858 msgid "<literal>Debug::pkgAcquire::Worker</literal>" msgstr "<literal>Debug::pkgAcquire::Worker</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:844 -msgid "Log all interactions with the sub-processes that actually perform downloads." +#: apt.conf.5.xml:862 +msgid "" +"Log all interactions with the sub-processes that actually perform downloads." msgstr "" "Affiche toutes les interactions avec les processus enfants qui se chargent " "effectivement des téléchargements." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:851 +#: apt.conf.5.xml:869 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "<literal>Debug::pkgAutoRemove</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:855 +#: apt.conf.5.xml:873 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." @@ -7617,12 +7713,12 @@ msgstr "" "automatiquement, et la suppression des paquets inutiles." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:862 +#: apt.conf.5.xml:880 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "<literal>Debug::pkgDepCache::AutoInstall</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:865 +#: apt.conf.5.xml:883 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@ -7637,12 +7733,12 @@ msgstr "" "de APT ; voir <literal>Debug::pkgProblemResolver</literal> pour ce dernier." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:876 +#: apt.conf.5.xml:894 msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "<literal>Debug::pkgDepCache::Marker</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:879 +#: apt.conf.5.xml:897 msgid "" "Generate debug messages describing which package is marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@ -7677,24 +7773,24 @@ msgstr "" "de APT ; voir <literal>Debug::pkgProblemResolver</literal> pour ce dernier." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:898 +#: apt.conf.5.xml:916 msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "<literal>Debug::pkgInitConfig</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:901 +#: apt.conf.5.xml:919 msgid "Dump the default configuration to standard error on startup." msgstr "" "Affiche, au lancement, l'ensemble de la configuration sur la sortie d'erreur " "standard." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:908 +#: apt.conf.5.xml:926 msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "<literal>Debug::pkgDPkgPM</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:911 +#: apt.conf.5.xml:929 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." @@ -7703,12 +7799,12 @@ msgstr "" "paramètres sont séparés par des espaces." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:919 +#: apt.conf.5.xml:937 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:922 +#: apt.conf.5.xml:940 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." @@ -7718,12 +7814,12 @@ msgstr "" "fichier." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:929 +#: apt.conf.5.xml:947 msgid "<literal>Debug::pkgOrderList</literal>" msgstr "<literal>Debug::pkgOrderList</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:933 +#: apt.conf.5.xml:951 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." @@ -7732,32 +7828,33 @@ msgstr "" "<literal>apt</literal> passe les paquets à &dpkg;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:941 +#: apt.conf.5.xml:959 msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "<literal>Debug::pkgPackageManager</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:945 -msgid "Output status messages tracing the steps performed when invoking &dpkg;." +#: apt.conf.5.xml:963 +msgid "" +"Output status messages tracing the steps performed when invoking &dpkg;." msgstr "Affiche le détail des opérations liées à l'invocation de &dpkg;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:952 +#: apt.conf.5.xml:970 msgid "<literal>Debug::pkgPolicy</literal>" msgstr "<literal>Debug::pkgPolicy</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:956 +#: apt.conf.5.xml:974 msgid "Output the priority of each package list on startup." msgstr "Affiche, au lancement, la priorité de chaque liste de paquets." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:962 +#: apt.conf.5.xml:980 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "<literal>Debug::pkgProblemResolver</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:966 +#: apt.conf.5.xml:984 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." @@ -7766,12 +7863,12 @@ msgstr "" "concerne que les cas où un problème de dépendances complexe se présente)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:974 +#: apt.conf.5.xml:992 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "<literal>Debug::pkgProblemResolver::ShowScores</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:977 +#: apt.conf.5.xml:995 msgid "" "Display a list of all installed packages with their calculated score used by " "the pkgProblemResolver. The description of the package is the same as " @@ -7782,12 +7879,12 @@ msgstr "" "est décrite dans <literal>Debug::pkgDepCache::Marker</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:985 +#: apt.conf.5.xml:1003 msgid "<literal>Debug::sourceList</literal>" msgstr "<literal>Debug::sourceList</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:989 +#: apt.conf.5.xml:1007 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." @@ -7796,7 +7893,7 @@ msgstr "" "list</filename>." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1012 +#: apt.conf.5.xml:1030 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." @@ -7805,18 +7902,17 @@ msgstr "" "exemples pour toutes les options existantes." #. type: Content of: <refentry><refsect1><variablelist> -#: apt.conf.5.xml:1019 -#| msgid "&apt-conf;" +#: apt.conf.5.xml:1037 msgid "&file-aptconf;" msgstr "&file-aptconf;" -#. ? reading apt.conf +#. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1024 +#: apt.conf.5.xml:1042 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-cache;, &apt-config;, &apt-preferences;." -#. The last update date +#. The last update date #. type: Content of: <refentry><refentryinfo> #: apt_preferences.5.xml:13 msgid "&apt-author.team; &apt-email; &apt-product; <date>04 May 2009</date>" @@ -7834,10 +7930,6 @@ msgstr "Fichier de contrôle des préférences pour APT" #. type: Content of: <refentry><refsect1><para> #: apt_preferences.5.xml:34 -#| msgid "" -#| "The APT preferences file <filename>/etc/apt/preferences</filename> can be " -#| "used to control which versions of packages will be selected for " -#| "installation." msgid "" "The APT preferences file <filename>/etc/apt/preferences</filename> and the " "fragment files in the <filename>/etc/apt/preferences.d/</filename> folder " @@ -7886,25 +7978,36 @@ msgstr "" "&sources-list;. Le fichier des préférences n'influe pas sur le choix des " "exemplaires, seulement sur le choix de la version." -#. type: Content of: <refentry><refsect1><refsect2><title> +#. type: Content of: <refentry><refsect1><para> #: apt_preferences.5.xml:56 +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." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt_preferences.5.xml:63 msgid "APT's Default Priority Assignments" msgstr "Priorités affectées par défaut" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:71 +#: apt_preferences.5.xml:78 #, no-wrap msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n" msgstr "<command>apt-get install -t testing <replaceable>paquet</replaceable></command>\n" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:74 +#: apt_preferences.5.xml:81 #, no-wrap msgid "APT::Default-Release \"stable\";\n" msgstr "APT::Default-Release \"stable\";\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:58 +#: apt_preferences.5.xml:65 msgid "" "If there is no preferences file or if there is no entry in the file that " "applies to a particular version then the priority assigned to that version " @@ -7929,22 +8032,22 @@ msgstr "" "\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:83 +#: apt_preferences.5.xml:90 msgid "priority 100" msgstr "une priorité égale à 100" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:84 +#: apt_preferences.5.xml:91 msgid "to the version that is already installed (if any)." msgstr "est affectée à la version déjà installée (si elle existe)." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:88 +#: apt_preferences.5.xml:95 msgid "priority 500" msgstr "une priorité égale à 500" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:89 +#: apt_preferences.5.xml:96 msgid "" "to the versions that are not installed and do not belong to the target " "release." @@ -7953,19 +8056,20 @@ msgstr "" "pas à la distribution par défaut." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:93 +#: apt_preferences.5.xml:100 msgid "priority 990" msgstr "une priorité égale à 990" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:94 -msgid "to the versions that are not installed and belong to the target release." +#: apt_preferences.5.xml:101 +msgid "" +"to the versions that are not installed and belong to the target release." msgstr "" "est affectée aux versions qui ne sont pas installées et qui appartiennent à " "la distribution par défaut." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:78 +#: apt_preferences.5.xml:85 msgid "" "If the target release has been specified then APT uses the following " "algorithm to set the priorities of the versions of a package. Assign: " @@ -7976,7 +8080,7 @@ msgstr "" "type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:99 +#: apt_preferences.5.xml:106 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 " @@ -7987,7 +8091,7 @@ msgstr "" "une priorité égale à 500 à tout version non installée." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:103 +#: apt_preferences.5.xml:110 msgid "" "APT then applies the following rules, listed in order of precedence, to " "determine which version of a package to install." @@ -7996,7 +8100,7 @@ msgstr "" "qu'il faut installer (par ordre de priorité) :" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:106 +#: apt_preferences.5.xml:113 msgid "" "Never downgrade unless the priority of an available version exceeds 1000. " "(\"Downgrading\" is installing a less recent version of a package in place " @@ -8012,12 +8116,12 @@ msgstr "" "arrière." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:112 +#: apt_preferences.5.xml:119 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:113 +#: apt_preferences.5.xml:120 msgid "" "If two or more versions have the same priority, install the most recent one " "(that is, the one with the higher version number)." @@ -8026,7 +8130,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:116 +#: apt_preferences.5.xml:123 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</" @@ -8038,7 +8142,7 @@ msgstr "" "qui n'est pas installée." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:122 +#: apt_preferences.5.xml:129 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 " @@ -8053,7 +8157,7 @@ msgstr "" "replaceable></command> ou <command>apt-get dist-upgrade</command>." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:129 +#: apt_preferences.5.xml:136 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 " @@ -8066,7 +8170,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:134 +#: apt_preferences.5.xml:141 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 " @@ -8085,12 +8189,12 @@ msgstr "" "priorité que celle de la version installée." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:143 +#: apt_preferences.5.xml:150 msgid "The Effect of APT Preferences" msgstr "Conséquences des préférences" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:145 +#: apt_preferences.5.xml:152 msgid "" "The APT preferences file allows the system administrator to control the " "assignment of priorities. The file consists of one or more multi-line " @@ -8103,7 +8207,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:151 +#: apt_preferences.5.xml:158 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 " @@ -8118,7 +8222,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:158 +#: apt_preferences.5.xml:165 #, no-wrap msgid "" "Package: perl\n" @@ -8130,7 +8234,7 @@ msgstr "" "Pin-Priority: 1001\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:164 +#: apt_preferences.5.xml:171 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 " @@ -8145,7 +8249,7 @@ msgstr "" "un nom complètement qualifié." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:170 +#: apt_preferences.5.xml:177 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 " @@ -8156,7 +8260,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:175 +#: apt_preferences.5.xml:182 #, no-wrap msgid "" "Package: *\n" @@ -8168,7 +8272,7 @@ msgstr "" "Pin-Priority: 999\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:180 +#: apt_preferences.5.xml:187 msgid "" "A note of caution: the keyword used here is \"<literal>origin</literal>\". " "This should not be confused with the Origin of a distribution as specified " @@ -8183,7 +8287,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:186 +#: apt_preferences.5.xml:193 msgid "" "The following record assigns a low priority to all package versions " "belonging to any distribution whose Archive name is \"<literal>unstable</" @@ -8194,7 +8298,7 @@ msgstr "" "<literal>unstable</literal>." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:190 +#: apt_preferences.5.xml:197 #, no-wrap msgid "" "Package: *\n" @@ -8206,7 +8310,7 @@ msgstr "" "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:195 +#: apt_preferences.5.xml:202 msgid "" "The following record assigns a high priority to all package versions " "belonging to any distribution whose Codename is \"<literal>squeeze</literal>" @@ -8217,7 +8321,7 @@ msgstr "" "<literal>squeeze</literal>." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:199 +#: apt_preferences.5.xml:206 #, no-wrap msgid "" "Package: *\n" @@ -8229,7 +8333,7 @@ msgstr "" "Pin-Priority: 900\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:204 +#: apt_preferences.5.xml:211 msgid "" "The following record assigns a high priority to all package versions " "belonging to any release whose Archive name is \"<literal>stable</literal>\" " @@ -8241,7 +8345,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:209 +#: apt_preferences.5.xml:216 #, no-wrap msgid "" "Package: *\n" @@ -8253,17 +8357,17 @@ msgstr "" "Pin-Priority: 500\n" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:220 +#: apt_preferences.5.xml:227 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:228 +#: apt_preferences.5.xml:235 msgid "P > 1000" msgstr "P > 1000" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:229 +#: apt_preferences.5.xml:236 msgid "" "causes a version to be installed even if this constitutes a downgrade of the " "package" @@ -8272,12 +8376,12 @@ msgstr "" "retour en arrière." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:233 +#: apt_preferences.5.xml:240 msgid "990 < P <=1000" msgstr "990 < P <=1000" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:234 +#: apt_preferences.5.xml:241 msgid "" "causes a version to be installed even if it does not come from the target " "release, unless the installed version is more recent" @@ -8287,12 +8391,12 @@ msgstr "" "plus récente." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:239 +#: apt_preferences.5.xml:246 msgid "500 < P <=990" msgstr "500 < P <=990" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:240 +#: apt_preferences.5.xml:247 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" @@ -8301,12 +8405,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:245 +#: apt_preferences.5.xml:252 msgid "100 < P <=500" msgstr "100 < P <=500" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:246 +#: apt_preferences.5.xml:253 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" @@ -8315,29 +8419,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:251 +#: apt_preferences.5.xml:258 msgid "0 < P <=100" msgstr "0 < P <=100" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:252 +#: apt_preferences.5.xml:259 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:256 +#: apt_preferences.5.xml:263 msgid "P < 0" msgstr "P < 0" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:257 +#: apt_preferences.5.xml:264 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:223 +#: apt_preferences.5.xml:230 msgid "" "Priorities (P) assigned in the APT preferences file must be positive or " "negative integers. They are interpreted as follows (roughly speaking): " @@ -8348,7 +8452,7 @@ msgstr "" "<placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:262 +#: apt_preferences.5.xml:269 msgid "" "If any specific-form records match an available package version then the " "first such record determines the priority of the package version. Failing " @@ -8362,7 +8466,7 @@ msgstr "" "trouvée détermine la priorité." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:268 +#: apt_preferences.5.xml:275 msgid "" "For example, suppose the APT preferences file contains the three records " "presented earlier:" @@ -8371,7 +8475,7 @@ msgstr "" "entrées décrites ci-dessous :" #. type: Content of: <refentry><refsect1><refsect2><programlisting> -#: apt_preferences.5.xml:272 +#: apt_preferences.5.xml:279 #, no-wrap msgid "" "Package: perl\n" @@ -8399,12 +8503,12 @@ msgstr "" "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:285 +#: apt_preferences.5.xml:292 msgid "Then:" msgstr "Alors :" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:287 +#: apt_preferences.5.xml:294 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 " @@ -8418,7 +8522,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:292 +#: apt_preferences.5.xml:299 msgid "" "A version of any package other than <literal>perl</literal> that is " "available from the local system has priority over other versions, even " @@ -8429,7 +8533,7 @@ msgstr "" "appartenant à la distribution par défaut." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:296 +#: apt_preferences.5.xml:303 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</" @@ -8442,12 +8546,13 @@ msgstr "" "paquet n'est déjà installée." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:306 +#: apt_preferences.5.xml:313 msgid "Determination of Package Version and Distribution Properties" -msgstr "Détermination de la version des paquets et des propriétés des distributions" +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:308 +#: apt_preferences.5.xml:315 msgid "" "The locations listed in the &sources-list; file should provide " "<filename>Packages</filename> and <filename>Release</filename> files to " @@ -8458,27 +8563,27 @@ msgstr "" "décrivent les paquets disponibles à cet endroit." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:320 +#: apt_preferences.5.xml:327 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:321 +#: apt_preferences.5.xml:328 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:324 apt_preferences.5.xml:374 +#: apt_preferences.5.xml:331 apt_preferences.5.xml:381 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:325 +#: apt_preferences.5.xml:332 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:312 +#: apt_preferences.5.xml:319 msgid "" "The <filename>Packages</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable>/" @@ -8499,12 +8604,12 @@ msgstr "" "\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:341 +#: apt_preferences.5.xml:348 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:342 +#: apt_preferences.5.xml:349 msgid "" "names the archive to which all the packages in the directory tree belong. " "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies " @@ -8521,18 +8626,18 @@ msgstr "" "préférences demanderait cette ligne :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:352 +#: apt_preferences.5.xml:359 #, 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:358 +#: apt_preferences.5.xml:365 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:359 +#: apt_preferences.5.xml:366 msgid "" "names the codename to which all the packages in the directory tree belong. " "For example, the line \"Codename: squeeze\" specifies that all of the " @@ -8548,13 +8653,13 @@ msgstr "" "préférences demanderait cette ligne :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:368 +#: apt_preferences.5.xml:375 #, no-wrap msgid "Pin: release n=squeeze\n" msgstr "Pin: release n=squeeze\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:375 +#: apt_preferences.5.xml:382 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 " @@ -8570,7 +8675,7 @@ msgstr "" "préférences demanderait ces lignes :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:384 +#: apt_preferences.5.xml:391 #, no-wrap msgid "" "Pin: release v=3.0\n" @@ -8582,12 +8687,12 @@ msgstr "" "Pin: release 3.0\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:393 +#: apt_preferences.5.xml:400 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:394 +#: apt_preferences.5.xml:401 msgid "" "names the licensing component associated with the packages in the directory " "tree of the <filename>Release</filename> file. For example, the line " @@ -8605,18 +8710,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:403 +#: apt_preferences.5.xml:410 #, 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:409 +#: apt_preferences.5.xml:416 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:410 +#: apt_preferences.5.xml:417 msgid "" "names the originator of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@ -8629,18 +8734,18 @@ msgstr "" "ligne :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:416 +#: apt_preferences.5.xml:423 #, 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:422 +#: apt_preferences.5.xml:429 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:423 +#: apt_preferences.5.xml:430 msgid "" "names the label of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@ -8653,13 +8758,13 @@ msgstr "" "préférences demanderait cette ligne :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:429 +#: apt_preferences.5.xml:436 #, 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:330 +#: apt_preferences.5.xml:337 msgid "" "The <filename>Release</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for " @@ -8681,7 +8786,7 @@ msgstr "" "déterminer les priorités : <placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:436 +#: apt_preferences.5.xml:443 msgid "" "All of the <filename>Packages</filename> and <filename>Release</filename> " "files retrieved from locations listed in the &sources-list; file are stored " @@ -8706,12 +8811,12 @@ msgstr "" "<literal>unstable</literal>." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:449 +#: apt_preferences.5.xml:456 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:451 +#: apt_preferences.5.xml:458 msgid "" "Each record in the APT preferences file can optionally begin with one or " "more lines beginning with the word <literal>Explanation:</literal>. This " @@ -8722,7 +8827,7 @@ msgstr "" "commentaires." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:455 +#: apt_preferences.5.xml:462 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 value " @@ -8735,12 +8840,12 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:464 +#: apt_preferences.5.xml:471 msgid "Tracking Stable" msgstr "Méthode pour suivre Stable" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:472 +#: apt_preferences.5.xml:479 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated\n" @@ -8764,7 +8869,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:466 +#: apt_preferences.5.xml:473 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 " @@ -8779,8 +8884,8 @@ msgstr "" "literal>. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:489 apt_preferences.5.xml:535 -#: apt_preferences.5.xml:593 +#: apt_preferences.5.xml:496 apt_preferences.5.xml:542 +#: apt_preferences.5.xml:600 #, no-wrap msgid "" "apt-get install <replaceable>package-name</replaceable>\n" @@ -8792,7 +8897,7 @@ msgstr "" "apt-get dist-upgrade\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:484 +#: apt_preferences.5.xml:491 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 " @@ -8805,13 +8910,13 @@ msgstr "" "\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:501 +#: apt_preferences.5.xml:508 #, 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:495 +#: apt_preferences.5.xml:502 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>testing</literal> distribution; the package " @@ -8824,12 +8929,12 @@ msgstr "" "de relancer la commande. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:507 +#: apt_preferences.5.xml:514 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:516 +#: apt_preferences.5.xml:523 #, no-wrap msgid "" "Package: *\n" @@ -8857,7 +8962,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:509 +#: apt_preferences.5.xml:516 msgid "" "The following APT preferences file will cause APT to assign a high priority " "to package versions from the <literal>testing</literal> distribution, a " @@ -8874,7 +8979,7 @@ msgstr "" "<placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:530 +#: apt_preferences.5.xml:537 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 " @@ -8887,13 +8992,13 @@ msgstr "" "type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:550 +#: apt_preferences.5.xml:557 #, 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:541 +#: apt_preferences.5.xml:548 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>unstable</literal> distribution. " @@ -8912,12 +9017,12 @@ msgstr "" "installée. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:557 +#: apt_preferences.5.xml:564 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:571 +#: apt_preferences.5.xml:578 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated package versions\n" @@ -8951,7 +9056,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:559 +#: apt_preferences.5.xml:566 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 " @@ -8975,7 +9080,7 @@ msgstr "" "exemples précédents. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:588 +#: apt_preferences.5.xml:595 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 " @@ -8988,13 +9093,13 @@ msgstr "" "type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:608 +#: apt_preferences.5.xml:615 #, 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:599 +#: apt_preferences.5.xml:606 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>sid</literal> distribution. Thereafter, " @@ -9013,13 +9118,12 @@ msgstr "" "type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><variablelist> -#: apt_preferences.5.xml:617 -#| msgid "apt_preferences" +#: apt_preferences.5.xml:624 msgid "&file-preferences;" msgstr "&file-preferences;" #. type: Content of: <refentry><refsect1><para> -#: apt_preferences.5.xml:623 +#: apt_preferences.5.xml:630 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;" msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;" @@ -9035,11 +9139,6 @@ msgstr "Liste des sources de paquets" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:34 -#| msgid "" -#| "The package resource list is used to locate archives of the package " -#| "distribution system in use on the system. At this time, this manual page " -#| "documents only the packaging system used by the Debian GNU/Linux system. " -#| "This control file is located in <filename>/etc/apt/sources.list</filename>" msgid "" "The package resource list is used to locate archives of the package " "distribution system in use on the system. At this time, this manual page " @@ -9053,15 +9152,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:39 -#| msgid "" -#| "The source list is designed to support any number of active sources and a " -#| "variety of source media. The file lists one source per line, with the " -#| "most preferred source listed first. The format of each line is: " -#| "<literal>type uri args</literal> The first item, <literal>type</literal> " -#| "determines the format for <literal>args</literal> <literal>uri</literal> " -#| "is a Universal Resource Identifier (URI), which is a superset of the more " -#| "specific and well-known Universal Resource Locator, or URL. The rest of " -#| "the line can be marked as a comment by using a #." msgid "" "The source list is designed to support any number of active sources and a " "variety of source media. The file lists one source per line, with the most " @@ -9112,16 +9202,6 @@ msgstr "Les types deb et deb-src." #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:61 -#| 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, " @@ -9146,9 +9226,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:73 -#| msgid "" -#| "The format for a <filename>sources.list</filename> entry using the " -#| "<literal>deb</literal> and <literal>deb-src</literal> types are:" msgid "" "The format for a <filename>sources.list</filename> entry using the " "<literal>deb</literal> and <literal>deb-src</literal> types is:" @@ -9164,15 +9241,6 @@ msgstr "deb uri distribution [composant1] [composant2] [...]" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:78 -#| msgid "" -#| "The URI for the <literal>deb</literal> type must specify the base of the " -#| "Debian distribution, from which APT will find the information it needs. " -#| "<literal>distribution</literal> can specify an exact path, in which case " -#| "the components must be omitted and <literal>distribution</literal> must " -#| "end with a slash (/). This is useful for when only a particular sub-" -#| "section of the archive denoted by the URI is of interest. If " -#| "<literal>distribution</literal> does not specify an exact path, at least " -#| "one <literal>component</literal> must be present." msgid "" "The URI for the <literal>deb</literal> type must specify the base of the " "Debian distribution, from which APT will find the information it needs. " @@ -9299,13 +9367,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: sources.list.5.xml:141 -#| msgid "" -#| "The http scheme specifies an HTTP server for the archive. If an " -#| "environment variable <envar>http_proxy</envar> is set with the format " -#| "http://server:port/, the proxy server specified in <envar>http_proxy</" -#| "envar> will be used. Users of authenticated HTTP/1.1 proxies may use a " -#| "string of the format http://user:pass@server:port/ Note that this is an " -#| "insecure method of authentication." msgid "" "The http scheme specifies an HTTP server for the archive. If an environment " "variable <envar>http_proxy</envar> is set with the format http://server:" @@ -9385,17 +9446,29 @@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> #: sources.list.5.xml:178 -msgid "more recongnizable URI types" +#, fuzzy +#| msgid "more recongnizable URI types" +msgid "more recognizable URI types" msgstr "type d'URI les plus simples à reconnaître" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: sources.list.5.xml:180 +#, fuzzy +#| msgid "" +#| "APT can be extended with more methods shipped in other optional packages " +#| "which should follow the nameing scheme <literal>apt-transport-" +#| "<replaceable>method</replaceable></literal>. The APT team e.g. maintain " +#| "also the <literal>apt-transport-https</literal> package which provides " +#| "access methods for https-URIs with features similiar to the http method, " +#| "but other methods for using e.g. debtorrent are also available, see " +#| "<citerefentry> <refentrytitle><filename>apt-transport-debtorrent</" +#| "filename></refentrytitle> <manvolnum>1</manvolnum></citerefentry>." msgid "" "APT can be extended with more methods shipped in other optional packages " "which should follow the nameing scheme <literal>apt-transport-" -"<replaceable>method</replaceable></literal>. The APT team e.g. maintain " +"<replaceable>method</replaceable></literal>. The APT team e.g. maintains " "also the <literal>apt-transport-https</literal> package which provides " -"access methods for https-URIs with features similiar to the http method, but " +"access methods for https-URIs with features similar to the http method, but " "other methods for using e.g. debtorrent are also available, see " "<citerefentry> <refentrytitle><filename>apt-transport-debtorrent</filename></" "refentrytitle> <manvolnum>1</manvolnum></citerefentry>." @@ -9490,11 +9563,6 @@ msgstr "deb ftp://ftp.debian.org/debian stable contrib" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:212 -#| msgid "" -#| "Uses FTP to access the archive at ftp.debian.org, under the debian " -#| "directory, and uses only the unstable/contrib area. If this line appears " -#| "as well as the one in the previous example in <filename>sources.list</" -#| "filename>. a single FTP session will be used for both resource lines." msgid "" "Uses FTP to access the archive at ftp.debian.org, under the debian " "directory, and uses only the unstable/contrib area. If this line appears as " @@ -9574,7 +9642,8 @@ msgstr "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $" #. type: <abstract></abstract> #: guide.sgml:11 -msgid "This document provides an overview of how to use the the APT package manager." +msgid "" +"This document provides an overview of how to use the the APT package manager." msgstr "" "Ce document fournit un aperçu des méthode d'utilisation du gestionnaire de " "paquets APT." @@ -9608,7 +9677,6 @@ msgstr "" #. type: <heading></heading> #: guide.sgml:32 -#| msgid "generate" msgid "General" msgstr "Généralités" @@ -9674,9 +9742,16 @@ msgstr "" #. type: <p></p> #: guide.sgml:63 +#, fuzzy +#| msgid "" +#| "For instance, mailcrypt is an emacs extension that aids in encrypting " +#| "email with GPG. Without GPGP installed mail-crypt is useless, so " +#| "mailcrypt has a simple dependency on GPG. Also, because it is an emacs " +#| "extension it has a simple dependency on emacs, without emacs it is " +#| "completely useless." msgid "" "For instance, mailcrypt is an emacs extension that aids in encrypting email " -"with GPG. Without GPGP installed mail-crypt is useless, so mailcrypt has a " +"with GPG. Without GPGP installed mailcrypt is useless, so mailcrypt has a " "simple dependency on GPG. Also, because it is an emacs extension it has a " "simple dependency on emacs, without emacs it is completely useless." msgstr "" @@ -9898,7 +9973,6 @@ msgstr "" #. type: <heading></heading> #: guide.sgml:168 -#| msgid "APT in DSelect" msgid "DSelect" msgstr "DSelect" @@ -9918,9 +9992,20 @@ msgstr "" #. type: <p></p> #: guide.sgml:184 -msgid "" -"To enable the APT method you need to to select [A]ccess in <prgn>dselect</" -"prgn> and then choose the APT method. You will be prompted for a set of " +#, fuzzy +#| msgid "" +#| "To enable the APT method you need to to select [A]ccess in <prgn>dselect</" +#| "prgn> and then choose the APT method. You will be prompted for a set of " +#| "<em>Sources</em> which are places to fetch archives from. These can be " +#| "remote Internet sites, local Debian mirrors or CDROMs. Each source can " +#| "provide a fragment of the total Debian archive, APT will automatically " +#| "combine them to form a complete set of packages. If you have a CDROM then " +#| "it is a good idea to specify it first and then specify a mirror so that " +#| "you have access to the latest bug fixes. APT will automatically use " +#| "packages on your CDROM before downloading from the Internet." +msgid "" +"To enable the APT method you need to select [A]ccess in <prgn>dselect</prgn> " +"and then choose the APT method. You will be prompted for a set of " "<em>Sources</em> which are places to fetch archives from. These can be " "remote Internet sites, local Debian mirrors or CDROMs. Each source can " "provide a fragment of the total Debian archive, APT will automatically " @@ -10060,9 +10145,16 @@ msgstr "" #. type: <p></p> #: guide.sgml:247 +#, fuzzy +#| msgid "" +#| "Before starting to use <prgn>dselect</prgn> it is necessary to update the " +#| "available list by selecting [U]pdate from the menu. This is a super-set " +#| "of <tt>apt-get update</tt> that makes the fetched information available " +#| "to <prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get " +#| "update</tt> has been run before." msgid "" "Before starting to use <prgn>dselect</prgn> it is necessary to update the " -"available list by selecting [U]pdate from the menu. This is a super-set of " +"available list by selecting [U]pdate from the menu. This is a superset of " "<tt>apt-get update</tt> that makes the fetched information available to " "<prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get update</" "tt> has been run before." @@ -10303,9 +10395,12 @@ msgid "" "final state of things, taking into account the <tt>-f</tt> option and any " "other relevant activities to the command being executed." msgstr "" -"Avant de démarrer ses actions, <prgn>apt-get</prgn> en affiche un résumé. En général, ce rapport dépend du type d'opération qui est entreprise, mais de nombreux éléments " -"sont communs aux différents types de rapports. Ainsi, dans tous les cas, les listes reflètent l'état final du système, en tenant compte de l'option <tt>-f</tt> et des " -"autres opérations découlant du type de commande utilisée." +"Avant de démarrer ses actions, <prgn>apt-get</prgn> en affiche un résumé. En " +"général, ce rapport dépend du type d'opération qui est entreprise, mais de " +"nombreux éléments sont communs aux différents types de rapports. Ainsi, dans " +"tous les cas, les listes reflètent l'état final du système, en tenant compte " +"de l'option <tt>-f</tt> et des autres opérations découlant du type de " +"commande utilisée." #. type: <heading></heading> #: guide.sgml:364 @@ -10338,8 +10433,10 @@ msgid "" "generated for an <tt>install</tt> command. The listed packages are often the " "result of an Auto Install." msgstr "" -"La liste des paquets supplémentaires montre tous les paquets installés ou mis à jour en plus de ceux indiqués à la ligne de commande. Elle n'apparaît qu'avec la commande <" -"tt>install</tt>. Le plus souvent, les paquets concernés sont le résultat d'une installation automatique." +"La liste des paquets supplémentaires montre tous les paquets installés ou " +"mis à jour en plus de ceux indiqués à la ligne de commande. Elle n'apparaît " +"qu'avec la commande <tt>install</tt>. Le plus souvent, les paquets concernés " +"sont le résultat d'une installation automatique." #. type: <heading></heading> #: guide.sgml:382 @@ -10373,10 +10470,14 @@ msgid "" "that are going to be removed because they are only partially installed, " "possibly due to an aborted installation." msgstr "" -"La liste des paquets à enlever montre tous les paquets qui seront supprimés du système. Elle peut apparaître pour tout type d'opération. Il est conseillé de l'inspecter en " -"détail afin de vérifier qu'aucun paquet important ne va être supprimé. L'option <tt>-f</tt> provoque notamment souvent des suppressions de paquets et il est déconseillé " -"d'être particulièrement attentif dans ce genre de cas. La liste peut comporter des paquets qui seront supprimés parce qu'ils sont seulement partiellement installés, par " -"exemple après l'interruption d'une opération d'installation." +"La liste des paquets à enlever montre tous les paquets qui seront supprimés " +"du système. Elle peut apparaître pour tout type d'opération. Il est " +"conseillé de l'inspecter en détail afin de vérifier qu'aucun paquet " +"important ne va être supprimé. L'option <tt>-f</tt> provoque notamment " +"souvent des suppressions de paquets et il est déconseillé d'être " +"particulièrement attentif dans ce genre de cas. La liste peut comporter des " +"paquets qui seront supprimés parce qu'ils sont seulement partiellement " +"installés, par exemple après l'interruption d'une opération d'installation." #. type: <heading></heading> #: guide.sgml:402 @@ -10400,8 +10501,9 @@ msgid "" "listed are not presently installed in the system but will be when APT is " "done." msgstr "" -"La liste des nouveaux paquets est un simple rappel des opérations qui vont avoir lieu. Les paquets affichés ne sont pas encore présents sur le système mais le seront une " -"fois qu'APT aura terminé." +"La liste des nouveaux paquets est un simple rappel des opérations qui vont " +"avoir lieu. Les paquets affichés ne sont pas encore présents sur le système " +"mais le seront une fois qu'APT aura terminé." #. type: <heading></heading> #: guide.sgml:414 @@ -10430,9 +10532,13 @@ msgid "" "to install is with <tt>apt-get install</tt> or by using <prgn>dselect</prgn> " "to resolve their problems." msgstr "" -"À chaque fois que le système entier est mis à jour, il est possible que de nouvelles versions de paquets ne puissent pas être installées car elles ont besoins ne nouveaux " -"paquets ou qu'elles entrent en conflit avec des paquets existants. Ces paquets apparaîtront alors dans la liste des paquets conservés. Le meilleure méthode pour " -"effectivement installer ces paquets est souvent de le faire explicitement avec la commande <tt>apt-get install</tt> ou avec <prgn>dselect</prgn>." +"À chaque fois que le système entier est mis à jour, il est possible que de " +"nouvelles versions de paquets ne puissent pas être installées car elles ont " +"besoins ne nouveaux paquets ou qu'elles entrent en conflit avec des paquets " +"existants. Ces paquets apparaîtront alors dans la liste des paquets " +"conservés. Le meilleure méthode pour effectivement installer ces paquets est " +"souvent de le faire explicitement avec la commande <tt>apt-get install</tt> " +"ou avec <prgn>dselect</prgn>." #. type: <heading></heading> #: guide.sgml:431 @@ -10456,8 +10562,10 @@ msgid "" "case it prints out a warning that the held package is going to be changed. " "This should only happen during dist-upgrade or install." msgstr "" -"Il peut parfois être utile de demander à APT d'installer un paquet retenu (« hold »). Dans ce cas, le programme affichera un avertissement indiquant que le paquet retenu " -"va être modifié. Cela ne se produira que lors de l'utilisation des commandes dist-upgrade ou install." +"Il peut parfois être utile de demander à APT d'installer un paquet retenu " +"(« hold »). Dans ce cas, le programme affichera un avertissement indiquant " +"que le paquet retenu va être modifié. Cela ne se produira que lors de " +"l'utilisation des commandes dist-upgrade ou install." #. type: <heading></heading> #: guide.sgml:444 @@ -10466,8 +10574,10 @@ msgstr "Résumé final" #. type: <p></p> #: guide.sgml:447 -msgid "Finally, APT will print out a summary of all the changes that will occur." -msgstr "Anfin, APT affichera un résumé de toutes les opérations qui prendront place." +msgid "" +"Finally, APT will print out a summary of all the changes that will occur." +msgstr "" +"Anfin, APT affichera un résumé de toutes les opérations qui prendront place." #. type: <example></example> #: guide.sgml:452 @@ -10498,19 +10608,29 @@ msgid "" "If a large number of packages are being removed then the value may indicate " "the amount of space that will be freed." msgstr "" -"La première ligne de ce résumé est une version simplifiée de l'ensemble des listes et indique le nombre de mises à jour (paquets déjà installés et pour lesquels une " -"nouvelle version est disponible). La deuxième ligne indique le nombre de paquets incorrectement configurés, en raison notamment d'installations interrompues. La dernière " -"ligne indique l'espace disque nécessaire pour effectuer l'installation. Le premier couple de nombre fait référence à la taille des fichiers d'archive. Le premier nombre " -"est le nombre d'octets à récupérer depuis les sites distants et le deuxième la taille totale de tous les fichiers nécessaires. Le nombre suivant représente la différence " -"d'espace occupé entre les paquets installés actuellement et ce qui sera ensuite installé. Il est grossièrement égal à l'espace supplémentaire nécessaire dans /usr après " -"achèvement de toutes les opérations. Si de nombreux paquets sont supprimés, cette valeur peut représenter l'espace qui est alors libéré." +"La première ligne de ce résumé est une version simplifiée de l'ensemble des " +"listes et indique le nombre de mises à jour (paquets déjà installés et pour " +"lesquels une nouvelle version est disponible). La deuxième ligne indique le " +"nombre de paquets incorrectement configurés, en raison notamment " +"d'installations interrompues. La dernière ligne indique l'espace disque " +"nécessaire pour effectuer l'installation. Le premier couple de nombre fait " +"référence à la taille des fichiers d'archive. Le premier nombre est le " +"nombre d'octets à récupérer depuis les sites distants et le deuxième la " +"taille totale de tous les fichiers nécessaires. Le nombre suivant représente " +"la différence d'espace occupé entre les paquets installés actuellement et ce " +"qui sera ensuite installé. Il est grossièrement égal à l'espace " +"supplémentaire nécessaire dans /usr après achèvement de toutes les " +"opérations. Si de nombreux paquets sont supprimés, cette valeur peut " +"représenter l'espace qui est alors libéré." #. type: <p></p> #: guide.sgml:473 msgid "" "Some other reports can be generated by using the -u option to show packages " "to upgrade, they are similar to the previous examples." -msgstr "D'autres rapports peuvent être créés avec l'option -u qui affiche les paquets à mettre à jour. Il sont analogues aux exemples précédents." +msgstr "" +"D'autres rapports peuvent être créés avec l'option -u qui affiche les " +"paquets à mettre à jour. Il sont analogues aux exemples précédents." #. type: <heading></heading> #: guide.sgml:477 @@ -10522,7 +10642,9 @@ msgstr "L'affichage d'état" msgid "" "During the download of archives and package files APT prints out a series of " "status messages." -msgstr "Pendant le téléchargement des fichiers des paquets, APT affiche un certain nombre de messages d'avancement." +msgstr "" +"Pendant le téléchargement des fichiers des paquets, APT affiche un certain " +"nombre de messages d'avancement." #. type: <example></example> #: guide.sgml:490 @@ -10554,9 +10676,13 @@ msgid "" "<tt>apt-get update</tt> estimates the percent done which causes some " "inaccuracies." msgstr "" -"Les lignes qui débutent par « Réception de » sont affichées quand APT démarre la récupération d'un fichier alors que la dernière ligne indique la progression du " -"téléchargement. La première valeur de pourcentage de la ligne est le pourcentage de téléchargement déjà effectué, pour l'ensemble des fichiers. Il faut noter que, comme la " -"taille des fichiers de paquets n'est pas connue, <tt>apt-get update</tt> estime le pourcentage effectué ce qui peut conduire à des imprécisions." +"Les lignes qui débutent par « Réception de » sont affichées quand APT démarre " +"la récupération d'un fichier alors que la dernière ligne indique la " +"progression du téléchargement. La première valeur de pourcentage de la ligne " +"est le pourcentage de téléchargement déjà effectué, pour l'ensemble des " +"fichiers. Il faut noter que, comme la taille des fichiers de paquets n'est " +"pas connue, <tt>apt-get update</tt> estime le pourcentage effectué ce qui " +"peut conduire à des imprécisions." #. type: <p></p> #: guide.sgml:509 @@ -10569,10 +10695,14 @@ msgid "" "The next word is the short form name of the object being downloaded. For " "archives it will contain the name of the package that is being fetched." msgstr "" -"La section suivante de la ligne d'état est répétée pour chaque sous-tâche de téléchargement. Elle indique l'opération effectuée et d'autres informations utiles sur ce qui " -"est en cours. Cette section indiquera parfois <em>Forking</em> ce qui indique que le système charge le module de téléchargement. Le premier mot après le crochet ouvrant " -"([) est le numéro d'ordre de téléchargement comme indiqué dans les lignes d'historique. Le mot suivant est le nom court de l'objet téléchargé. Pour les archives, il s'agit " -"du nom du paquet en cours de récupération." +"La section suivante de la ligne d'état est répétée pour chaque sous-tâche de " +"téléchargement. Elle indique l'opération effectuée et d'autres informations " +"utiles sur ce qui est en cours. Cette section indiquera parfois <em>Forking</" +"em> ce qui indique que le système charge le module de téléchargement. Le " +"premier mot après le crochet ouvrant ([) est le numéro d'ordre de " +"téléchargement comme indiqué dans les lignes d'historique. Le mot suivant " +"est le nom court de l'objet téléchargé. Pour les archives, il s'agit du nom " +"du paquet en cours de récupération." #. type: <p></p> #: guide.sgml:524 @@ -10591,13 +10721,21 @@ msgid "" "regularly and reflects the time to complete everything at the shown transfer " "rate." msgstr "" -"À l'intérieur des guillemets, on trouve une information sur la progression de la phase de négociation du téléchargement. Usuellement, elle évolue de <em>Connexion</em> à <" -"em>Attente du fichier</em>, puis <em>Téléchargement</em> ou <em>Reprise</em>. La valeur finale est le nombre d'octets téléchargés depuis le site distant. Une fois le " -"téléchargement commencé, cette indication prend la forme <tt>102/10,2ko</tt>, ce qui indique que 102 octets ont été téléchargés et que 10,2 kilo-octets sont attendus. La " -"taille totale est toujours représentées sur 4 digits pour des raisons de place disponible. Après cet affichage de taille, se trouve une barre de progression pour le " -"téléchargement du fichier lui-même. L'élément suivant est la vitesse instantanée de téléchargement. Elle est mise à jour toutes les 5 secondes et représente la vitesse de " -"transfert pour cette période. Enfin, est affiché la temps de téléchargement restant estimé. Cette information est mise régulièrement à jour et représete la durée estimée " -"de téléchargement de toute ce qui est nécessaire, à la vitesse affichée." +"À l'intérieur des guillemets, on trouve une information sur la progression " +"de la phase de négociation du téléchargement. Usuellement, elle évolue de " +"<em>Connexion</em> à <em>Attente du fichier</em>, puis <em>Téléchargement</" +"em> ou <em>Reprise</em>. La valeur finale est le nombre d'octets téléchargés " +"depuis le site distant. Une fois le téléchargement commencé, cette " +"indication prend la forme <tt>102/10,2ko</tt>, ce qui indique que 102 octets " +"ont été téléchargés et que 10,2 kilo-octets sont attendus. La taille totale " +"est toujours représentées sur 4 digits pour des raisons de place disponible. " +"Après cet affichage de taille, se trouve une barre de progression pour le " +"téléchargement du fichier lui-même. L'élément suivant est la vitesse " +"instantanée de téléchargement. Elle est mise à jour toutes les 5 secondes et " +"représente la vitesse de transfert pour cette période. Enfin, est affiché la " +"temps de téléchargement restant estimé. Cette information est mise " +"régulièrement à jour et représete la durée estimée de téléchargement de " +"toute ce qui est nécessaire, à la vitesse affichée." #. type: <p></p> #: guide.sgml:530 @@ -10608,9 +10746,12 @@ msgid "" "for logging to a file, use the <tt>-q</tt> option to remove the status " "display." msgstr "" -"La ligne d'état est mise à jour chaque demi-seconde afin de fournir un retour régulier sur la progression du téléchargement alors que les lignes « Réception de » reculent " -"d'une unité à chaque fois qu'un nouveau fichier est démarré. Comme l'état est mis à jour régulièrement, il ne peut pas servir pour la journalisation dans un fichier. Il " -"est nécessaire d'utiliser l'option <tt>-q</tt> pour supprimer cet affichage." +"La ligne d'état est mise à jour chaque demi-seconde afin de fournir un " +"retour régulier sur la progression du téléchargement alors que les lignes " +"« Réception de » reculent d'une unité à chaque fois qu'un nouveau fichier est " +"démarré. Comme l'état est mis à jour régulièrement, il ne peut pas servir " +"pour la journalisation dans un fichier. Il est nécessaire d'utiliser " +"l'option <tt>-q</tt> pour supprimer cet affichage." #. type: <heading></heading> #: guide.sgml:535 @@ -10627,9 +10768,13 @@ msgid "" "each question there is usually a description of what it is asking and the " "questions are too varied to discuss completely here." msgstr "" -"APT utilise <prgn>dpkg</prgn> pour installer les archives et bascule vers l'interface de ce programme une fois le téléchargement terminé. <prgn>dpkg</prgn> peut poser un " -"certain nombre de questions pendant le traitement des paquets, qui peuvent eux-même être amener à poser des questions. Chacune de ces questions comporte un description de " -"ce qui est attendu et elles sont trop variables d'un paquet à l'autre pour qu'une description détaillée soit donnée dans ce document." +"APT utilise <prgn>dpkg</prgn> pour installer les archives et bascule vers " +"l'interface de ce programme une fois le téléchargement terminé. <prgn>dpkg</" +"prgn> peut poser un certain nombre de questions pendant le traitement des " +"paquets, qui peuvent eux-même être amener à poser des questions. Chacune de " +"ces questions comporte un description de ce qui est attendu et elles sont " +"trop variables d'un paquet à l'autre pour qu'une description détaillée soit " +"donnée dans ce document." #. type: <title> #: offline.sgml:4 @@ -10646,7 +10791,10 @@ msgstr "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $" msgid "" "This document describes how to use APT in a non-networked environment, " "specifically a 'sneaker-net' approach for performing upgrades." -msgstr "Ce document décrit la méthode d'utilisation d'APT hors connexion à un réseau, et plus particulièrement une approche « sneaker-net » pour les mises à jour." +msgstr "" +"Ce document décrit la méthode d'utilisation d'APT hors connexion à un " +"réseau, et plus particulièrement une approche « sneaker-net » pour les mises " +"à jour." #. type: #: offline.sgml:16 @@ -10660,7 +10808,6 @@ msgstr "Introduction" #. type: #: offline.sgml:34 offline.sgml:65 offline.sgml:180 -#| msgid "OverrideDir" msgid "Overview" msgstr "Aperçu" @@ -10672,8 +10819,10 @@ msgid "" "machine is on a slow link, such as a modem and another machine has a very " "fast connection but they are physically distant." msgstr "" -"Normalement, APT a besoin d'avoir un accès direct à une archive Debian, soit sur un support local, soit via le réseau. Un autre cas intéressant à traiter est celui d'une " -"machine dotée d'une liaison peu rapide (comme un modem) avec une autre possédant une connexion à haut débit mais située à distance." +"Normalement, APT a besoin d'avoir un accès direct à une archive Debian, soit " +"sur un support local, soit via le réseau. Un autre cas intéressant à traiter " +"est celui d'une machine dotée d'une liaison peu rapide (comme un modem) avec " +"une autre possédant une connexion à haut débit mais située à distance." #. type:

#: offline.sgml:51 @@ -10688,22 +10837,37 @@ msgid "" "the machine downloading the packages, and target host the one with " "bad or no connection." msgstr "" -"Une solution est d'utiliser un support amovible de grande taille tel qu'un disque Zip ou un disque Superdisk (NdT : ce document est daté..:-)). Bien que ces supports ne " -"disposent pas d'assez de place pour héberger une archive Debian complète, ils peuvent toutefois contenir un sous-ensemble de taille suffisante pour les besoins de nombreux " -"utilisateurs. L'idée est alors d'utiliser APT pour créer une liste de paquets nécessaires, puis de les récupérer avec une machine disposant d'une bonne connectivité. Il " -"est même possible d'utiliser soit une autre machine Debian avec APT soit un autre système d'exploitation et un outil de téléchargement tel que wget. Dans ce qui suit, " -"machine distante désignera la machine qui télécharge les paquets et machine cible, celle qui a une connectivité limitée." +"Une solution est d'utiliser un support amovible de grande taille tel qu'un " +"disque Zip ou un disque Superdisk (NdT : ce document est daté..:-)). Bien " +"que ces supports ne disposent pas d'assez de place pour héberger une archive " +"Debian complète, ils peuvent toutefois contenir un sous-ensemble de taille " +"suffisante pour les besoins de nombreux utilisateurs. L'idée est alors " +"d'utiliser APT pour créer une liste de paquets nécessaires, puis de les " +"récupérer avec une machine disposant d'une bonne connectivité. Il est même " +"possible d'utiliser soit une autre machine Debian avec APT soit un autre " +"système d'exploitation et un outil de téléchargement tel que wget. Dans ce " +"qui suit, machine distante désignera la machine qui télécharge les " +"paquets et machine cible, celle qui a une connectivité limitée." #. type:

#: offline.sgml:57 +#, fuzzy +#| msgid "" +#| "This is achieved by creatively manipulating the APT configuration file. " +#| "The essential premis to tell APT to look on a disc for it's archive " +#| "files. Note that the disc should be formated with a filesystem that can " +#| "handle long file names such as ext2, fat32 or vfat." msgid "" "This is achieved by creatively manipulating the APT configuration file. The " -"essential premis to tell APT to look on a disc for it's archive files. Note " +"essential premise to tell APT to look on a disc for it's archive files. Note " "that the disc should be formated with a filesystem that can handle long file " "names such as ext2, fat32 or vfat." msgstr "" -"Il est nécessaire de manipuler le fichier de configuration d'APT de manière intelligente. Le préalable est d'indiquer à APT d'examiner le contenu d'un disque pour y " -"trouver les fichiers d'archive. Ce disque doit utiliser un système de fichier autorisant les noms longs, par exemple ext2, fat32 ou vfat." +"Il est nécessaire de manipuler le fichier de configuration d'APT de manière " +"intelligente. Le préalable est d'indiquer à APT d'examiner le contenu d'un " +"disque pour y trouver les fichiers d'archive. Ce disque doit utiliser un " +"système de fichier autorisant les noms longs, par exemple ext2, fat32 ou " +"vfat." #. type: #: offline.sgml:63 @@ -10718,8 +10882,11 @@ msgid "" "remote machine to fetch the latest package files and decide which packages " "to download. The disk directory structure should look like:" msgstr "" -"Si APT existe sur les deux machines, le cas est relativement simple. L'idée de base est de mettre une copie du fichier d'état sur le disque et d'utiliser la machine " -"distante pour récupérer la dernière liste de paquets et choisir ceux à télécharger. La structure des répertoires du disque devraient ressembler à :" +"Si APT existe sur les deux machines, le cas est relativement simple. L'idée " +"de base est de mettre une copie du fichier d'état sur le disque et " +"d'utiliser la machine distante pour récupérer la dernière liste de paquets " +"et choisir ceux à télécharger. La structure des répertoires du disque " +"devraient ressembler à :" #. type: #: offline.sgml:80 @@ -10745,7 +10912,6 @@ msgstr "" #. type: #: offline.sgml:88 -#| msgid "User configuration" msgid "The configuration file" msgstr "Le fichier de configuration" @@ -10759,9 +10925,13 @@ msgid "" "target host. Please note, if you are using a local archive you must " "use copy URIs, the syntax is identical to file URIs." msgstr "" -"Le fichier de configuration indique à APT où conserver ses fichiers sur le disque et d'utiliser également les fichiers de configuration du disque. Le fichier sources.list " -"devrait référencer les sites que vous souhaitez utiliser depuis la machine distante et le fichier d'état doit être une copie de /var/lib/dpkg/status de l'" -"ordinateur cible. Veuillez noter que si sous utilisez une archive locale, les URI doivent en être copiés. La syntaxe est la même que celle des URI fichiers." +"Le fichier de configuration indique à APT où conserver ses fichiers sur le " +"disque et d'utiliser également les fichiers de configuration du disque. Le " +"fichier sources.list devrait référencer les sites que vous souhaitez " +"utiliser depuis la machine distante et le fichier d'état doit être une copie " +"de /var/lib/dpkg/status de l'ordinateur cible. Veuillez " +"noter que si sous utilisez une archive locale, les URI doivent en être " +"copiés. La syntaxe est la même que celle des URI fichiers." #. type:

#: offline.sgml:100 @@ -10769,8 +10939,8 @@ msgid "" "apt.conf must contain the necessary information to make APT use the " "disc:" msgstr "" -"apt.conf doit avoir les informations nécessaires pour qu'APT utilise le disque." -"disc:" +"apt.conf doit avoir les informations nécessaires pour qu'APT " +"utilise le disque.disc:" #. type: #: offline.sgml:124 @@ -10830,21 +11000,32 @@ msgid "" "More details can be seen by examining the apt.conf man page and the sample " "configuration file in /usr/share/doc/apt/examples/apt.conf." msgstr "" -"Plus d'informations peuvent être trouvées dans la page de manuel du fichier apt.conf et dans l'exemple de fichier de configuration que l'on peut trouver dans " -"/usr/share/doc/apt/examples/apt.conf." +"Plus d'informations peuvent être trouvées dans la page de manuel du fichier " +"apt.conf et dans l'exemple de fichier de configuration que l'on peut trouver " +"dans /usr/share/doc/apt/examples/apt.conf." #. type:

#: offline.sgml:136 +#, fuzzy +#| msgid "" +#| "On the target machine the first thing to do is mount the disc and copy " +#| "/var/lib/dpkg/status to it. You will also need to create the " +#| "directories outlined in the Overview, archives/partial/ and " +#| "lists/partial/ Then take the disc to the remote machine and " +#| "configure the sources.list. On the remote machine execute the following:" msgid "" "On the target machine the first thing to do is mount the disc and copy /" "var/lib/dpkg/status to it. You will also need to create the directories " "outlined in the Overview, archives/partial/ and lists/partial/ Then take the disc to the remote machine and configure the sources.list. " -"On the remote machine execute the following:" +"em>. Then take the disc to the remote machine and configure the sources." +"list. On the remote machine execute the following:" msgstr "" -"Sur la machine cible, il est d'abord nécessaire de monter le disque et y copier le fichier /" -"var/lib/dpkg/status. Il sera aussi nécessaire de créer les répertoires dans l'aperçu (Overview), archives/partial/ and lists/partial/. Connecter " -"ensuite le disque à la machine distante et configurer le fichier sources.list. Sur la machine distante, exécuter la séquence de commandes suivante :" +"Sur la machine cible, il est d'abord nécessaire de monter le disque et y " +"copier le fichier /var/lib/dpkg/status. Il sera aussi nécessaire de " +"créer les répertoires dans l'aperçu (Overview), archives/partial/ " +"and lists/partial/. Connecter ensuite le disque à la machine " +"distante et configurer le fichier sources.list. Sur la machine distante, " +"exécuter la séquence de commandes suivante :" #. type: #: offline.sgml:142 @@ -10864,14 +11045,22 @@ msgstr "" #. type:

#: offline.sgml:149 +#, fuzzy +#| msgid "" +#| "The dist-upgrade command can be replaced with any-other standard APT " +#| "commands, particularly dselect-upgrade. You can even use an APT front end " +#| "such as dselect However this presents a problem in communicating " +#| "your selections back to the local computer." msgid "" -"The dist-upgrade command can be replaced with any-other standard APT " +"The dist-upgrade command can be replaced with any other standard APT " "commands, particularly dselect-upgrade. You can even use an APT front end " -"such as dselect However this presents a problem in communicating " +"such as dselect. However this presents a problem in communicating " "your selections back to the local computer." msgstr "" -"La commande dist-upgrade peut être remplacée par toute autres commande usuelle d'APT, notamment dselect-upgrade. Il est même possible d'utiliser une interface comme " -"dselect. Cependant, cela complique la communication des choix vers l'ordinateur local." +"La commande dist-upgrade peut être remplacée par toute autres commande " +"usuelle d'APT, notamment dselect-upgrade. Il est même possible d'utiliser " +"une interface comme dselect. Cependant, cela complique la " +"communication des choix vers l'ordinateur local." #. type:

#: offline.sgml:153 @@ -10879,8 +11068,9 @@ msgid "" "Now the disc contains all of the index files and archives needed to upgrade " "the target machine. Take the disc back and run:" msgstr "" -"Après cette opération, le disque contiendra tous les fichiers d'index et les archives nécessaires pour mettr eà jour la machine cible. Il est alors possible d'y ramener le " -"disque et exécuter :" +"Après cette opération, le disque contiendra tous les fichiers d'index et les " +"archives nécessaires pour mettr eà jour la machine cible. Il est alors " +"possible d'y ramener le disque et exécuter :" #. type: #: offline.sgml:159 @@ -10903,7 +11093,9 @@ msgstr "" msgid "" "It is necessary for proper function to re-specify the status file to be the " "local one. This is very important!" -msgstr "Pour un fonctionnement correct, il est indispensable de ré-indiquer que le fichier d'état est le fichier local. Cela est très important." +msgstr "" +"Pour un fonctionnement correct, il est indispensable de ré-indiquer que le " +"fichier d'état est le fichier local. Cela est très important." #. type:

#: offline.sgml:172 @@ -10914,9 +11106,12 @@ msgid "" "the local machine - but this may not always be possible. DO NOT copy the " "status file if dpkg or APT have been run in the mean time!!" msgstr "" -"Si vous utilisez dselect, vous pouvez effectuer l'opération dangereuse consistant à copier disc/status en /var/lib/dpkg/status, afin que les choix effectués sur la machine " -"distante soient mis à jour. Il est recommandé de n'éffectuer les choix que sur la machine locale, mais ce n'est pas toujours possible. NE COPIEZ PAS le fichier d'état si " -"dpkg ou APT ont été exécutés dans l'intervalle." +"Si vous utilisez dselect, vous pouvez effectuer l'opération dangereuse " +"consistant à copier disc/status en /var/lib/dpkg/status, afin que les choix " +"effectués sur la machine distante soient mis à jour. Il est recommandé de " +"n'éffectuer les choix que sur la machine locale, mais ce n'est pas toujours " +"possible. NE COPIEZ PAS le fichier d'état si dpkg ou APT ont été exécutés " +"dans l'intervalle." #. type: #: offline.sgml:178 @@ -10930,8 +11125,10 @@ msgid "" "any machine. Unlike the method above this requires that the Debian machine " "already has a list of available packages." msgstr "" -"wget est un outil classique de téléchargement qui peut être exécuté sur à peu près tout type de machine. À la différence de la méthode précédente, cela impose que " -"la machine Debian a déjà une liste des paquets disponibles." +"wget est un outil classique de téléchargement qui peut être exécuté " +"sur à peu près tout type de machine. À la différence de la méthode " +"précédente, cela impose que la machine Debian a déjà une liste des paquets " +"disponibles." #. type:

#: offline.sgml:190 @@ -10941,12 +11138,13 @@ msgid "" "option to apt-get and then preparing a wget script to actually fetch the " "packages." msgstr "" -"L'idée de base est de créer un disque qui ne comporte que les fichiers archive téléchargés depuis le site distant. Cela peut être effectué avec l'option --print-uris " -"d'apt-get puis de la préparation d'un script wget permettant de récupérer les paquets/" +"L'idée de base est de créer un disque qui ne comporte que les fichiers " +"archive téléchargés depuis le site distant. Cela peut être effectué avec " +"l'option --print-uris d'apt-get puis de la préparation d'un script wget " +"permettant de récupérer les paquets/" #. type: #: offline.sgml:196 -#| msgid "Options" msgid "Operation" msgstr "Fonctionnement" @@ -10956,8 +11154,9 @@ msgid "" "Unlike the previous technique no special configuration files are required. " "We merely use the standard APT commands to generate the file list." msgstr "" -"À la différence de la méthode précédente, aucun fichier de configuration spécifique n'est nécessaire. Seules les commandes standard d'APT seront utilisées pour créer la " -"liste de ficheirs." +"À la différence de la méthode précédente, aucun fichier de configuration " +"spécifique n'est nécessaire. Seules les commandes standard d'APT seront " +"utilisées pour créer la liste de ficheirs." #. type: #: offline.sgml:205 @@ -10978,7 +11177,9 @@ msgstr "" msgid "" "Any command other than dist-upgrade could be used here, including dselect-" "upgrade." -msgstr "Toute autre commande que dist-upgrade peut être utilisée, y compris dselect-upgrade." +msgstr "" +"Toute autre commande que dist-upgrade peut être utilisée, y compris dselect-" +"upgrade." #. type:

#: offline.sgml:216 @@ -10988,8 +11189,10 @@ msgid "" "with the current directory as the disc's mount point so as to save the " "output on the disc." msgstr "" -"Le fichier /disc/wget-script contiendra alors la liste des commandes wget à exécuter afin de récupérer les fichiers nécessaires. Ce script doit être exécuté depuis le " -"point de montage du disque afin que les fichiers soient écrits sur le disque." +"Le fichier /disc/wget-script contiendra alors la liste des commandes wget à " +"exécuter afin de récupérer les fichiers nécessaires. Ce script doit être " +"exécuté depuis le point de montage du disque afin que les fichiers soient " +"écrits sur le disque." #. type:

#: offline.sgml:219 @@ -11013,7 +11216,9 @@ msgstr "" msgid "" "Once the archives are downloaded and the disc returned to the Debian machine " "installation can proceed using," -msgstr "Une fois les fichiers téléchargés et le disque reconnecté à la machine Debian, l'installation peut se poursuivre avec :" +msgstr "" +"Une fois les fichiers téléchargés et le disque reconnecté à la machine " +"Debian, l'installation peut se poursuivre avec :" #. type: #: offline.sgml:230 @@ -11026,6 +11231,36 @@ 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 "/etc/apt/trusted.gpg" +#~ msgstr "/etc/apt/trusted.gpg" + +#~ msgid "Keyring of local trusted keys, new keys will be added here." +#~ msgstr "" +#~ "Trousseau de clés locales fiables : les nouvelles clés y seront ajoutées." + +#~ msgid "" +#~ "apt.conf is the main configuration file for the APT " +#~ "suite of tools, all tools make use of the configuration file and a common " +#~ "command line parser to provide a uniform environment. When an APT tool " +#~ "starts up it will read the configuration specified by the " +#~ "APT_CONFIG environment variable (if any) and then read the " +#~ "files in Dir::Etc::Parts then read the main " +#~ "configuration file specified by Dir::Etc::main then " +#~ "finally apply the command line options to override the configuration " +#~ "directives, possibly loading even more config files." +#~ msgstr "" +#~ "Le fichier apt.conf est le principal fichier de " +#~ "configuration de la collection d'outils que constitue APT ; tous les " +#~ "outils font appel à ce fichier de configuration et utilisent un analyseur " +#~ "syntaxique en ligne de commande commun afin de fournir un environnement " +#~ "uniforme. Quand un outil d'APT démarre, il lit la configuration désignée " +#~ "par variable d'environnement APT_CONFIG (si elle existe), " +#~ "puis il lit les fichiers situés dans Dir::Etc::Parts " +#~ "ainsi que le principal fichier de configuration indiqué par Dir::" +#~ "Etc::main ; enfin il applique les options de la ligne de " +#~ "commande qui prévalent sur les directives de configuration, chargeant si " +#~ "nécessaire d'autres fichiers de configuration." + #~ msgid "" #~ "Disable Immediate Configuration; This dangerous option disables some of " #~ "APT's ordering code to cause it to make fewer dpkg calls. Doing so may be " @@ -11059,13 +11294,6 @@ msgstr "Cette commande utilisera les fichiers récupérés sur le disque." #~ msgid "/etc/apt/apt.conf" #~ msgstr "/etc/apt/apt.conf" -#~ msgid "" -#~ "APT configuration file. Configuration Item: Dir::Etc::Main." -#~ msgstr "" -#~ "Fichier de configuration d'APT. Élément de configuration : Dir::" -#~ "Etc::Main." - #~ msgid "/etc/apt/apt.conf.d/" #~ msgstr "/etc/apt/apt.conf.d/" diff --git a/doc/po/it.po b/doc/po/it.po index 1dd0f0187..fd2e2994e 100644 --- a/doc/po/it.po +++ b/doc/po/it.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2010-01-11 15:12+0100\n" +"POT-Creation-Date: 2010-01-20 12:18+0100\n" "PO-Revision-Date: 2003-04-26 23:26+0100\n" "Last-Translator: Traduzione di Eugenia Franzoni \n" "Language-Team: \n" @@ -761,7 +761,7 @@ msgid "" msgstr "" #. type: Plain text -#: apt.ent:368 +#: apt.ent:369 #, no-wrap msgid "" " /etc/apt/trusted.gpg.d/\n" @@ -772,6 +772,38 @@ msgid "" "\">\n" msgstr "" +#. type: Plain text +#: apt.ent:371 +msgid "" +msgstr "" + +#. type: Plain text +#: apt.ent:380 +#, no-wrap +msgid "" +"\n" +"john@doe.org in 2009,\n" +" 2010 and Daniela Acme daniela@acme.us in 2010 together with the\n" +" Debian Dummy l10n Team debian-l10n-dummy@lists.debian.org.\n" +"\">\n" +msgstr "" + +#. type: Plain text +#: apt.ent:387 +#, no-wrap +msgid "" +"\n" +"\n" +msgstr "" + #. The last update date #. type: Content of: #: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13 @@ -1226,7 +1258,7 @@ msgstr "" #. type: Content of: #: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 #: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89 -#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:491 apt.conf.5.xml:513 +#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524 msgid "options" msgstr "" @@ -1427,7 +1459,7 @@ msgstr "" #. type: Content of: #: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122 -#: apt.conf.5.xml:1024 apt_preferences.5.xml:615 +#: apt.conf.5.xml:1035 apt_preferences.5.xml:622 msgid "Files" msgstr "" @@ -1440,7 +1472,7 @@ msgstr "" #: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 #: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569 #: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 -#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1030 apt_preferences.5.xml:622 +#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:629 #: sources.list.5.xml:233 msgid "See Also" msgstr "" @@ -2740,7 +2772,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1018 apt_preferences.5.xml:462 +#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1029 apt_preferences.5.xml:469 #: sources.list.5.xml:193 msgid "Examples" msgstr "" @@ -4250,7 +4282,7 @@ msgid "" "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</" "firstname> <surname>Burrows</surname> <contrib>Initial documentation of " "Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-email; " -"&apt-product; <date>18 September 2009</date>" +"&apt-product; <date>16 January 2010</date>" msgstr "" #. type: Content of: <refentry><refnamediv><refname> @@ -4272,18 +4304,54 @@ msgstr "" #: apt.conf.5.xml:40 msgid "" "<filename>apt.conf</filename> is the main configuration file for the APT " -"suite of tools, all tools make use of the configuration file and a common " -"command line parser to provide a uniform environment. When an APT tool " -"starts up it will read the configuration specified by the <envar>APT_CONFIG</" -"envar> environment variable (if any) and then read the files in " -"<literal>Dir::Etc::Parts</literal> then read the main configuration file " -"specified by <literal>Dir::Etc::main</literal> then finally apply the " -"command line options to override the configuration directives, possibly " -"loading even more config files." +"suite of tools, but by far not the only place changes to options can be " +"made. All tools therefore share the configuration files and also use a " +"common command line parser to provide a uniform environment." +msgstr "" + +#. type: Content of: <refentry><refsect1><orderedlist><para> +#: apt.conf.5.xml:45 +msgid "" +"When an APT tool starts up it will read the configuration files in the " +"following order:" +msgstr "" + +#. type: Content of: <refentry><refsect1><orderedlist><listitem><para> +#: apt.conf.5.xml:47 +msgid "" +"the file specified by the <envar>APT_CONFIG</envar> environment variable (if " +"any)" +msgstr "" + +#. type: Content of: <refentry><refsect1><orderedlist><listitem><para> +#: apt.conf.5.xml:49 +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." +msgstr "" + +#. type: Content of: <refentry><refsect1><orderedlist><listitem><para> +#: apt.conf.5.xml:54 +msgid "" +"the main configuration file specified by <literal>Dir::Etc::main</literal>" +msgstr "" + +#. type: Content of: <refentry><refsect1><orderedlist><listitem><para> +#: apt.conf.5.xml:56 +msgid "" +"the command line options are applied to override the configuration " +"directives or to load even more configuration files." +msgstr "" + +#. type: Content of: <refentry><refsect1><title> +#: apt.conf.5.xml:60 +msgid "Syntax" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:50 +#: apt.conf.5.xml:61 msgid "" "The configuration file is organized in a tree with options organized into " "functional groups. Option specification is given with a double colon " @@ -4293,7 +4361,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:56 +#: apt.conf.5.xml:67 msgid "" "Syntactically the configuration language is modeled after what the ISC tools " "such as bind and dhcp use. Lines starting with <literal>//</literal> are " @@ -4309,7 +4377,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><informalexample><programlisting> -#: apt.conf.5.xml:70 +#: apt.conf.5.xml:81 #, no-wrap msgid "" "APT {\n" @@ -4321,7 +4389,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:78 +#: apt.conf.5.xml:89 msgid "" "with newlines placed to make it more readable. Lists can be created by " "opening a scope and including a single string enclosed in quotes followed by " @@ -4329,27 +4397,27 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><informalexample><programlisting> -#: apt.conf.5.xml:83 +#: apt.conf.5.xml:94 #, no-wrap msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:86 +#: apt.conf.5.xml:97 msgid "" "In general the sample configuration file in <filename>&docdir;examples/apt." "conf</filename> &configureindex; is a good guide for how it should look." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:90 +#: apt.conf.5.xml:101 msgid "" "The names of the configuration items are not case-sensitive. So in the " "previous example you could use <literal>dpkg::pre-install-pkgs</literal>." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:93 +#: apt.conf.5.xml:104 msgid "" "Names for the configuration items are optional if a list is defined as it " "can be see in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. " @@ -4359,7 +4427,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:98 +#: apt.conf.5.xml:109 msgid "" "Two specials are allowed, <literal>#include</literal> (which is deprecated " "and not supported by alternative implementations) and <literal>#clear</" @@ -4371,7 +4439,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:106 +#: apt.conf.5.xml:117 msgid "" "The #clear command is the only way to delete a list or a complete scope. " "Reopening a scope or the ::-style described below will <emphasis>not</" @@ -4381,7 +4449,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:111 +#: apt.conf.5.xml:122 msgid "" "All of the APT tools take a -o option which allows an arbitrary " "configuration directive to be specified on the command line. The syntax is a " @@ -4392,7 +4460,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:118 +#: apt.conf.5.xml:129 msgid "" "Note that you can use :: only for appending one item per line to a list and " "that you should not use it in combination with the scope syntax. (The scope " @@ -4409,24 +4477,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:130 +#: apt.conf.5.xml:141 msgid "The APT Group" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:131 +#: apt.conf.5.xml:142 msgid "" "This group of options controls general APT behavior as well as holding the " "options for all of the tools." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:135 +#: apt.conf.5.xml:146 msgid "Architecture" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:136 +#: apt.conf.5.xml:147 msgid "" "System Architecture; sets the architecture to use when fetching files and " "parsing package lists. The internal default is the architecture apt was " @@ -4434,12 +4502,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:141 +#: apt.conf.5.xml:152 msgid "Default-Release" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:142 +#: apt.conf.5.xml:153 msgid "" "Default release to install packages from if more than one version available. " "Contains release name, codename or release version. Examples: 'stable', " @@ -4448,24 +4516,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:146 +#: apt.conf.5.xml:157 msgid "Ignore-Hold" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:147 +#: apt.conf.5.xml:158 msgid "" "Ignore Held packages; This global option causes the problem resolver to " "ignore held packages in its decision making." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:151 +#: apt.conf.5.xml:162 msgid "Clean-Installed" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:152 +#: apt.conf.5.xml:163 msgid "" "Defaults to on. When turned on the autoclean feature will remove any " "packages which can no longer be downloaded from the cache. If turned off " @@ -4474,12 +4542,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:158 +#: apt.conf.5.xml:169 msgid "Immediate-Configure" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:159 +#: apt.conf.5.xml:170 msgid "" "Defaults to on which will cause APT to install essential and important " "packages as fast as possible in the install/upgrade operation. This is done " @@ -4512,12 +4580,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:181 +#: apt.conf.5.xml:192 msgid "Force-LoopBreak" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:182 +#: apt.conf.5.xml:193 msgid "" "Never Enable this option unless you -really- know what you are doing. It " "permits APT to temporarily remove an essential package to break a Conflicts/" @@ -4528,82 +4596,82 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:190 +#: apt.conf.5.xml:201 msgid "Cache-Limit" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:191 +#: apt.conf.5.xml:202 msgid "" "APT uses a fixed size memory mapped cache file to store the 'available' " "information. This sets the size of that cache (in bytes)." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:195 +#: apt.conf.5.xml:206 msgid "Build-Essential" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:196 +#: apt.conf.5.xml:207 msgid "Defines which package(s) are considered essential build dependencies." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:199 +#: apt.conf.5.xml:210 msgid "Get" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:200 +#: apt.conf.5.xml:211 msgid "" "The Get subsection controls the &apt-get; tool, please see its documentation " "for more information about the options here." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:204 +#: apt.conf.5.xml:215 msgid "Cache" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:205 +#: apt.conf.5.xml:216 msgid "" "The Cache subsection controls the &apt-cache; tool, please see its " "documentation for more information about the options here." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:209 +#: apt.conf.5.xml:220 msgid "CDROM" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:210 +#: apt.conf.5.xml:221 msgid "" "The CDROM subsection controls the &apt-cdrom; tool, please see its " "documentation for more information about the options here." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:216 +#: apt.conf.5.xml:227 msgid "The Acquire Group" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:221 +#: apt.conf.5.xml:232 msgid "PDiffs" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:222 +#: apt.conf.5.xml:233 msgid "" "Try to download deltas called <literal>PDiffs</literal> for Packages or " "Sources files instead of downloading whole ones. True by default." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:225 +#: apt.conf.5.xml:236 msgid "" "Two sub-options to limit the use of PDiffs are also available: With " "<literal>FileLimit</literal> can be specified how many PDiff files are " @@ -4614,12 +4682,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:234 +#: apt.conf.5.xml:245 msgid "Queue-Mode" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:235 +#: apt.conf.5.xml:246 msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</" "literal> or <literal>access</literal> which determines how APT parallelizes " @@ -4629,36 +4697,36 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:242 +#: apt.conf.5.xml:253 msgid "Retries" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:243 +#: apt.conf.5.xml:254 msgid "" "Number of retries to perform. If this is non-zero APT will retry failed " "files the given number of times." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:247 +#: apt.conf.5.xml:258 msgid "Source-Symlinks" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:248 +#: apt.conf.5.xml:259 msgid "" "Use symlinks for source archives. If set to true then source archives will " "be symlinked when possible instead of copying. True is the default." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:252 sources.list.5.xml:139 +#: apt.conf.5.xml:263 sources.list.5.xml:139 msgid "http" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:253 +#: apt.conf.5.xml:264 msgid "" "HTTP URIs; http::Proxy is the default http proxy to use. It is in the " "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per " @@ -4669,7 +4737,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:261 +#: apt.conf.5.xml:272 msgid "" "Three settings are provided for cache control with HTTP/1.1 compliant proxy " "caches. <literal>No-Cache</literal> tells the proxy to not use its cached " @@ -4683,7 +4751,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:271 apt.conf.5.xml:335 +#: apt.conf.5.xml:282 apt.conf.5.xml:346 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method, this applies to all things including connection timeout and data " @@ -4691,7 +4759,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:274 +#: apt.conf.5.xml:285 msgid "" "One setting is provided to control the pipeline depth in cases where the " "remote server is not RFC conforming or buggy (such as Squid 2.0.2). " @@ -4703,7 +4771,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:282 +#: apt.conf.5.xml:293 msgid "" "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</" "literal> which accepts integer values in kilobyte. The default value is 0 " @@ -4713,7 +4781,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:287 +#: apt.conf.5.xml:298 msgid "" "<literal>Acquire::http::User-Agent</literal> can be used to set a different " "User-Agent for the http download method as some proxies allow access for " @@ -4721,12 +4789,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:293 +#: apt.conf.5.xml:304 msgid "https" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:294 +#: apt.conf.5.xml:305 msgid "" "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy " "options are the same as for <literal>http</literal> method and will also " @@ -4736,7 +4804,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:300 +#: apt.conf.5.xml:311 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is " @@ -4757,12 +4825,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:318 sources.list.5.xml:150 +#: apt.conf.5.xml:329 sources.list.5.xml:150 msgid "ftp" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:319 +#: apt.conf.5.xml:330 msgid "" "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard " "form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host " @@ -4781,7 +4849,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:338 +#: apt.conf.5.xml:349 msgid "" "Several settings are provided to control passive mode. Generally it is safe " "to leave passive mode on, it works in nearly every environment. However " @@ -4791,7 +4859,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:345 +#: apt.conf.5.xml:356 msgid "" "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</" "envar> environment variable to a http url - see the discussion of the http " @@ -4800,7 +4868,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:350 +#: apt.conf.5.xml:361 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@ -4810,18 +4878,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:357 sources.list.5.xml:132 +#: apt.conf.5.xml:368 sources.list.5.xml:132 msgid "cdrom" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:363 +#: apt.conf.5.xml:374 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:358 +#: apt.conf.5.xml:369 msgid "" "CDROM URIs; the only setting for CDROM URIs is the mount point, " "<literal>cdrom::Mount</literal> which must be the mount point for the CDROM " @@ -4834,12 +4902,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:368 +#: apt.conf.5.xml:379 msgid "gpgv" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:369 +#: apt.conf.5.xml:380 msgid "" "GPGV URIs; the only option for GPGV URIs is the option to pass additional " "parameters to gpgv. <literal>gpgv::Options</literal> Additional options " @@ -4847,18 +4915,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:374 +#: apt.conf.5.xml:385 msgid "CompressionTypes" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:380 +#: apt.conf.5.xml:391 #, no-wrap msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:375 +#: apt.conf.5.xml:386 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@ -4870,19 +4938,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:385 +#: apt.conf.5.xml:396 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:388 +#: apt.conf.5.xml:399 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:381 +#: apt.conf.5.xml:392 msgid "" "Also the <literal>Order</literal> subgroup can be used to define in which " "order the acquire system will try to download the compressed files. The " @@ -4899,13 +4967,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:392 +#: apt.conf.5.xml:403 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:390 +#: apt.conf.5.xml:401 msgid "" "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" "replaceable></literal> will be checked: If this setting exists the method " @@ -4920,7 +4988,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:397 +#: apt.conf.5.xml:408 msgid "" "While it is possible to add an empty compression type to the order list, but " "APT in its current version doesn't understand it correctly and will display " @@ -4930,12 +4998,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:403 +#: apt.conf.5.xml:414 msgid "Languages" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:404 +#: apt.conf.5.xml:415 msgid "" "The Languages subsection controls which <filename>Translation</filename> " "files are downloaded and in which order APT tries to display the Description-" @@ -4948,13 +5016,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting> -#: apt.conf.5.xml:420 +#: apt.conf.5.xml:431 #, no-wrap msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:410 +#: apt.conf.5.xml:421 msgid "" "The default list includes \"environment\" and \"en\". " "\"<literal>environment</literal>\" has a special meaning here: It will be " @@ -4977,19 +5045,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:217 +#: apt.conf.5.xml:228 msgid "" "The <literal>Acquire</literal> group of options controls the download of " "packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:427 +#: apt.conf.5.xml:438 msgid "Directories" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:429 +#: apt.conf.5.xml:440 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@ -5001,7 +5069,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:436 +#: apt.conf.5.xml:447 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@ -5014,7 +5082,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:445 +#: apt.conf.5.xml:456 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@ -5024,7 +5092,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:451 +#: apt.conf.5.xml:462 msgid "" "The <literal>Dir::Parts</literal> setting reads in all the config fragments " "in lexical order from the directory specified. After this is done then the " @@ -5032,7 +5100,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:455 +#: apt.conf.5.xml:466 msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" "Bin::Methods</literal> specifies the location of the method handlers and " @@ -5043,7 +5111,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:463 +#: apt.conf.5.xml:474 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@ -5056,13 +5124,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:476 +#: apt.conf.5.xml:487 #, fuzzy msgid "APT in DSelect" msgstr "DSelect" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:478 +#: apt.conf.5.xml:489 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behaviour. These are in the <literal>DSelect</literal> " @@ -5070,12 +5138,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:482 +#: apt.conf.5.xml:493 msgid "Clean" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:483 +#: apt.conf.5.xml:494 msgid "" "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto " "and never. always and prompt will remove all packages from the cache after " @@ -5086,50 +5154,50 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:492 +#: apt.conf.5.xml:503 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the install phase." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:496 +#: apt.conf.5.xml:507 msgid "Updateoptions" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:497 +#: apt.conf.5.xml:508 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the update phase." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:501 +#: apt.conf.5.xml:512 msgid "PromptAfterUpdate" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:502 +#: apt.conf.5.xml:513 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:508 +#: apt.conf.5.xml:519 msgid "How APT calls dpkg" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:509 +#: apt.conf.5.xml:520 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:514 +#: apt.conf.5.xml:525 msgid "" "This is a list of options to pass to dpkg. The options must be specified " "using the list notation and each list item is passed as a single argument to " @@ -5137,17 +5205,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:519 +#: apt.conf.5.xml:530 msgid "Pre-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:519 +#: apt.conf.5.xml:530 msgid "Post-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:520 +#: apt.conf.5.xml:531 msgid "" "This is a list of shell commands to run before/after invoking &dpkg;. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -5156,12 +5224,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:526 +#: apt.conf.5.xml:537 msgid "Pre-Install-Pkgs" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:527 +#: apt.conf.5.xml:538 msgid "" "This is a list of shell commands to run before invoking dpkg. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -5171,7 +5239,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:533 +#: apt.conf.5.xml:544 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@ -5181,36 +5249,36 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:540 +#: apt.conf.5.xml:551 msgid "Run-Directory" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:541 +#: apt.conf.5.xml:552 msgid "" "APT chdirs to this directory before invoking dpkg, the default is <filename>/" "</filename>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:545 +#: apt.conf.5.xml:556 msgid "Build-options" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:546 +#: apt.conf.5.xml:557 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages, the " "default is to disable signing and produce all binaries." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt.conf.5.xml:551 +#: apt.conf.5.xml:562 msgid "dpkg trigger usage (and related options)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:552 +#: apt.conf.5.xml:563 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 " @@ -5225,7 +5293,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:567 +#: apt.conf.5.xml:578 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@ -5235,7 +5303,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:561 +#: apt.conf.5.xml:572 msgid "" "Note that it is not guaranteed that APT will support these options or that " "these options will not cause (big) trouble in the future. If you have " @@ -5249,12 +5317,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:573 +#: apt.conf.5.xml:584 msgid "DPkg::NoTriggers" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:574 +#: apt.conf.5.xml:585 msgid "" "Add the no triggers flag to all dpkg calls (except the ConfigurePending " "call). See &dpkg; if you are interested in what this actually means. In " @@ -5266,12 +5334,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:581 +#: apt.conf.5.xml:592 msgid "PackageManager::Configure" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:582 +#: apt.conf.5.xml:593 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@ -5287,12 +5355,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:592 +#: apt.conf.5.xml:603 msgid "DPkg::ConfigurePending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:593 +#: apt.conf.5.xml:604 msgid "" "If this option is set apt will call <command>dpkg --configure --pending</" "command> to let dpkg handle all required configurations and triggers. This " @@ -5303,12 +5371,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:599 +#: apt.conf.5.xml:610 msgid "DPkg::TriggersPending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:600 +#: apt.conf.5.xml:611 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@ -5318,12 +5386,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:605 +#: apt.conf.5.xml:616 msgid "PackageManager::UnpackAll" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:606 +#: apt.conf.5.xml:617 msgid "" "As the configuration can be deferred to be done at the end by dpkg it can be " "tried to order the unpack series only by critical needs, e.g. by Pre-" @@ -5335,12 +5403,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:613 +#: apt.conf.5.xml:624 msgid "OrderList::Score::Immediate" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:621 +#: apt.conf.5.xml:632 #, no-wrap msgid "" "OrderList::Score {\n" @@ -5352,7 +5420,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:614 +#: apt.conf.5.xml:625 msgid "" "Essential packages (and there dependencies) should be configured immediately " "after unpacking. It will be a good idea to do this quite early in the " @@ -5366,12 +5434,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:634 +#: apt.conf.5.xml:645 msgid "Periodic and Archives options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:635 +#: apt.conf.5.xml:646 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@ -5380,12 +5448,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:643 +#: apt.conf.5.xml:654 msgid "Debug options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:645 +#: apt.conf.5.xml:656 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -5396,7 +5464,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:656 +#: apt.conf.5.xml:667 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@ -5404,7 +5472,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:664 +#: apt.conf.5.xml:675 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@ -5412,7 +5480,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:673 +#: apt.conf.5.xml:684 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -5422,111 +5490,111 @@ msgstr "" #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:681 +#: apt.conf.5.xml:692 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CDROM IDs." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:691 +#: apt.conf.5.xml:702 msgid "A full list of debugging options to apt follows." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:696 +#: apt.conf.5.xml:707 msgid "<literal>Debug::Acquire::cdrom</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:700 +#: apt.conf.5.xml:711 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:707 +#: apt.conf.5.xml:718 msgid "<literal>Debug::Acquire::ftp</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:711 +#: apt.conf.5.xml:722 msgid "Print information related to downloading packages using FTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:718 +#: apt.conf.5.xml:729 msgid "<literal>Debug::Acquire::http</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:722 +#: apt.conf.5.xml:733 msgid "Print information related to downloading packages using HTTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:729 +#: apt.conf.5.xml:740 msgid "<literal>Debug::Acquire::https</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:733 +#: apt.conf.5.xml:744 msgid "Print information related to downloading packages using HTTPS." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:740 +#: apt.conf.5.xml:751 msgid "<literal>Debug::Acquire::gpgv</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:744 +#: apt.conf.5.xml:755 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:751 +#: apt.conf.5.xml:762 msgid "<literal>Debug::aptcdrom</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:755 +#: apt.conf.5.xml:766 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:762 +#: apt.conf.5.xml:773 msgid "<literal>Debug::BuildDeps</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:765 +#: apt.conf.5.xml:776 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:772 +#: apt.conf.5.xml:783 msgid "<literal>Debug::Hashes</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:775 +#: apt.conf.5.xml:786 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:782 +#: apt.conf.5.xml:793 msgid "<literal>Debug::IdentCDROM</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:785 +#: apt.conf.5.xml:796 msgid "" "Do not include information from <literal>statfs</literal>, namely the number " "of used and free blocks on the CD-ROM filesystem, when generating an ID for " @@ -5534,93 +5602,93 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:793 +#: apt.conf.5.xml:804 msgid "<literal>Debug::NoLocking</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:796 +#: apt.conf.5.xml:807 msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:804 +#: apt.conf.5.xml:815 msgid "<literal>Debug::pkgAcquire</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:808 +#: apt.conf.5.xml:819 msgid "Log when items are added to or removed from the global download queue." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:815 +#: apt.conf.5.xml:826 msgid "<literal>Debug::pkgAcquire::Auth</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:818 +#: apt.conf.5.xml:829 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:825 +#: apt.conf.5.xml:836 msgid "<literal>Debug::pkgAcquire::Diffs</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:828 +#: apt.conf.5.xml:839 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:836 +#: apt.conf.5.xml:847 msgid "<literal>Debug::pkgAcquire::RRed</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:840 +#: apt.conf.5.xml:851 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:847 +#: apt.conf.5.xml:858 msgid "<literal>Debug::pkgAcquire::Worker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:851 +#: apt.conf.5.xml:862 msgid "" "Log all interactions with the sub-processes that actually perform downloads." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:858 +#: apt.conf.5.xml:869 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:862 +#: apt.conf.5.xml:873 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:869 +#: apt.conf.5.xml:880 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:872 +#: apt.conf.5.xml:883 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@ -5630,12 +5698,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:883 +#: apt.conf.5.xml:894 msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:886 +#: apt.conf.5.xml:897 msgid "" "Generate debug messages describing which package is marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@ -5652,91 +5720,91 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:905 +#: apt.conf.5.xml:916 msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:908 +#: apt.conf.5.xml:919 msgid "Dump the default configuration to standard error on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:915 +#: apt.conf.5.xml:926 msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:918 +#: apt.conf.5.xml:929 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:926 +#: apt.conf.5.xml:937 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:929 +#: apt.conf.5.xml:940 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:936 +#: apt.conf.5.xml:947 msgid "<literal>Debug::pkgOrderList</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:940 +#: apt.conf.5.xml:951 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:948 +#: apt.conf.5.xml:959 msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:952 +#: apt.conf.5.xml:963 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:959 +#: apt.conf.5.xml:970 msgid "<literal>Debug::pkgPolicy</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:963 +#: apt.conf.5.xml:974 msgid "Output the priority of each package list on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:969 +#: apt.conf.5.xml:980 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:973 +#: apt.conf.5.xml:984 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:981 +#: apt.conf.5.xml:992 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:984 +#: apt.conf.5.xml:995 msgid "" "Display a list of all installed packages with their calculated score used by " "the pkgProblemResolver. The description of the package is the same as " @@ -5744,32 +5812,32 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:992 +#: apt.conf.5.xml:1003 msgid "<literal>Debug::sourceList</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:996 +#: apt.conf.5.xml:1007 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1019 +#: apt.conf.5.xml:1030 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt.conf.5.xml:1026 +#: apt.conf.5.xml:1037 msgid "&file-aptconf;" msgstr "" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1031 +#: apt.conf.5.xml:1042 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "" @@ -5821,25 +5889,36 @@ msgid "" "choice of instance, only the choice of version." msgstr "" -#. type: Content of: <refentry><refsect1><refsect2><title> +#. type: Content of: <refentry><refsect1><para> #: apt_preferences.5.xml:56 +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." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt_preferences.5.xml:63 msgid "APT's Default Priority Assignments" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:71 +#: apt_preferences.5.xml:78 #, no-wrap msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:74 +#: apt_preferences.5.xml:81 #, no-wrap msgid "APT::Default-Release \"stable\";\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:58 +#: apt_preferences.5.xml:65 msgid "" "If there is no preferences file or if there is no entry in the file that " "applies to a particular version then the priority assigned to that version " @@ -5855,40 +5934,40 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:83 +#: apt_preferences.5.xml:90 msgid "priority 100" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:84 +#: apt_preferences.5.xml:91 msgid "to the version that is already installed (if any)." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:88 +#: apt_preferences.5.xml:95 msgid "priority 500" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:89 +#: apt_preferences.5.xml:96 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:93 +#: apt_preferences.5.xml:100 msgid "priority 990" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:94 +#: apt_preferences.5.xml:101 msgid "" "to the versions that are not installed and belong to the target release." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:78 +#: apt_preferences.5.xml:85 msgid "" "If the target release has been specified then APT uses the following " "algorithm to set the priorities of the versions of a package. Assign: " @@ -5896,7 +5975,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:99 +#: apt_preferences.5.xml:106 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 " @@ -5904,14 +5983,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:103 +#: apt_preferences.5.xml:110 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:106 +#: apt_preferences.5.xml:113 msgid "" "Never downgrade unless the priority of an available version exceeds 1000. " "(\"Downgrading\" is installing a less recent version of a package in place " @@ -5921,19 +6000,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:112 +#: apt_preferences.5.xml:119 msgid "Install the highest priority version." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:113 +#: apt_preferences.5.xml:120 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:116 +#: apt_preferences.5.xml:123 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</" @@ -5941,7 +6020,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:122 +#: apt_preferences.5.xml:129 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 " @@ -5951,7 +6030,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:129 +#: apt_preferences.5.xml:136 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 " @@ -5960,7 +6039,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:134 +#: apt_preferences.5.xml:141 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 " @@ -5972,12 +6051,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:143 +#: apt_preferences.5.xml:150 msgid "The Effect of APT Preferences" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:145 +#: apt_preferences.5.xml:152 msgid "" "The APT preferences file allows the system administrator to control the " "assignment of priorities. The file consists of one or more multi-line " @@ -5986,7 +6065,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:151 +#: apt_preferences.5.xml:158 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 " @@ -5996,7 +6075,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:158 +#: apt_preferences.5.xml:165 #, no-wrap msgid "" "Package: perl\n" @@ -6005,7 +6084,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:164 +#: apt_preferences.5.xml:171 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 " @@ -6015,7 +6094,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:170 +#: apt_preferences.5.xml:177 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 " @@ -6023,7 +6102,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:175 +#: apt_preferences.5.xml:182 #, no-wrap msgid "" "Package: *\n" @@ -6032,7 +6111,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:180 +#: apt_preferences.5.xml:187 msgid "" "A note of caution: the keyword used here is \"<literal>origin</literal>\". " "This should not be confused with the Origin of a distribution as specified " @@ -6042,7 +6121,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:186 +#: apt_preferences.5.xml:193 msgid "" "The following record assigns a low priority to all package versions " "belonging to any distribution whose Archive name is \"<literal>unstable</" @@ -6050,7 +6129,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:190 +#: apt_preferences.5.xml:197 #, no-wrap msgid "" "Package: *\n" @@ -6059,7 +6138,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:195 +#: apt_preferences.5.xml:202 msgid "" "The following record assigns a high priority to all package versions " "belonging to any distribution whose Codename is \"<literal>squeeze</literal>" @@ -6067,7 +6146,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:199 +#: apt_preferences.5.xml:206 #, no-wrap msgid "" "Package: *\n" @@ -6076,7 +6155,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:204 +#: apt_preferences.5.xml:211 msgid "" "The following record assigns a high priority to all package versions " "belonging to any release whose Archive name is \"<literal>stable</literal>\" " @@ -6084,7 +6163,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:209 +#: apt_preferences.5.xml:216 #, no-wrap msgid "" "Package: *\n" @@ -6093,82 +6172,82 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:220 +#: apt_preferences.5.xml:227 msgid "How APT Interprets Priorities" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:228 +#: apt_preferences.5.xml:235 msgid "P > 1000" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:229 +#: apt_preferences.5.xml:236 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:233 +#: apt_preferences.5.xml:240 msgid "990 < P <=1000" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:234 +#: apt_preferences.5.xml:241 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:239 +#: apt_preferences.5.xml:246 msgid "500 < P <=990" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:240 +#: apt_preferences.5.xml:247 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:245 +#: apt_preferences.5.xml:252 msgid "100 < P <=500" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:246 +#: apt_preferences.5.xml:253 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:251 +#: apt_preferences.5.xml:258 msgid "0 < P <=100" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:252 +#: apt_preferences.5.xml:259 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:256 +#: apt_preferences.5.xml:263 msgid "P < 0" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:257 +#: apt_preferences.5.xml:264 msgid "prevents the version from being installed" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:223 +#: apt_preferences.5.xml:230 msgid "" "Priorities (P) assigned in the APT preferences file must be positive or " "negative integers. They are interpreted as follows (roughly speaking): " @@ -6176,7 +6255,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:262 +#: apt_preferences.5.xml:269 msgid "" "If any specific-form records match an available package version then the " "first such record determines the priority of the package version. Failing " @@ -6185,14 +6264,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:268 +#: apt_preferences.5.xml:275 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:272 +#: apt_preferences.5.xml:279 #, no-wrap msgid "" "Package: perl\n" @@ -6209,12 +6288,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:285 +#: apt_preferences.5.xml:292 msgid "Then:" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:287 +#: apt_preferences.5.xml:294 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 " @@ -6224,7 +6303,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:292 +#: apt_preferences.5.xml:299 msgid "" "A version of any package other than <literal>perl</literal> that is " "available from the local system has priority over other versions, even " @@ -6232,7 +6311,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:296 +#: apt_preferences.5.xml:303 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</" @@ -6241,12 +6320,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:306 +#: apt_preferences.5.xml:313 msgid "Determination of Package Version and Distribution Properties" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:308 +#: apt_preferences.5.xml:315 msgid "" "The locations listed in the &sources-list; file should provide " "<filename>Packages</filename> and <filename>Release</filename> files to " @@ -6254,27 +6333,27 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:320 +#: apt_preferences.5.xml:327 msgid "the <literal>Package:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:321 +#: apt_preferences.5.xml:328 msgid "gives the package name" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:324 apt_preferences.5.xml:374 +#: apt_preferences.5.xml:331 apt_preferences.5.xml:381 msgid "the <literal>Version:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:325 +#: apt_preferences.5.xml:332 msgid "gives the version number for the named package" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:312 +#: apt_preferences.5.xml:319 msgid "" "The <filename>Packages</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable>/" @@ -6287,12 +6366,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:341 +#: apt_preferences.5.xml:348 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:342 +#: apt_preferences.5.xml:349 msgid "" "names the archive to which all the packages in the directory tree belong. " "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies " @@ -6303,18 +6382,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:352 +#: apt_preferences.5.xml:359 #, no-wrap msgid "Pin: release a=stable\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:358 +#: apt_preferences.5.xml:365 msgid "the <literal>Codename:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:359 +#: apt_preferences.5.xml:366 msgid "" "names the codename to which all the packages in the directory tree belong. " "For example, the line \"Codename: squeeze\" specifies that all of the " @@ -6324,13 +6403,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:368 +#: apt_preferences.5.xml:375 #, no-wrap msgid "Pin: release n=squeeze\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:375 +#: apt_preferences.5.xml:382 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 " @@ -6340,7 +6419,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:384 +#: apt_preferences.5.xml:391 #, no-wrap msgid "" "Pin: release v=3.0\n" @@ -6349,12 +6428,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:393 +#: apt_preferences.5.xml:400 msgid "the <literal>Component:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:394 +#: apt_preferences.5.xml:401 msgid "" "names the licensing component associated with the packages in the directory " "tree of the <filename>Release</filename> file. For example, the line " @@ -6365,18 +6444,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:403 +#: apt_preferences.5.xml:410 #, no-wrap msgid "Pin: release c=main\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:409 +#: apt_preferences.5.xml:416 msgid "the <literal>Origin:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:410 +#: apt_preferences.5.xml:417 msgid "" "names the originator of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@ -6385,18 +6464,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:416 +#: apt_preferences.5.xml:423 #, no-wrap msgid "Pin: release o=Debian\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:422 +#: apt_preferences.5.xml:429 msgid "the <literal>Label:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:423 +#: apt_preferences.5.xml:430 msgid "" "names the label of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@ -6405,13 +6484,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:429 +#: apt_preferences.5.xml:436 #, no-wrap msgid "Pin: release l=Debian\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:330 +#: apt_preferences.5.xml:337 msgid "" "The <filename>Release</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for " @@ -6424,7 +6503,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:436 +#: apt_preferences.5.xml:443 msgid "" "All of the <filename>Packages</filename> and <filename>Release</filename> " "files retrieved from locations listed in the &sources-list; file are stored " @@ -6439,12 +6518,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:449 +#: apt_preferences.5.xml:456 msgid "Optional Lines in an APT Preferences Record" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:451 +#: apt_preferences.5.xml:458 msgid "" "Each record in the APT preferences file can optionally begin with one or " "more lines beginning with the word <literal>Explanation:</literal>. This " @@ -6452,7 +6531,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:455 +#: apt_preferences.5.xml:462 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 value " @@ -6461,12 +6540,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:464 +#: apt_preferences.5.xml:471 msgid "Tracking Stable" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:472 +#: apt_preferences.5.xml:479 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated\n" @@ -6481,7 +6560,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:466 +#: apt_preferences.5.xml:473 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 " @@ -6491,8 +6570,8 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:489 apt_preferences.5.xml:535 -#: apt_preferences.5.xml:593 +#: apt_preferences.5.xml:496 apt_preferences.5.xml:542 +#: apt_preferences.5.xml:600 #, no-wrap msgid "" "apt-get install <replaceable>package-name</replaceable>\n" @@ -6501,7 +6580,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:484 +#: apt_preferences.5.xml:491 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 " @@ -6510,13 +6589,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:501 +#: apt_preferences.5.xml:508 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/testing\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:495 +#: apt_preferences.5.xml:502 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>testing</literal> distribution; the package " @@ -6525,12 +6604,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:507 +#: apt_preferences.5.xml:514 msgid "Tracking Testing or Unstable" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:516 +#: apt_preferences.5.xml:523 #, no-wrap msgid "" "Package: *\n" @@ -6547,7 +6626,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:509 +#: apt_preferences.5.xml:516 msgid "" "The following APT preferences file will cause APT to assign a high priority " "to package versions from the <literal>testing</literal> distribution, a " @@ -6558,7 +6637,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:530 +#: apt_preferences.5.xml:537 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 " @@ -6567,13 +6646,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:550 +#: apt_preferences.5.xml:557 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/unstable\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:541 +#: apt_preferences.5.xml:548 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>unstable</literal> distribution. " @@ -6585,12 +6664,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:557 +#: apt_preferences.5.xml:564 msgid "Tracking the evolution of a codename release" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:571 +#: apt_preferences.5.xml:578 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated package versions\n" @@ -6610,7 +6689,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:559 +#: apt_preferences.5.xml:566 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 " @@ -6625,7 +6704,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:588 +#: apt_preferences.5.xml:595 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 " @@ -6634,13 +6713,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:608 +#: apt_preferences.5.xml:615 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/sid\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:599 +#: apt_preferences.5.xml:606 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>sid</literal> distribution. Thereafter, " @@ -6652,12 +6731,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt_preferences.5.xml:617 +#: apt_preferences.5.xml:624 msgid "&file-preferences;" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt_preferences.5.xml:623 +#: apt_preferences.5.xml:630 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;" msgstr "" diff --git a/doc/po/ja.po b/doc/po/ja.po index c25fb9c82..f1a766d97 100644 --- a/doc/po/ja.po +++ b/doc/po/ja.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2010-01-11 15:12+0100\n" +"POT-Creation-Date: 2010-01-20 12:18+0100\n" "PO-Revision-Date: 2009-07-30 22:55+0900\n" "Last-Translator: KURASAWA Nozomu <nabetaro@caldron.jp>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -1087,7 +1087,7 @@ msgstr "&sources-list; に指定した、パッケージリソースごとの状 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Plain text -#: apt.ent:368 +#: apt.ent:369 #, fuzzy, no-wrap #| msgid "Storage area for state information in transit. Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial)." msgid "" @@ -1099,6 +1099,42 @@ msgid "" "\">\n" msgstr "取得中状態情報格納エリア。設定項目 - <literal>Dir::State::Lists</literal> (必然的に不完全)" +#. type: Plain text +#: apt.ent:371 +msgid "<!ENTITY translation-title \"TRANSLATION\">" +msgstr "<!ENTITY translation-title \"訳者\">" + +#. type: Plain text +#: apt.ent:380 +#, no-wrap +msgid "" +"<!-- TRANSLATOR: This is a placeholder. You should write here who has constributed\n" +" to the translation in the past, who is responsible now and maybe further information\n" +" specially related to your translation. -->\n" +"<!ENTITY translation-holder \"\n" +" The english translation was done by John Doe <email>john@doe.org</email> in 2009,\n" +" 2010 and Daniela Acme <email>daniela@acme.us</email> in 2010 together with the\n" +" Debian Dummy l10n Team <email>debian-l10n-dummy@lists.debian.org</email>.\n" +"\">\n" +msgstr "" +"<!ENTITY translation-holder \"\n" +" 倉澤 望 <email>nabetaro@debian.or.jp</email> (2003-2006,2009),\n" +" Debian JP Documentation ML <email>debian-doc@debian.or.jp</email>\n" +"\">\n" + +#. type: Plain text +#: apt.ent:387 +#, no-wrap +msgid "" +"<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n" +" in a shipped manpage will maybe appear english parts. -->\n" +"<!ENTITY translation-english \"\n" +" Note that this translated document may contain untranslated parts.\n" +" This is done on purpose, to avoid losing content when the\n" +" translation is lagging behind the original content.\n" +"\">\n" +msgstr "" + #. The last update date #. type: Content of: <refentry><refentryinfo> #: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13 @@ -1751,7 +1787,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 #: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89 -#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:491 apt.conf.5.xml:513 +#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524 msgid "options" msgstr "オプション" @@ -2001,7 +2037,7 @@ msgstr "&apt-commonoptions;" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122 -#: apt.conf.5.xml:1024 apt_preferences.5.xml:615 +#: apt.conf.5.xml:1035 apt_preferences.5.xml:622 msgid "Files" msgstr "ファイル" @@ -2015,7 +2051,7 @@ msgstr "" #: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 #: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569 #: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 -#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1030 apt_preferences.5.xml:622 +#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:629 #: sources.list.5.xml:233 msgid "See Also" msgstr "関連項目" @@ -3800,7 +3836,7 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1018 apt_preferences.5.xml:462 +#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1029 apt_preferences.5.xml:469 #: sources.list.5.xml:193 msgid "Examples" msgstr "サンプル" @@ -5963,7 +5999,7 @@ msgid "" "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</" "firstname> <surname>Burrows</surname> <contrib>Initial documentation of " "Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-email; " -"&apt-product; <date>18 September 2009</date>" +"&apt-product; <date>16 January 2010</date>" msgstr "" "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</" "firstname> <surname>Burrows</surname> <contrib>Initial documentation of " @@ -5987,31 +6023,64 @@ msgstr "5" msgid "Configuration file for APT" msgstr "APT の設定ファイル" -# type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:40 msgid "" "<filename>apt.conf</filename> is the main configuration file for the APT " -"suite of tools, all tools make use of the configuration file and a common " -"command line parser to provide a uniform environment. When an APT tool " -"starts up it will read the configuration specified by the <envar>APT_CONFIG</" -"envar> environment variable (if any) and then read the files in " -"<literal>Dir::Etc::Parts</literal> then read the main configuration file " -"specified by <literal>Dir::Etc::main</literal> then finally apply the " -"command line options to override the configuration directives, possibly " -"loading even more config files." -msgstr "" -"<filename>apt.conf</filename> は、APT ツール集のメイン設定ファイルです。この" -"設定ファイルと共通のコマンドラインパーサを使って、すべてのツールを統一環境で" -"使用できます。APT ツールの起動時には、<envar>APT_CONFIG</envar> 環境変数に指" -"定した設定を (存在すれば) 読み込みます。次に <literal>Dir::Etc::Parts</" -"literal> のファイルを読み込みます。次に <literal>Dir::Etc::main</literal> で" -"指定した主設定ファイルを読み込み、最後にコマンドラインオプションで、設定ファ" -"イルより取得した値を上書きします。" +"suite of tools, but by far not the only place changes to options can be " +"made. All tools therefore share the configuration files and also use a " +"common command line parser to provide a uniform environment." +msgstr "" + +#. type: Content of: <refentry><refsect1><orderedlist><para> +#: apt.conf.5.xml:45 +msgid "" +"When an APT tool starts up it will read the configuration files in the " +"following order:" +msgstr "" + +#. type: Content of: <refentry><refsect1><orderedlist><listitem><para> +#: apt.conf.5.xml:47 +msgid "" +"the file specified by the <envar>APT_CONFIG</envar> environment variable (if " +"any)" +msgstr "" + +#. type: Content of: <refentry><refsect1><orderedlist><listitem><para> +#: apt.conf.5.xml:49 +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." +msgstr "" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><orderedlist><listitem><para> +#: apt.conf.5.xml:54 +#, fuzzy +#| msgid "" +#| "APT configuration file. Configuration Item: <literal>Dir::Etc::Main</" +#| "literal>." +msgid "" +"the main configuration file specified by <literal>Dir::Etc::main</literal>" +msgstr "APT 設定ファイル。設定項目 - <literal>Dir::Etc::Main</literal>" + +#. type: Content of: <refentry><refsect1><orderedlist><listitem><para> +#: apt.conf.5.xml:56 +msgid "" +"the command line options are applied to override the configuration " +"directives or to load even more configuration files." +msgstr "" + +#. type: Content of: <refentry><refsect1><title> +#: apt.conf.5.xml:60 +msgid "Syntax" +msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:50 +#: apt.conf.5.xml:61 #, fuzzy #| msgid "" #| "The configuration file is organized in a tree with options organized into " @@ -6033,7 +6102,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:56 +#: apt.conf.5.xml:67 #, fuzzy #| msgid "" #| "Syntactically the configuration language is modeled after what the ISC " @@ -6066,7 +6135,7 @@ msgstr "" # type: Content of: <refentry><refsect1><informalexample><programlisting> #. type: Content of: <refentry><refsect1><informalexample><programlisting> -#: apt.conf.5.xml:70 +#: apt.conf.5.xml:81 #, no-wrap msgid "" "APT {\n" @@ -6085,7 +6154,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:78 +#: apt.conf.5.xml:89 msgid "" "with newlines placed to make it more readable. Lists can be created by " "opening a scope and including a single string enclosed in quotes followed by " @@ -6097,14 +6166,14 @@ msgstr "" # type: Content of: <refentry><refsect1><informalexample><programlisting> #. type: Content of: <refentry><refsect1><informalexample><programlisting> -#: apt.conf.5.xml:83 +#: apt.conf.5.xml:94 #, no-wrap msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n" msgstr "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:86 +#: apt.conf.5.xml:97 msgid "" "In general the sample configuration file in <filename>&docdir;examples/apt." "conf</filename> &configureindex; is a good guide for how it should look." @@ -6113,7 +6182,7 @@ msgstr "" "定ファイルのサンプルです。どのように設定するか参考になるでしょう。" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:90 +#: apt.conf.5.xml:101 msgid "" "The names of the configuration items are not case-sensitive. So in the " "previous example you could use <literal>dpkg::pre-install-pkgs</literal>." @@ -6122,7 +6191,7 @@ msgstr "" "<literal>dpkg::pre-install-pkgs</literal> とできます。" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:93 +#: apt.conf.5.xml:104 msgid "" "Names for the configuration items are optional if a list is defined as it " "can be see in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. " @@ -6133,7 +6202,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:98 +#: apt.conf.5.xml:109 #, fuzzy #| msgid "" #| "Two specials are allowed, <literal>#include</literal> and " @@ -6158,7 +6227,7 @@ msgstr "" "指定した要素と、それ以下の要素を削除します。" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:106 +#: apt.conf.5.xml:117 msgid "" "The #clear command is the only way to delete a list or a complete scope. " "Reopening a scope or the ::-style described below will <emphasis>not</" @@ -6169,7 +6238,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:111 +#: apt.conf.5.xml:122 #, fuzzy #| msgid "" #| "All of the APT tools take a -o option which allows an arbitrary " @@ -6191,7 +6260,7 @@ msgstr "" "ることで、リストを追加することができます。" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:118 +#: apt.conf.5.xml:129 msgid "" "Note that you can use :: only for appending one item per line to a list and " "that you should not use it in combination with the scope syntax. (The scope " @@ -6209,13 +6278,13 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:130 +#: apt.conf.5.xml:141 msgid "The APT Group" msgstr "APT グループ" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:131 +#: apt.conf.5.xml:142 msgid "" "This group of options controls general APT behavior as well as holding the " "options for all of the tools." @@ -6225,13 +6294,13 @@ msgstr "" # type: <tag></tag> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:135 +#: apt.conf.5.xml:146 msgid "Architecture" msgstr "Architecture" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:136 +#: apt.conf.5.xml:147 msgid "" "System Architecture; sets the architecture to use when fetching files and " "parsing package lists. The internal default is the architecture apt was " @@ -6243,12 +6312,12 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:141 +#: apt.conf.5.xml:152 msgid "Default-Release" msgstr "Default-Release" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:142 +#: apt.conf.5.xml:153 msgid "" "Default release to install packages from if more than one version available. " "Contains release name, codename or release version. Examples: 'stable', " @@ -6261,13 +6330,13 @@ msgstr "" "す。 &apt-preferences; も参照してください。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:146 +#: apt.conf.5.xml:157 msgid "Ignore-Hold" msgstr "Ignore-Hold" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:147 +#: apt.conf.5.xml:158 msgid "" "Ignore Held packages; This global option causes the problem resolver to " "ignore held packages in its decision making." @@ -6277,13 +6346,13 @@ msgstr "" # type: <tag></tag> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:151 +#: apt.conf.5.xml:162 msgid "Clean-Installed" msgstr "Clean-Installed" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:152 +#: apt.conf.5.xml:163 msgid "" "Defaults to on. When turned on the autoclean feature will remove any " "packages which can no longer be downloaded from the cache. If turned off " @@ -6298,12 +6367,12 @@ msgstr "" # type: Content of: <refentry><refnamediv><refname> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:158 +#: apt.conf.5.xml:169 msgid "Immediate-Configure" msgstr "Immediate-Configure" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:159 +#: apt.conf.5.xml:170 msgid "" "Defaults to on which will cause APT to install essential and important " "packages as fast as possible in the install/upgrade operation. This is done " @@ -6336,13 +6405,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:181 +#: apt.conf.5.xml:192 msgid "Force-LoopBreak" msgstr "Force-LoopBreak" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:182 +#: apt.conf.5.xml:193 msgid "" "Never Enable this option unless you -really- know what you are doing. It " "permits APT to temporarily remove an essential package to break a Conflicts/" @@ -6360,13 +6429,13 @@ msgstr "" "不可欠パッケージで動作します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:190 +#: apt.conf.5.xml:201 msgid "Cache-Limit" msgstr "Cache-Limit" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:191 +#: apt.conf.5.xml:202 msgid "" "APT uses a fixed size memory mapped cache file to store the 'available' " "information. This sets the size of that cache (in bytes)." @@ -6375,24 +6444,24 @@ msgstr "" "ファイルを使用します。このオプションは、そのキャッシュサイズを指定します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:195 +#: apt.conf.5.xml:206 msgid "Build-Essential" msgstr "Build-Essential" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:196 +#: apt.conf.5.xml:207 msgid "Defines which package(s) are considered essential build dependencies." msgstr "構築依存関係で不可欠なパッケージを定義します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:199 +#: apt.conf.5.xml:210 msgid "Get" msgstr "Get" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:200 +#: apt.conf.5.xml:211 msgid "" "The Get subsection controls the &apt-get; tool, please see its documentation " "for more information about the options here." @@ -6401,13 +6470,13 @@ msgstr "" "&apt-get; の文書を参照してください。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:204 +#: apt.conf.5.xml:215 msgid "Cache" msgstr "Cache" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:205 +#: apt.conf.5.xml:216 msgid "" "The Cache subsection controls the &apt-cache; tool, please see its " "documentation for more information about the options here." @@ -6416,13 +6485,13 @@ msgstr "" "は &apt-cache; の文書を参照してください。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:209 +#: apt.conf.5.xml:220 msgid "CDROM" msgstr "CDROM" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:210 +#: apt.conf.5.xml:221 msgid "" "The CDROM subsection controls the &apt-cdrom; tool, please see its " "documentation for more information about the options here." @@ -6432,17 +6501,17 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:216 +#: apt.conf.5.xml:227 msgid "The Acquire Group" msgstr "Acquire グループ" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:221 +#: apt.conf.5.xml:232 msgid "PDiffs" msgstr "PDiffs" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:222 +#: apt.conf.5.xml:233 msgid "" "Try to download deltas called <literal>PDiffs</literal> for Packages or " "Sources files instead of downloading whole ones. True by default." @@ -6452,7 +6521,7 @@ msgstr "" "ルトでは True です。" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:225 +#: apt.conf.5.xml:236 msgid "" "Two sub-options to limit the use of PDiffs are also available: With " "<literal>FileLimit</literal> can be specified how many PDiff files are " @@ -6463,13 +6532,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:234 +#: apt.conf.5.xml:245 msgid "Queue-Mode" msgstr "Queue-Mode" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:235 +#: apt.conf.5.xml:246 msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</" "literal> or <literal>access</literal> which determines how APT parallelizes " @@ -6484,13 +6553,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:242 +#: apt.conf.5.xml:253 msgid "Retries" msgstr "Retries" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:243 +#: apt.conf.5.xml:254 msgid "" "Number of retries to perform. If this is non-zero APT will retry failed " "files the given number of times." @@ -6499,13 +6568,13 @@ msgstr "" "えられた回数だけリトライを行います。" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:247 +#: apt.conf.5.xml:258 msgid "Source-Symlinks" msgstr "Source-Symlinks" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:248 +#: apt.conf.5.xml:259 msgid "" "Use symlinks for source archives. If set to true then source archives will " "be symlinked when possible instead of copying. True is the default." @@ -6516,13 +6585,13 @@ msgstr "" # type: <tag></tag> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:252 sources.list.5.xml:139 +#: apt.conf.5.xml:263 sources.list.5.xml:139 msgid "http" msgstr "http" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:253 +#: apt.conf.5.xml:264 #, fuzzy #| msgid "" #| "HTTP URIs; http::Proxy is the default http proxy to use. It is in the " @@ -6548,7 +6617,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:261 +#: apt.conf.5.xml:272 msgid "" "Three settings are provided for cache control with HTTP/1.1 compliant proxy " "caches. <literal>No-Cache</literal> tells the proxy to not use its cached " @@ -6573,7 +6642,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:271 apt.conf.5.xml:335 +#: apt.conf.5.xml:282 apt.conf.5.xml:346 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method, this applies to all things including connection timeout and data " @@ -6585,7 +6654,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:274 +#: apt.conf.5.xml:285 #, fuzzy #| msgid "" #| "One setting is provided to control the pipeline depth in cases where the " @@ -6613,7 +6682,7 @@ msgstr "" "ます。" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:282 +#: apt.conf.5.xml:293 msgid "" "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</" "literal> which accepts integer values in kilobyte. The default value is 0 " @@ -6623,7 +6692,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:287 +#: apt.conf.5.xml:298 msgid "" "<literal>Acquire::http::User-Agent</literal> can be used to set a different " "User-Agent for the http download method as some proxies allow access for " @@ -6632,12 +6701,12 @@ msgstr "" # type: <tag></tag> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:293 +#: apt.conf.5.xml:304 msgid "https" msgstr "https" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:294 +#: apt.conf.5.xml:305 #, fuzzy #| msgid "" #| "HTTPS URIs. Cache-control and proxy options are the same as for " @@ -6655,7 +6724,7 @@ msgstr "" "していません。" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:300 +#: apt.conf.5.xml:311 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is " @@ -6677,13 +6746,13 @@ msgstr "" # type: <tag></tag> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:318 sources.list.5.xml:150 +#: apt.conf.5.xml:329 sources.list.5.xml:150 msgid "ftp" msgstr "ftp" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:319 +#: apt.conf.5.xml:330 #, fuzzy #| msgid "" #| "FTP URIs; ftp::Proxy is the default proxy server to use. It is in the " @@ -6726,7 +6795,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:338 +#: apt.conf.5.xml:349 msgid "" "Several settings are provided to control passive mode. Generally it is safe " "to leave passive mode on, it works in nearly every environment. However " @@ -6742,7 +6811,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:345 +#: apt.conf.5.xml:356 msgid "" "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</" "envar> environment variable to a http url - see the discussion of the http " @@ -6756,7 +6825,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:350 +#: apt.conf.5.xml:361 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@ -6773,12 +6842,12 @@ msgstr "" # type: Content of: <refentry><refnamediv><refname> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:357 sources.list.5.xml:132 +#: apt.conf.5.xml:368 sources.list.5.xml:132 msgid "cdrom" msgstr "cdrom" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:363 +#: apt.conf.5.xml:374 #, fuzzy, no-wrap #| msgid "\"/cdrom/\"::Mount \"foo\";" msgid "/cdrom/::Mount \"foo\";" @@ -6786,7 +6855,7 @@ msgstr "\"/cdrom/\"::Mount \"foo\";" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:358 +#: apt.conf.5.xml:369 msgid "" "CDROM URIs; the only setting for CDROM URIs is the mount point, " "<literal>cdrom::Mount</literal> which must be the mount point for the CDROM " @@ -6807,13 +6876,13 @@ msgstr "" "す。" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:368 +#: apt.conf.5.xml:379 msgid "gpgv" msgstr "gpgv" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:369 +#: apt.conf.5.xml:380 msgid "" "GPGV URIs; the only option for GPGV URIs is the option to pass additional " "parameters to gpgv. <literal>gpgv::Options</literal> Additional options " @@ -6824,18 +6893,18 @@ msgstr "" "す。" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:374 +#: apt.conf.5.xml:385 msgid "CompressionTypes" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:380 +#: apt.conf.5.xml:391 #, no-wrap msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:375 +#: apt.conf.5.xml:386 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@ -6847,19 +6916,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:385 +#: apt.conf.5.xml:396 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:388 +#: apt.conf.5.xml:399 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:381 +#: apt.conf.5.xml:392 msgid "" "Also the <literal>Order</literal> subgroup can be used to define in which " "order the acquire system will try to download the compressed files. The " @@ -6876,13 +6945,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:392 +#: apt.conf.5.xml:403 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:390 +#: apt.conf.5.xml:401 msgid "" "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" "replaceable></literal> will be checked: If this setting exists the method " @@ -6897,7 +6966,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:397 +#: apt.conf.5.xml:408 msgid "" "While it is possible to add an empty compression type to the order list, but " "APT in its current version doesn't understand it correctly and will display " @@ -6907,12 +6976,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:403 +#: apt.conf.5.xml:414 msgid "Languages" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:404 +#: apt.conf.5.xml:415 msgid "" "The Languages subsection controls which <filename>Translation</filename> " "files are downloaded and in which order APT tries to display the Description-" @@ -6925,13 +6994,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting> -#: apt.conf.5.xml:420 +#: apt.conf.5.xml:431 #, no-wrap msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:410 +#: apt.conf.5.xml:421 msgid "" "The default list includes \"environment\" and \"en\". " "\"<literal>environment</literal>\" has a special meaning here: It will be " @@ -6955,7 +7024,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:217 +#: apt.conf.5.xml:228 msgid "" "The <literal>Acquire</literal> group of options controls the download of " "packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>" @@ -6966,13 +7035,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:427 +#: apt.conf.5.xml:438 msgid "Directories" msgstr "ディレクトリ" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:429 +#: apt.conf.5.xml:440 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@ -6992,7 +7061,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:436 +#: apt.conf.5.xml:447 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@ -7014,7 +7083,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:445 +#: apt.conf.5.xml:456 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@ -7029,7 +7098,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:451 +#: apt.conf.5.xml:462 msgid "" "The <literal>Dir::Parts</literal> setting reads in all the config fragments " "in lexical order from the directory specified. After this is done then the " @@ -7041,7 +7110,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:455 +#: apt.conf.5.xml:466 #, fuzzy #| msgid "" #| "Binary programs are pointed to by <literal>Dir::Bin</literal>. " @@ -7066,7 +7135,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:463 +#: apt.conf.5.xml:474 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@ -7087,13 +7156,13 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:476 +#: apt.conf.5.xml:487 msgid "APT in DSelect" msgstr "DSelect での APT" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:478 +#: apt.conf.5.xml:489 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behaviour. These are in the <literal>DSelect</literal> " @@ -7103,13 +7172,13 @@ msgstr "" "設定項目で、デフォルトの動作を制御します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:482 +#: apt.conf.5.xml:493 msgid "Clean" msgstr "Clean" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:483 +#: apt.conf.5.xml:494 msgid "" "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto " "and never. always and prompt will remove all packages from the cache after " @@ -7126,7 +7195,7 @@ msgstr "" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:492 +#: apt.conf.5.xml:503 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the install phase." @@ -7136,13 +7205,13 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:496 +#: apt.conf.5.xml:507 msgid "Updateoptions" msgstr "Updateoptions" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:497 +#: apt.conf.5.xml:508 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the update phase." @@ -7151,13 +7220,13 @@ msgstr "" "されます。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:501 +#: apt.conf.5.xml:512 msgid "PromptAfterUpdate" msgstr "PromptAfterUpdate" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:502 +#: apt.conf.5.xml:513 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." @@ -7167,13 +7236,13 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:508 +#: apt.conf.5.xml:519 msgid "How APT calls dpkg" msgstr "APT が dpkg を呼ぶ方法" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:509 +#: apt.conf.5.xml:520 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." @@ -7183,7 +7252,7 @@ msgstr "" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:514 +#: apt.conf.5.xml:525 msgid "" "This is a list of options to pass to dpkg. The options must be specified " "using the list notation and each list item is passed as a single argument to " @@ -7193,18 +7262,18 @@ msgstr "" "ければなりません。また、各リストは単一の引数として &dpkg; に渡されます。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:519 +#: apt.conf.5.xml:530 msgid "Pre-Invoke" msgstr "Pre-Invoke" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:519 +#: apt.conf.5.xml:530 msgid "Post-Invoke" msgstr "Post-Invoke" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:520 +#: apt.conf.5.xml:531 msgid "" "This is a list of shell commands to run before/after invoking &dpkg;. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -7218,13 +7287,13 @@ msgstr "" # type: <tag></tag> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:526 +#: apt.conf.5.xml:537 msgid "Pre-Install-Pkgs" msgstr "Pre-Install-Pkgs" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:527 +#: apt.conf.5.xml:538 msgid "" "This is a list of shell commands to run before invoking dpkg. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -7240,7 +7309,7 @@ msgstr "" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:533 +#: apt.conf.5.xml:544 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@ -7256,13 +7325,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:540 +#: apt.conf.5.xml:551 msgid "Run-Directory" msgstr "Run-Directory" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:541 +#: apt.conf.5.xml:552 msgid "" "APT chdirs to this directory before invoking dpkg, the default is <filename>/" "</filename>." @@ -7272,13 +7341,13 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:545 +#: apt.conf.5.xml:556 msgid "Build-options" msgstr "Build-options" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:546 +#: apt.conf.5.xml:557 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages, the " "default is to disable signing and produce all binaries." @@ -7287,12 +7356,12 @@ msgstr "" "ます。デフォルトでは署名を無効にし、全バイナリを生成します。" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt.conf.5.xml:551 +#: apt.conf.5.xml:562 msgid "dpkg trigger usage (and related options)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:552 +#: apt.conf.5.xml:563 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 " @@ -7307,7 +7376,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:567 +#: apt.conf.5.xml:578 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@ -7317,7 +7386,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:561 +#: apt.conf.5.xml:572 msgid "" "Note that it is not guaranteed that APT will support these options or that " "these options will not cause (big) trouble in the future. If you have " @@ -7331,12 +7400,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:573 +#: apt.conf.5.xml:584 msgid "DPkg::NoTriggers" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:574 +#: apt.conf.5.xml:585 msgid "" "Add the no triggers flag to all dpkg calls (except the ConfigurePending " "call). See &dpkg; if you are interested in what this actually means. In " @@ -7349,14 +7418,14 @@ msgstr "" # type: <tag></tag> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:581 +#: apt.conf.5.xml:592 #, fuzzy #| msgid "Packages::Compress" msgid "PackageManager::Configure" msgstr "Packages::Compress" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:582 +#: apt.conf.5.xml:593 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@ -7373,13 +7442,13 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:592 +#: apt.conf.5.xml:603 #, fuzzy msgid "DPkg::ConfigurePending" msgstr "ユーザの設定" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:593 +#: apt.conf.5.xml:604 msgid "" "If this option is set apt will call <command>dpkg --configure --pending</" "command> to let dpkg handle all required configurations and triggers. This " @@ -7390,12 +7459,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:599 +#: apt.conf.5.xml:610 msgid "DPkg::TriggersPending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:600 +#: apt.conf.5.xml:611 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@ -7405,12 +7474,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:605 +#: apt.conf.5.xml:616 msgid "PackageManager::UnpackAll" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:606 +#: apt.conf.5.xml:617 msgid "" "As the configuration can be deferred to be done at the end by dpkg it can be " "tried to order the unpack series only by critical needs, e.g. by Pre-" @@ -7422,12 +7491,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:613 +#: apt.conf.5.xml:624 msgid "OrderList::Score::Immediate" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:621 +#: apt.conf.5.xml:632 #, no-wrap msgid "" "OrderList::Score {\n" @@ -7439,7 +7508,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:614 +#: apt.conf.5.xml:625 msgid "" "Essential packages (and there dependencies) should be configured immediately " "after unpacking. It will be a good idea to do this quite early in the " @@ -7453,12 +7522,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:634 +#: apt.conf.5.xml:645 msgid "Periodic and Archives options" msgstr "Periodic オプションと Archives オプション" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:635 +#: apt.conf.5.xml:646 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@ -7472,12 +7541,12 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:643 +#: apt.conf.5.xml:654 msgid "Debug options" msgstr "デバッグオプション" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:645 +#: apt.conf.5.xml:656 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -7488,7 +7557,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:656 +#: apt.conf.5.xml:667 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@ -7499,7 +7568,7 @@ msgstr "" "にします。" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:664 +#: apt.conf.5.xml:675 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@ -7510,7 +7579,7 @@ msgstr "" "literal>) を行う場合に使用します。" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:673 +#: apt.conf.5.xml:684 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -7520,66 +7589,66 @@ msgstr "" #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:681 +#: apt.conf.5.xml:692 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CDROM IDs." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:691 +#: apt.conf.5.xml:702 msgid "A full list of debugging options to apt follows." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:696 +#: apt.conf.5.xml:707 msgid "<literal>Debug::Acquire::cdrom</literal>" msgstr "<literal>Debug::Acquire::cdrom</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:700 +#: apt.conf.5.xml:711 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" "<literal>cdrom://</literal> ソースへのアクセスに関する情報を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:707 +#: apt.conf.5.xml:718 msgid "<literal>Debug::Acquire::ftp</literal>" msgstr "<literal>Debug::Acquire::ftp</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:711 +#: apt.conf.5.xml:722 msgid "Print information related to downloading packages using FTP." msgstr "FTP を用いたパッケージのダウンロードに関する情報を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:718 +#: apt.conf.5.xml:729 msgid "<literal>Debug::Acquire::http</literal>" msgstr "<literal>Debug::Acquire::http</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:722 +#: apt.conf.5.xml:733 msgid "Print information related to downloading packages using HTTP." msgstr "HTTP を用いたパッケージのダウンロードに関する情報を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:729 +#: apt.conf.5.xml:740 msgid "<literal>Debug::Acquire::https</literal>" msgstr "<literal>Debug::Acquire::https</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:733 +#: apt.conf.5.xml:744 msgid "Print information related to downloading packages using HTTPS." msgstr "HTTPS を用いたパッケージのダウンロードに関する情報を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:740 +#: apt.conf.5.xml:751 msgid "<literal>Debug::Acquire::gpgv</literal>" msgstr "<literal>Debug::Acquire::gpgv</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:744 +#: apt.conf.5.xml:755 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." @@ -7587,46 +7656,46 @@ msgstr "" "<literal>gpg</literal> を用いた暗号署名の検証に関する情報を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:751 +#: apt.conf.5.xml:762 msgid "<literal>Debug::aptcdrom</literal>" msgstr "<literal>Debug::aptcdrom</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:755 +#: apt.conf.5.xml:766 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:762 +#: apt.conf.5.xml:773 msgid "<literal>Debug::BuildDeps</literal>" msgstr "<literal>Debug::BuildDeps</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:765 +#: apt.conf.5.xml:776 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:772 +#: apt.conf.5.xml:783 msgid "<literal>Debug::Hashes</literal>" msgstr "<literal>Debug::Hashes</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:775 +#: apt.conf.5.xml:786 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:782 +#: apt.conf.5.xml:793 msgid "<literal>Debug::IdentCDROM</literal>" msgstr "<literal>Debug::IdentCDROM</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:785 +#: apt.conf.5.xml:796 msgid "" "Do not include information from <literal>statfs</literal>, namely the number " "of used and free blocks on the CD-ROM filesystem, when generating an ID for " @@ -7634,93 +7703,93 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:793 +#: apt.conf.5.xml:804 msgid "<literal>Debug::NoLocking</literal>" msgstr "<literal>Debug::NoLocking</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:796 +#: apt.conf.5.xml:807 msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:804 +#: apt.conf.5.xml:815 msgid "<literal>Debug::pkgAcquire</literal>" msgstr "<literal>Debug::pkgAcquire</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:808 +#: apt.conf.5.xml:819 msgid "Log when items are added to or removed from the global download queue." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:815 +#: apt.conf.5.xml:826 msgid "<literal>Debug::pkgAcquire::Auth</literal>" msgstr "<literal>Debug::pkgAcquire::Auth</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:818 +#: apt.conf.5.xml:829 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:825 +#: apt.conf.5.xml:836 msgid "<literal>Debug::pkgAcquire::Diffs</literal>" msgstr "<literal>Debug::pkgAcquire::Diffs</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:828 +#: apt.conf.5.xml:839 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:836 +#: apt.conf.5.xml:847 msgid "<literal>Debug::pkgAcquire::RRed</literal>" msgstr "<literal>Debug::pkgAcquire::RRed</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:840 +#: apt.conf.5.xml:851 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:847 +#: apt.conf.5.xml:858 msgid "<literal>Debug::pkgAcquire::Worker</literal>" msgstr "<literal>Debug::pkgAcquire::Worker</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:851 +#: apt.conf.5.xml:862 msgid "" "Log all interactions with the sub-processes that actually perform downloads." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:858 +#: apt.conf.5.xml:869 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "<literal>Debug::pkgAutoRemove</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:862 +#: apt.conf.5.xml:873 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:869 +#: apt.conf.5.xml:880 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "<literal>Debug::pkgDepCache::AutoInstall</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:872 +#: apt.conf.5.xml:883 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@ -7730,12 +7799,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:883 +#: apt.conf.5.xml:894 msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "<literal>Debug::pkgDepCache::Marker</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:886 +#: apt.conf.5.xml:897 msgid "" "Generate debug messages describing which package is marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@ -7752,91 +7821,91 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:905 +#: apt.conf.5.xml:916 msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "<literal>Debug::pkgInitConfig</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:908 +#: apt.conf.5.xml:919 msgid "Dump the default configuration to standard error on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:915 +#: apt.conf.5.xml:926 msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "<literal>Debug::pkgDPkgPM</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:918 +#: apt.conf.5.xml:929 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:926 +#: apt.conf.5.xml:937 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:929 +#: apt.conf.5.xml:940 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:936 +#: apt.conf.5.xml:947 msgid "<literal>Debug::pkgOrderList</literal>" msgstr "<literal>Debug::pkgOrderList</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:940 +#: apt.conf.5.xml:951 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:948 +#: apt.conf.5.xml:959 msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "<literal>Debug::pkgPackageManager</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:952 +#: apt.conf.5.xml:963 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:959 +#: apt.conf.5.xml:970 msgid "<literal>Debug::pkgPolicy</literal>" msgstr "<literal>Debug::pkgPolicy</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:963 +#: apt.conf.5.xml:974 msgid "Output the priority of each package list on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:969 +#: apt.conf.5.xml:980 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "<literal>Debug::pkgProblemResolver</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:973 +#: apt.conf.5.xml:984 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:981 +#: apt.conf.5.xml:992 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "<literal>Debug::pkgProblemResolver::ShowScores</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:984 +#: apt.conf.5.xml:995 msgid "" "Display a list of all installed packages with their calculated score used by " "the pkgProblemResolver. The description of the package is the same as " @@ -7844,12 +7913,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:992 +#: apt.conf.5.xml:1003 msgid "<literal>Debug::sourceList</literal>" msgstr "<literal>Debug::sourceList</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:996 +#: apt.conf.5.xml:1007 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." @@ -7857,7 +7926,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1019 +#: apt.conf.5.xml:1030 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." @@ -7867,7 +7936,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><variablelist> -#: apt.conf.5.xml:1026 +#: apt.conf.5.xml:1037 #, fuzzy #| msgid "&apt-conf;" msgid "&file-aptconf;" @@ -7876,7 +7945,7 @@ msgstr "&apt-conf;" # type: Content of: <refentry><refsect1><para> #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1031 +#: apt.conf.5.xml:1042 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-cache;, &apt-config;, &apt-preferences;." @@ -7953,29 +8022,40 @@ msgstr "" "ダウンロードします。APT 設定ファイルはバージョンの選択にのみ影響し、インスタ" "ンスの選択には影響しません。" +#. type: Content of: <refentry><refsect1><para> +#: apt_preferences.5.xml:56 +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." +msgstr "" + # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:56 +#: apt_preferences.5.xml:63 msgid "APT's Default Priority Assignments" msgstr "APT のデフォルト優先度の割り当て" # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:71 +#: apt_preferences.5.xml:78 #, no-wrap msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n" msgstr "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n" # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:74 +#: apt_preferences.5.xml:81 #, no-wrap msgid "APT::Default-Release \"stable\";\n" msgstr "APT::Default-Release \"stable\";\n" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:58 +#: apt_preferences.5.xml:65 msgid "" "If there is no preferences file or if there is no entry in the file that " "applies to a particular version then the priority assigned to that version " @@ -8000,25 +8080,25 @@ msgstr "" # type: <tag></tag> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:83 +#: apt_preferences.5.xml:90 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:84 +#: apt_preferences.5.xml:91 msgid "to the version that is already installed (if any)." msgstr "(あるならば) 既にインストールされているバージョン。" # type: <tag></tag> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:88 +#: apt_preferences.5.xml:95 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:89 +#: apt_preferences.5.xml:96 msgid "" "to the versions that are not installed and do not belong to the target " "release." @@ -8026,20 +8106,20 @@ msgstr "インストールされておらず、ターゲットリリースに含 # type: <tag></tag> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:93 +#: apt_preferences.5.xml:100 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:94 +#: apt_preferences.5.xml:101 msgid "" "to the versions that are not installed and belong to the target release." msgstr "インストールされておらず、ターゲットリリースに含まれるバージョン。" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:78 +#: apt_preferences.5.xml:85 msgid "" "If the target release has been specified then APT uses the following " "algorithm to set the priorities of the versions of a package. Assign: " @@ -8051,7 +8131,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:99 +#: apt_preferences.5.xml:106 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 " @@ -8063,7 +8143,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:103 +#: apt_preferences.5.xml:110 msgid "" "APT then applies the following rules, listed in order of precedence, to " "determine which version of a package to install." @@ -8073,7 +8153,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:106 +#: apt_preferences.5.xml:113 msgid "" "Never downgrade unless the priority of an available version exceeds 1000. " "(\"Downgrading\" is installing a less recent version of a package in place " @@ -8089,13 +8169,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:112 +#: apt_preferences.5.xml:119 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:113 +#: apt_preferences.5.xml:120 msgid "" "If two or more versions have the same priority, install the most recent one " "(that is, the one with the higher version number)." @@ -8105,7 +8185,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:116 +#: apt_preferences.5.xml:123 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</" @@ -8117,7 +8197,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:122 +#: apt_preferences.5.xml:129 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 " @@ -8133,7 +8213,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:129 +#: apt_preferences.5.xml:136 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 " @@ -8147,7 +8227,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:141 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 " @@ -8167,13 +8247,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:143 +#: apt_preferences.5.xml:150 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:145 +#: apt_preferences.5.xml:152 msgid "" "The APT preferences file allows the system administrator to control the " "assignment of priorities. The file consists of one or more multi-line " @@ -8186,7 +8266,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:151 +#: apt_preferences.5.xml:158 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 " @@ -8201,7 +8281,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:158 +#: apt_preferences.5.xml:165 #, no-wrap msgid "" "Package: perl\n" @@ -8214,7 +8294,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:164 +#: apt_preferences.5.xml:171 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 " @@ -8229,7 +8309,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:170 +#: apt_preferences.5.xml:177 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 " @@ -8241,7 +8321,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:175 +#: apt_preferences.5.xml:182 #, no-wrap msgid "" "Package: *\n" @@ -8254,7 +8334,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:180 +#: apt_preferences.5.xml:187 msgid "" "A note of caution: the keyword used here is \"<literal>origin</literal>\". " "This should not be confused with the Origin of a distribution as specified " @@ -8270,7 +8350,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:186 +#: apt_preferences.5.xml:193 msgid "" "The following record assigns a low priority to all package versions " "belonging to any distribution whose Archive name is \"<literal>unstable</" @@ -8281,7 +8361,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:190 +#: apt_preferences.5.xml:197 #, no-wrap msgid "" "Package: *\n" @@ -8294,7 +8374,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:202 msgid "" "The following record assigns a high priority to all package versions " "belonging to any distribution whose Codename is \"<literal>squeeze</literal>" @@ -8305,7 +8385,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:199 +#: apt_preferences.5.xml:206 #, no-wrap msgid "" "Package: *\n" @@ -8318,7 +8398,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:204 +#: apt_preferences.5.xml:211 msgid "" "The following record assigns a high priority to all package versions " "belonging to any release whose Archive name is \"<literal>stable</literal>\" " @@ -8330,7 +8410,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:209 +#: apt_preferences.5.xml:216 #, no-wrap msgid "" "Package: *\n" @@ -8343,18 +8423,18 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:220 +#: apt_preferences.5.xml:227 msgid "How APT Interprets Priorities" msgstr "APT が優先度に割り込む方法" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:228 +#: apt_preferences.5.xml:235 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:229 +#: apt_preferences.5.xml:236 msgid "" "causes a version to be installed even if this constitutes a downgrade of the " "package" @@ -8362,13 +8442,13 @@ msgstr "" "パッケージがダウングレードしても、このバージョンのパッケージをインストール" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:233 +#: apt_preferences.5.xml:240 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:234 +#: apt_preferences.5.xml:241 msgid "" "causes a version to be installed even if it does not come from the target " "release, unless the installed version is more recent" @@ -8377,13 +8457,13 @@ msgstr "" "含まれなくても、このバージョンのパッケージをインストール" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:239 +#: apt_preferences.5.xml:246 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:240 +#: apt_preferences.5.xml:247 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" @@ -8392,13 +8472,13 @@ msgstr "" "ジョンの方が新しいのでなければ、このバージョンのパッケージをインストール" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:245 +#: apt_preferences.5.xml:252 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:246 +#: apt_preferences.5.xml:253 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" @@ -8408,13 +8488,13 @@ msgstr "" "ル" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:251 +#: apt_preferences.5.xml:258 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:252 +#: apt_preferences.5.xml:259 msgid "" "causes a version to be installed only if there is no installed version of " "the package" @@ -8423,19 +8503,19 @@ msgstr "" "ンストール" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:256 +#: apt_preferences.5.xml:263 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:257 +#: apt_preferences.5.xml:264 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:223 +#: apt_preferences.5.xml:230 msgid "" "Priorities (P) assigned in the APT preferences file must be positive or " "negative integers. They are interpreted as follows (roughly speaking): " @@ -8447,7 +8527,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:262 +#: apt_preferences.5.xml:269 msgid "" "If any specific-form records match an available package version then the " "first such record determines the priority of the package version. Failing " @@ -8461,7 +8541,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:268 +#: apt_preferences.5.xml:275 msgid "" "For example, suppose the APT preferences file contains the three records " "presented earlier:" @@ -8471,7 +8551,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><programlisting> #. type: Content of: <refentry><refsect1><refsect2><programlisting> -#: apt_preferences.5.xml:272 +#: apt_preferences.5.xml:279 #, no-wrap msgid "" "Package: perl\n" @@ -8500,13 +8580,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:285 +#: apt_preferences.5.xml:292 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:287 +#: apt_preferences.5.xml:294 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 " @@ -8521,7 +8601,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:292 +#: apt_preferences.5.xml:299 msgid "" "A version of any package other than <literal>perl</literal> that is " "available from the local system has priority over other versions, even " @@ -8533,7 +8613,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:296 +#: apt_preferences.5.xml:303 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</" @@ -8547,13 +8627,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:306 +#: apt_preferences.5.xml:313 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:308 +#: apt_preferences.5.xml:315 msgid "" "The locations listed in the &sources-list; file should provide " "<filename>Packages</filename> and <filename>Release</filename> files to " @@ -8564,30 +8644,30 @@ msgstr "" "filename> ファイルを提供します。" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:320 +#: apt_preferences.5.xml:327 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:321 +#: apt_preferences.5.xml:328 msgid "gives the package name" msgstr "パッケージ名" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:324 apt_preferences.5.xml:374 +#: apt_preferences.5.xml:331 apt_preferences.5.xml:381 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:325 +#: apt_preferences.5.xml:332 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:312 +#: apt_preferences.5.xml:319 msgid "" "The <filename>Packages</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable>/" @@ -8607,13 +8687,13 @@ msgstr "" "type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:341 +#: apt_preferences.5.xml:348 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:342 +#: apt_preferences.5.xml:349 #, fuzzy msgid "" "names the archive to which all the packages in the directory tree belong. " @@ -8631,19 +8711,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:352 +#: apt_preferences.5.xml:359 #, 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:358 +#: apt_preferences.5.xml:365 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:359 +#: apt_preferences.5.xml:366 #, fuzzy msgid "" "names the codename to which all the packages in the directory tree belong. " @@ -8660,14 +8740,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:368 +#: apt_preferences.5.xml:375 #, no-wrap msgid "Pin: release n=squeeze\n" msgstr "Pin: release n=squeeze\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:375 +#: apt_preferences.5.xml:382 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 " @@ -8683,7 +8763,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:384 +#: apt_preferences.5.xml:391 #, no-wrap msgid "" "Pin: release v=3.0\n" @@ -8695,13 +8775,13 @@ msgstr "" "Pin: release 3.0\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:393 +#: apt_preferences.5.xml:400 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:394 +#: apt_preferences.5.xml:401 msgid "" "names the licensing component associated with the packages in the directory " "tree of the <filename>Release</filename> file. For example, the line " @@ -8719,19 +8799,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:403 +#: apt_preferences.5.xml:410 #, 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:409 +#: apt_preferences.5.xml:416 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:410 +#: apt_preferences.5.xml:417 msgid "" "names the originator of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@ -8744,19 +8824,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:416 +#: apt_preferences.5.xml:423 #, 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:422 +#: apt_preferences.5.xml:429 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:423 +#: apt_preferences.5.xml:430 msgid "" "names the label of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@ -8769,14 +8849,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:429 +#: apt_preferences.5.xml:436 #, no-wrap msgid "Pin: release l=Debian\n" msgstr "Pin: release l=Debian\n" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:330 +#: apt_preferences.5.xml:337 #, fuzzy msgid "" "The <filename>Release</filename> file is normally found in the directory " @@ -8798,7 +8878,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:436 +#: apt_preferences.5.xml:443 msgid "" "All of the <filename>Packages</filename> and <filename>Release</filename> " "files retrieved from locations listed in the &sources-list; file are stored " @@ -8824,13 +8904,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:449 +#: apt_preferences.5.xml:456 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:451 +#: apt_preferences.5.xml:458 msgid "" "Each record in the APT preferences file can optionally begin with one or " "more lines beginning with the word <literal>Explanation:</literal>. This " @@ -8841,7 +8921,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:455 +#: apt_preferences.5.xml:462 #, fuzzy msgid "" "The <literal>Pin-Priority:</literal> line in each APT preferences record is " @@ -8855,13 +8935,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:464 +#: apt_preferences.5.xml:471 msgid "Tracking Stable" msgstr "安定版の追跡" # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:472 +#: apt_preferences.5.xml:479 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated\n" @@ -8886,7 +8966,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:466 +#: apt_preferences.5.xml:473 #, fuzzy msgid "" "The following APT preferences file will cause APT to assign a priority " @@ -8902,8 +8982,8 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:489 apt_preferences.5.xml:535 -#: apt_preferences.5.xml:593 +#: apt_preferences.5.xml:496 apt_preferences.5.xml:542 +#: apt_preferences.5.xml:600 #, no-wrap msgid "" "apt-get install <replaceable>package-name</replaceable>\n" @@ -8916,7 +8996,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:484 +#: apt_preferences.5.xml:491 #, fuzzy msgid "" "With a suitable &sources-list; file and the above preferences file, any of " @@ -8929,14 +9009,14 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:501 +#: apt_preferences.5.xml:508 #, 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:495 +#: apt_preferences.5.xml:502 #, fuzzy msgid "" "The following command will cause APT to upgrade the specified package to the " @@ -8950,13 +9030,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:507 +#: apt_preferences.5.xml:514 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:516 +#: apt_preferences.5.xml:523 #, no-wrap msgid "" "Package: *\n" @@ -8985,7 +9065,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:509 +#: apt_preferences.5.xml:516 #, fuzzy msgid "" "The following APT preferences file will cause APT to assign a high priority " @@ -9003,7 +9083,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:530 +#: apt_preferences.5.xml:537 #, fuzzy msgid "" "With a suitable &sources-list; file and the above preferences file, any of " @@ -9016,14 +9096,14 @@ 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:557 #, 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:541 +#: apt_preferences.5.xml:548 #, fuzzy msgid "" "The following command will cause APT to upgrade the specified package to the " @@ -9042,13 +9122,13 @@ msgstr "" "の最新版にアップグレードします。" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:557 +#: apt_preferences.5.xml:564 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:571 +#: apt_preferences.5.xml:578 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated package versions\n" @@ -9082,7 +9162,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:559 +#: apt_preferences.5.xml:566 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 " @@ -9098,7 +9178,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:588 +#: apt_preferences.5.xml:595 #, fuzzy msgid "" "With a suitable &sources-list; file and the above preferences file, any of " @@ -9111,14 +9191,14 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:608 +#: apt_preferences.5.xml:615 #, 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:599 +#: apt_preferences.5.xml:606 #, fuzzy msgid "" "The following command will cause APT to upgrade the specified package to the " @@ -9138,7 +9218,7 @@ msgstr "" # type: Content of: <refentry><refnamediv><refname> #. type: Content of: <refentry><refsect1><variablelist> -#: apt_preferences.5.xml:617 +#: apt_preferences.5.xml:624 #, fuzzy #| msgid "apt_preferences" msgid "&file-preferences;" @@ -9146,7 +9226,7 @@ msgstr "apt_preferences" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt_preferences.5.xml:623 +#: apt_preferences.5.xml:630 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;" msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;" @@ -10835,6 +10915,26 @@ msgstr "" msgid "Which will use the already fetched archives on the disc." msgstr "" +# type: Content of: <refentry><refsect1><para> +#~ msgid "" +#~ "<filename>apt.conf</filename> is the main configuration file for the APT " +#~ "suite of tools, all tools make use of the configuration file and a common " +#~ "command line parser to provide a uniform environment. When an APT tool " +#~ "starts up it will read the configuration specified by the " +#~ "<envar>APT_CONFIG</envar> environment variable (if any) and then read the " +#~ "files in <literal>Dir::Etc::Parts</literal> then read the main " +#~ "configuration file specified by <literal>Dir::Etc::main</literal> then " +#~ "finally apply the command line options to override the configuration " +#~ "directives, possibly loading even more config files." +#~ msgstr "" +#~ "<filename>apt.conf</filename> は、APT ツール集のメイン設定ファイルです。こ" +#~ "の設定ファイルと共通のコマンドラインパーサを使って、すべてのツールを統一環" +#~ "境で使用できます。APT ツールの起動時には、<envar>APT_CONFIG</envar> 環境変" +#~ "数に指定した設定を (存在すれば) 読み込みます。次に <literal>Dir::Etc::" +#~ "Parts</literal> のファイルを読み込みます。次に <literal>Dir::Etc::main</" +#~ "literal> で指定した主設定ファイルを読み込み、最後にコマンドラインオプショ" +#~ "ンで、設定ファイルより取得した値を上書きします。" + # type: Content of: <refentry><refsect1><para> #~ msgid "<filename>/etc/apt/trusted.gpg</filename>" #~ msgstr "<filename>/etc/apt/trusted.gpg</filename>" @@ -10885,12 +10985,6 @@ msgstr "" #~ msgid "<filename>/etc/apt/apt.conf</filename>" #~ msgstr "<filename>/etc/apt/apt.conf</filename>" -# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#~ msgid "" -#~ "APT configuration file. Configuration Item: <literal>Dir::Etc::Main</" -#~ "literal>." -#~ msgstr "APT 設定ファイル。設定項目 - <literal>Dir::Etc::Main</literal>" - # type: Content of: <refentry><refsect1><para> #~ msgid "<filename>/etc/apt/apt.conf.d/</filename>" #~ msgstr "<filename>/etc/apt/apt.conf.d/</filename>" diff --git a/doc/po/pl.po b/doc/po/pl.po index 80fa40db0..a3936cff2 100644 --- a/doc/po/pl.po +++ b/doc/po/pl.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" -"POT-Creation-Date: 2010-01-11 15:12+0100\n" +"POT-Creation-Date: 2010-01-20 12:18+0100\n" "PO-Revision-Date: 2004-02-12 15:06+0100\n" "Last-Translator: Krzysztof Fiertek <akfedux@megapolis.pl>\n" "Language-Team: <debian-l10n-polish@lists.debian.org>\n" @@ -761,7 +761,7 @@ msgid "" msgstr "" #. type: Plain text -#: apt.ent:368 +#: apt.ent:369 #, no-wrap msgid "" " <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n" @@ -772,6 +772,38 @@ msgid "" "\">\n" msgstr "" +#. type: Plain text +#: apt.ent:371 +msgid "<!ENTITY translation-title \"TRANSLATION\">" +msgstr "" + +#. type: Plain text +#: apt.ent:380 +#, no-wrap +msgid "" +"<!-- TRANSLATOR: This is a placeholder. You should write here who has constributed\n" +" to the translation in the past, who is responsible now and maybe further information\n" +" specially related to your translation. -->\n" +"<!ENTITY translation-holder \"\n" +" The english translation was done by John Doe <email>john@doe.org</email> in 2009,\n" +" 2010 and Daniela Acme <email>daniela@acme.us</email> in 2010 together with the\n" +" Debian Dummy l10n Team <email>debian-l10n-dummy@lists.debian.org</email>.\n" +"\">\n" +msgstr "" + +#. type: Plain text +#: apt.ent:387 +#, no-wrap +msgid "" +"<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n" +" in a shipped manpage will maybe appear english parts. -->\n" +"<!ENTITY translation-english \"\n" +" Note that this translated document may contain untranslated parts.\n" +" This is done on purpose, to avoid losing content when the\n" +" translation is lagging behind the original content.\n" +"\">\n" +msgstr "" + #. The last update date #. type: Content of: <refentry><refentryinfo> #: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13 @@ -1226,7 +1258,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 #: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89 -#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:491 apt.conf.5.xml:513 +#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524 #, fuzzy msgid "options" msgstr "Kolejne kroki" @@ -1428,7 +1460,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122 -#: apt.conf.5.xml:1024 apt_preferences.5.xml:615 +#: apt.conf.5.xml:1035 apt_preferences.5.xml:622 msgid "Files" msgstr "" @@ -1441,7 +1473,7 @@ msgstr "" #: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 #: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569 #: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 -#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1030 apt_preferences.5.xml:622 +#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:629 #: sources.list.5.xml:233 msgid "See Also" msgstr "" @@ -2746,7 +2778,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1018 apt_preferences.5.xml:462 +#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1029 apt_preferences.5.xml:469 #: sources.list.5.xml:193 msgid "Examples" msgstr "" @@ -4251,7 +4283,7 @@ msgid "" "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</" "firstname> <surname>Burrows</surname> <contrib>Initial documentation of " "Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-email; " -"&apt-product; <date>18 September 2009</date>" +"&apt-product; <date>16 January 2010</date>" msgstr "" #. type: Content of: <refentry><refnamediv><refname> @@ -4274,18 +4306,54 @@ msgstr "Plik konfiguracyjny" #: apt.conf.5.xml:40 msgid "" "<filename>apt.conf</filename> is the main configuration file for the APT " -"suite of tools, all tools make use of the configuration file and a common " -"command line parser to provide a uniform environment. When an APT tool " -"starts up it will read the configuration specified by the <envar>APT_CONFIG</" -"envar> environment variable (if any) and then read the files in " -"<literal>Dir::Etc::Parts</literal> then read the main configuration file " -"specified by <literal>Dir::Etc::main</literal> then finally apply the " -"command line options to override the configuration directives, possibly " -"loading even more config files." +"suite of tools, but by far not the only place changes to options can be " +"made. All tools therefore share the configuration files and also use a " +"common command line parser to provide a uniform environment." +msgstr "" + +#. type: Content of: <refentry><refsect1><orderedlist><para> +#: apt.conf.5.xml:45 +msgid "" +"When an APT tool starts up it will read the configuration files in the " +"following order:" +msgstr "" + +#. type: Content of: <refentry><refsect1><orderedlist><listitem><para> +#: apt.conf.5.xml:47 +msgid "" +"the file specified by the <envar>APT_CONFIG</envar> environment variable (if " +"any)" +msgstr "" + +#. type: Content of: <refentry><refsect1><orderedlist><listitem><para> +#: apt.conf.5.xml:49 +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." +msgstr "" + +#. type: Content of: <refentry><refsect1><orderedlist><listitem><para> +#: apt.conf.5.xml:54 +msgid "" +"the main configuration file specified by <literal>Dir::Etc::main</literal>" +msgstr "" + +#. type: Content of: <refentry><refsect1><orderedlist><listitem><para> +#: apt.conf.5.xml:56 +msgid "" +"the command line options are applied to override the configuration " +"directives or to load even more configuration files." +msgstr "" + +#. type: Content of: <refentry><refsect1><title> +#: apt.conf.5.xml:60 +msgid "Syntax" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:50 +#: apt.conf.5.xml:61 msgid "" "The configuration file is organized in a tree with options organized into " "functional groups. Option specification is given with a double colon " @@ -4295,7 +4363,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:56 +#: apt.conf.5.xml:67 msgid "" "Syntactically the configuration language is modeled after what the ISC tools " "such as bind and dhcp use. Lines starting with <literal>//</literal> are " @@ -4311,7 +4379,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><informalexample><programlisting> -#: apt.conf.5.xml:70 +#: apt.conf.5.xml:81 #, no-wrap msgid "" "APT {\n" @@ -4323,7 +4391,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:78 +#: apt.conf.5.xml:89 msgid "" "with newlines placed to make it more readable. Lists can be created by " "opening a scope and including a single string enclosed in quotes followed by " @@ -4331,27 +4399,27 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><informalexample><programlisting> -#: apt.conf.5.xml:83 +#: apt.conf.5.xml:94 #, no-wrap msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:86 +#: apt.conf.5.xml:97 msgid "" "In general the sample configuration file in <filename>&docdir;examples/apt." "conf</filename> &configureindex; is a good guide for how it should look." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:90 +#: apt.conf.5.xml:101 msgid "" "The names of the configuration items are not case-sensitive. So in the " "previous example you could use <literal>dpkg::pre-install-pkgs</literal>." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:93 +#: apt.conf.5.xml:104 msgid "" "Names for the configuration items are optional if a list is defined as it " "can be see in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. " @@ -4361,7 +4429,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:98 +#: apt.conf.5.xml:109 msgid "" "Two specials are allowed, <literal>#include</literal> (which is deprecated " "and not supported by alternative implementations) and <literal>#clear</" @@ -4373,7 +4441,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:106 +#: apt.conf.5.xml:117 msgid "" "The #clear command is the only way to delete a list or a complete scope. " "Reopening a scope or the ::-style described below will <emphasis>not</" @@ -4383,7 +4451,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:111 +#: apt.conf.5.xml:122 msgid "" "All of the APT tools take a -o option which allows an arbitrary " "configuration directive to be specified on the command line. The syntax is a " @@ -4394,7 +4462,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:118 +#: apt.conf.5.xml:129 msgid "" "Note that you can use :: only for appending one item per line to a list and " "that you should not use it in combination with the scope syntax. (The scope " @@ -4411,24 +4479,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:130 +#: apt.conf.5.xml:141 msgid "The APT Group" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:131 +#: apt.conf.5.xml:142 msgid "" "This group of options controls general APT behavior as well as holding the " "options for all of the tools." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:135 +#: apt.conf.5.xml:146 msgid "Architecture" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:136 +#: apt.conf.5.xml:147 msgid "" "System Architecture; sets the architecture to use when fetching files and " "parsing package lists. The internal default is the architecture apt was " @@ -4436,12 +4504,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:141 +#: apt.conf.5.xml:152 msgid "Default-Release" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:142 +#: apt.conf.5.xml:153 msgid "" "Default release to install packages from if more than one version available. " "Contains release name, codename or release version. Examples: 'stable', " @@ -4450,24 +4518,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:146 +#: apt.conf.5.xml:157 msgid "Ignore-Hold" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:147 +#: apt.conf.5.xml:158 msgid "" "Ignore Held packages; This global option causes the problem resolver to " "ignore held packages in its decision making." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:151 +#: apt.conf.5.xml:162 msgid "Clean-Installed" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:152 +#: apt.conf.5.xml:163 msgid "" "Defaults to on. When turned on the autoclean feature will remove any " "packages which can no longer be downloaded from the cache. If turned off " @@ -4476,12 +4544,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:158 +#: apt.conf.5.xml:169 msgid "Immediate-Configure" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:159 +#: apt.conf.5.xml:170 msgid "" "Defaults to on which will cause APT to install essential and important " "packages as fast as possible in the install/upgrade operation. This is done " @@ -4514,12 +4582,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:181 +#: apt.conf.5.xml:192 msgid "Force-LoopBreak" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:182 +#: apt.conf.5.xml:193 msgid "" "Never Enable this option unless you -really- know what you are doing. It " "permits APT to temporarily remove an essential package to break a Conflicts/" @@ -4530,82 +4598,82 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:190 +#: apt.conf.5.xml:201 msgid "Cache-Limit" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:191 +#: apt.conf.5.xml:202 msgid "" "APT uses a fixed size memory mapped cache file to store the 'available' " "information. This sets the size of that cache (in bytes)." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:195 +#: apt.conf.5.xml:206 msgid "Build-Essential" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:196 +#: apt.conf.5.xml:207 msgid "Defines which package(s) are considered essential build dependencies." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:199 +#: apt.conf.5.xml:210 msgid "Get" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:200 +#: apt.conf.5.xml:211 msgid "" "The Get subsection controls the &apt-get; tool, please see its documentation " "for more information about the options here." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:204 +#: apt.conf.5.xml:215 msgid "Cache" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:205 +#: apt.conf.5.xml:216 msgid "" "The Cache subsection controls the &apt-cache; tool, please see its " "documentation for more information about the options here." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:209 +#: apt.conf.5.xml:220 msgid "CDROM" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:210 +#: apt.conf.5.xml:221 msgid "" "The CDROM subsection controls the &apt-cdrom; tool, please see its " "documentation for more information about the options here." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:216 +#: apt.conf.5.xml:227 msgid "The Acquire Group" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:221 +#: apt.conf.5.xml:232 msgid "PDiffs" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:222 +#: apt.conf.5.xml:233 msgid "" "Try to download deltas called <literal>PDiffs</literal> for Packages or " "Sources files instead of downloading whole ones. True by default." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:225 +#: apt.conf.5.xml:236 msgid "" "Two sub-options to limit the use of PDiffs are also available: With " "<literal>FileLimit</literal> can be specified how many PDiff files are " @@ -4616,12 +4684,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:234 +#: apt.conf.5.xml:245 msgid "Queue-Mode" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:235 +#: apt.conf.5.xml:246 msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</" "literal> or <literal>access</literal> which determines how APT parallelizes " @@ -4631,36 +4699,36 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:242 +#: apt.conf.5.xml:253 msgid "Retries" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:243 +#: apt.conf.5.xml:254 msgid "" "Number of retries to perform. If this is non-zero APT will retry failed " "files the given number of times." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:247 +#: apt.conf.5.xml:258 msgid "Source-Symlinks" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:248 +#: apt.conf.5.xml:259 msgid "" "Use symlinks for source archives. If set to true then source archives will " "be symlinked when possible instead of copying. True is the default." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:252 sources.list.5.xml:139 +#: apt.conf.5.xml:263 sources.list.5.xml:139 msgid "http" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:253 +#: apt.conf.5.xml:264 msgid "" "HTTP URIs; http::Proxy is the default http proxy to use. It is in the " "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per " @@ -4671,7 +4739,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:261 +#: apt.conf.5.xml:272 msgid "" "Three settings are provided for cache control with HTTP/1.1 compliant proxy " "caches. <literal>No-Cache</literal> tells the proxy to not use its cached " @@ -4685,7 +4753,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:271 apt.conf.5.xml:335 +#: apt.conf.5.xml:282 apt.conf.5.xml:346 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method, this applies to all things including connection timeout and data " @@ -4693,7 +4761,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:274 +#: apt.conf.5.xml:285 msgid "" "One setting is provided to control the pipeline depth in cases where the " "remote server is not RFC conforming or buggy (such as Squid 2.0.2). " @@ -4705,7 +4773,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:282 +#: apt.conf.5.xml:293 msgid "" "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</" "literal> which accepts integer values in kilobyte. The default value is 0 " @@ -4715,7 +4783,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:287 +#: apt.conf.5.xml:298 msgid "" "<literal>Acquire::http::User-Agent</literal> can be used to set a different " "User-Agent for the http download method as some proxies allow access for " @@ -4723,12 +4791,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:293 +#: apt.conf.5.xml:304 msgid "https" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:294 +#: apt.conf.5.xml:305 msgid "" "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy " "options are the same as for <literal>http</literal> method and will also " @@ -4738,7 +4806,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:300 +#: apt.conf.5.xml:311 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is " @@ -4759,12 +4827,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:318 sources.list.5.xml:150 +#: apt.conf.5.xml:329 sources.list.5.xml:150 msgid "ftp" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:319 +#: apt.conf.5.xml:330 msgid "" "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard " "form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host " @@ -4783,7 +4851,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:338 +#: apt.conf.5.xml:349 msgid "" "Several settings are provided to control passive mode. Generally it is safe " "to leave passive mode on, it works in nearly every environment. However " @@ -4793,7 +4861,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:345 +#: apt.conf.5.xml:356 msgid "" "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</" "envar> environment variable to a http url - see the discussion of the http " @@ -4802,7 +4870,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:350 +#: apt.conf.5.xml:361 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@ -4812,18 +4880,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:357 sources.list.5.xml:132 +#: apt.conf.5.xml:368 sources.list.5.xml:132 msgid "cdrom" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:363 +#: apt.conf.5.xml:374 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:358 +#: apt.conf.5.xml:369 msgid "" "CDROM URIs; the only setting for CDROM URIs is the mount point, " "<literal>cdrom::Mount</literal> which must be the mount point for the CDROM " @@ -4836,12 +4904,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:368 +#: apt.conf.5.xml:379 msgid "gpgv" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:369 +#: apt.conf.5.xml:380 msgid "" "GPGV URIs; the only option for GPGV URIs is the option to pass additional " "parameters to gpgv. <literal>gpgv::Options</literal> Additional options " @@ -4849,18 +4917,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:374 +#: apt.conf.5.xml:385 msgid "CompressionTypes" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:380 +#: apt.conf.5.xml:391 #, no-wrap msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:375 +#: apt.conf.5.xml:386 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@ -4872,19 +4940,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:385 +#: apt.conf.5.xml:396 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:388 +#: apt.conf.5.xml:399 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:381 +#: apt.conf.5.xml:392 msgid "" "Also the <literal>Order</literal> subgroup can be used to define in which " "order the acquire system will try to download the compressed files. The " @@ -4901,13 +4969,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:392 +#: apt.conf.5.xml:403 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:390 +#: apt.conf.5.xml:401 msgid "" "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" "replaceable></literal> will be checked: If this setting exists the method " @@ -4922,7 +4990,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:397 +#: apt.conf.5.xml:408 msgid "" "While it is possible to add an empty compression type to the order list, but " "APT in its current version doesn't understand it correctly and will display " @@ -4932,12 +5000,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:403 +#: apt.conf.5.xml:414 msgid "Languages" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:404 +#: apt.conf.5.xml:415 msgid "" "The Languages subsection controls which <filename>Translation</filename> " "files are downloaded and in which order APT tries to display the Description-" @@ -4950,13 +5018,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting> -#: apt.conf.5.xml:420 +#: apt.conf.5.xml:431 #, no-wrap msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:410 +#: apt.conf.5.xml:421 msgid "" "The default list includes \"environment\" and \"en\". " "\"<literal>environment</literal>\" has a special meaning here: It will be " @@ -4979,19 +5047,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:217 +#: apt.conf.5.xml:228 msgid "" "The <literal>Acquire</literal> group of options controls the download of " "packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:427 +#: apt.conf.5.xml:438 msgid "Directories" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:429 +#: apt.conf.5.xml:440 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@ -5003,7 +5071,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:436 +#: apt.conf.5.xml:447 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@ -5016,7 +5084,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:445 +#: apt.conf.5.xml:456 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@ -5026,7 +5094,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:451 +#: apt.conf.5.xml:462 msgid "" "The <literal>Dir::Parts</literal> setting reads in all the config fragments " "in lexical order from the directory specified. After this is done then the " @@ -5034,7 +5102,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:455 +#: apt.conf.5.xml:466 msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" "Bin::Methods</literal> specifies the location of the method handlers and " @@ -5045,7 +5113,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:463 +#: apt.conf.5.xml:474 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@ -5058,12 +5126,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:476 +#: apt.conf.5.xml:487 msgid "APT in DSelect" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:478 +#: apt.conf.5.xml:489 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behaviour. These are in the <literal>DSelect</literal> " @@ -5071,12 +5139,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:482 +#: apt.conf.5.xml:493 msgid "Clean" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:483 +#: apt.conf.5.xml:494 msgid "" "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto " "and never. always and prompt will remove all packages from the cache after " @@ -5087,50 +5155,50 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:492 +#: apt.conf.5.xml:503 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the install phase." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:496 +#: apt.conf.5.xml:507 msgid "Updateoptions" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:497 +#: apt.conf.5.xml:508 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the update phase." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:501 +#: apt.conf.5.xml:512 msgid "PromptAfterUpdate" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:502 +#: apt.conf.5.xml:513 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:508 +#: apt.conf.5.xml:519 msgid "How APT calls dpkg" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:509 +#: apt.conf.5.xml:520 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:514 +#: apt.conf.5.xml:525 msgid "" "This is a list of options to pass to dpkg. The options must be specified " "using the list notation and each list item is passed as a single argument to " @@ -5138,17 +5206,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:519 +#: apt.conf.5.xml:530 msgid "Pre-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:519 +#: apt.conf.5.xml:530 msgid "Post-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:520 +#: apt.conf.5.xml:531 msgid "" "This is a list of shell commands to run before/after invoking &dpkg;. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -5157,12 +5225,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:526 +#: apt.conf.5.xml:537 msgid "Pre-Install-Pkgs" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:527 +#: apt.conf.5.xml:538 msgid "" "This is a list of shell commands to run before invoking dpkg. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -5172,7 +5240,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:533 +#: apt.conf.5.xml:544 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@ -5182,36 +5250,36 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:540 +#: apt.conf.5.xml:551 msgid "Run-Directory" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:541 +#: apt.conf.5.xml:552 msgid "" "APT chdirs to this directory before invoking dpkg, the default is <filename>/" "</filename>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:545 +#: apt.conf.5.xml:556 msgid "Build-options" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:546 +#: apt.conf.5.xml:557 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages, the " "default is to disable signing and produce all binaries." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt.conf.5.xml:551 +#: apt.conf.5.xml:562 msgid "dpkg trigger usage (and related options)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:552 +#: apt.conf.5.xml:563 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 " @@ -5226,7 +5294,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:567 +#: apt.conf.5.xml:578 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@ -5236,7 +5304,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:561 +#: apt.conf.5.xml:572 msgid "" "Note that it is not guaranteed that APT will support these options or that " "these options will not cause (big) trouble in the future. If you have " @@ -5250,12 +5318,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:573 +#: apt.conf.5.xml:584 msgid "DPkg::NoTriggers" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:574 +#: apt.conf.5.xml:585 msgid "" "Add the no triggers flag to all dpkg calls (except the ConfigurePending " "call). See &dpkg; if you are interested in what this actually means. In " @@ -5267,12 +5335,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:581 +#: apt.conf.5.xml:592 msgid "PackageManager::Configure" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:582 +#: apt.conf.5.xml:593 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@ -5288,12 +5356,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:592 +#: apt.conf.5.xml:603 msgid "DPkg::ConfigurePending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:593 +#: apt.conf.5.xml:604 msgid "" "If this option is set apt will call <command>dpkg --configure --pending</" "command> to let dpkg handle all required configurations and triggers. This " @@ -5304,12 +5372,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:599 +#: apt.conf.5.xml:610 msgid "DPkg::TriggersPending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:600 +#: apt.conf.5.xml:611 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@ -5319,12 +5387,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:605 +#: apt.conf.5.xml:616 msgid "PackageManager::UnpackAll" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:606 +#: apt.conf.5.xml:617 msgid "" "As the configuration can be deferred to be done at the end by dpkg it can be " "tried to order the unpack series only by critical needs, e.g. by Pre-" @@ -5336,12 +5404,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:613 +#: apt.conf.5.xml:624 msgid "OrderList::Score::Immediate" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:621 +#: apt.conf.5.xml:632 #, no-wrap msgid "" "OrderList::Score {\n" @@ -5353,7 +5421,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:614 +#: apt.conf.5.xml:625 msgid "" "Essential packages (and there dependencies) should be configured immediately " "after unpacking. It will be a good idea to do this quite early in the " @@ -5367,12 +5435,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:634 +#: apt.conf.5.xml:645 msgid "Periodic and Archives options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:635 +#: apt.conf.5.xml:646 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@ -5381,12 +5449,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:643 +#: apt.conf.5.xml:654 msgid "Debug options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:645 +#: apt.conf.5.xml:656 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -5397,7 +5465,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:656 +#: apt.conf.5.xml:667 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@ -5405,7 +5473,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:664 +#: apt.conf.5.xml:675 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@ -5413,7 +5481,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:673 +#: apt.conf.5.xml:684 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -5423,111 +5491,111 @@ msgstr "" #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:681 +#: apt.conf.5.xml:692 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CDROM IDs." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:691 +#: apt.conf.5.xml:702 msgid "A full list of debugging options to apt follows." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:696 +#: apt.conf.5.xml:707 msgid "<literal>Debug::Acquire::cdrom</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:700 +#: apt.conf.5.xml:711 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:707 +#: apt.conf.5.xml:718 msgid "<literal>Debug::Acquire::ftp</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:711 +#: apt.conf.5.xml:722 msgid "Print information related to downloading packages using FTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:718 +#: apt.conf.5.xml:729 msgid "<literal>Debug::Acquire::http</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:722 +#: apt.conf.5.xml:733 msgid "Print information related to downloading packages using HTTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:729 +#: apt.conf.5.xml:740 msgid "<literal>Debug::Acquire::https</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:733 +#: apt.conf.5.xml:744 msgid "Print information related to downloading packages using HTTPS." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:740 +#: apt.conf.5.xml:751 msgid "<literal>Debug::Acquire::gpgv</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:744 +#: apt.conf.5.xml:755 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:751 +#: apt.conf.5.xml:762 msgid "<literal>Debug::aptcdrom</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:755 +#: apt.conf.5.xml:766 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:762 +#: apt.conf.5.xml:773 msgid "<literal>Debug::BuildDeps</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:765 +#: apt.conf.5.xml:776 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:772 +#: apt.conf.5.xml:783 msgid "<literal>Debug::Hashes</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:775 +#: apt.conf.5.xml:786 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:782 +#: apt.conf.5.xml:793 msgid "<literal>Debug::IdentCDROM</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:785 +#: apt.conf.5.xml:796 msgid "" "Do not include information from <literal>statfs</literal>, namely the number " "of used and free blocks on the CD-ROM filesystem, when generating an ID for " @@ -5535,93 +5603,93 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:793 +#: apt.conf.5.xml:804 msgid "<literal>Debug::NoLocking</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:796 +#: apt.conf.5.xml:807 msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:804 +#: apt.conf.5.xml:815 msgid "<literal>Debug::pkgAcquire</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:808 +#: apt.conf.5.xml:819 msgid "Log when items are added to or removed from the global download queue." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:815 +#: apt.conf.5.xml:826 msgid "<literal>Debug::pkgAcquire::Auth</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:818 +#: apt.conf.5.xml:829 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:825 +#: apt.conf.5.xml:836 msgid "<literal>Debug::pkgAcquire::Diffs</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:828 +#: apt.conf.5.xml:839 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:836 +#: apt.conf.5.xml:847 msgid "<literal>Debug::pkgAcquire::RRed</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:840 +#: apt.conf.5.xml:851 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:847 +#: apt.conf.5.xml:858 msgid "<literal>Debug::pkgAcquire::Worker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:851 +#: apt.conf.5.xml:862 msgid "" "Log all interactions with the sub-processes that actually perform downloads." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:858 +#: apt.conf.5.xml:869 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:862 +#: apt.conf.5.xml:873 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:869 +#: apt.conf.5.xml:880 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:872 +#: apt.conf.5.xml:883 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@ -5631,12 +5699,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:883 +#: apt.conf.5.xml:894 msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:886 +#: apt.conf.5.xml:897 msgid "" "Generate debug messages describing which package is marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@ -5653,91 +5721,91 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:905 +#: apt.conf.5.xml:916 msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:908 +#: apt.conf.5.xml:919 msgid "Dump the default configuration to standard error on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:915 +#: apt.conf.5.xml:926 msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:918 +#: apt.conf.5.xml:929 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:926 +#: apt.conf.5.xml:937 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:929 +#: apt.conf.5.xml:940 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:936 +#: apt.conf.5.xml:947 msgid "<literal>Debug::pkgOrderList</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:940 +#: apt.conf.5.xml:951 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:948 +#: apt.conf.5.xml:959 msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:952 +#: apt.conf.5.xml:963 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:959 +#: apt.conf.5.xml:970 msgid "<literal>Debug::pkgPolicy</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:963 +#: apt.conf.5.xml:974 msgid "Output the priority of each package list on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:969 +#: apt.conf.5.xml:980 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:973 +#: apt.conf.5.xml:984 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:981 +#: apt.conf.5.xml:992 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:984 +#: apt.conf.5.xml:995 msgid "" "Display a list of all installed packages with their calculated score used by " "the pkgProblemResolver. The description of the package is the same as " @@ -5745,32 +5813,32 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:992 +#: apt.conf.5.xml:1003 msgid "<literal>Debug::sourceList</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:996 +#: apt.conf.5.xml:1007 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1019 +#: apt.conf.5.xml:1030 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt.conf.5.xml:1026 +#: apt.conf.5.xml:1037 msgid "&file-aptconf;" msgstr "" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1031 +#: apt.conf.5.xml:1042 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "" @@ -5822,25 +5890,36 @@ msgid "" "choice of instance, only the choice of version." msgstr "" -#. type: Content of: <refentry><refsect1><refsect2><title> +#. type: Content of: <refentry><refsect1><para> #: apt_preferences.5.xml:56 +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." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt_preferences.5.xml:63 msgid "APT's Default Priority Assignments" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:71 +#: apt_preferences.5.xml:78 #, no-wrap msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:74 +#: apt_preferences.5.xml:81 #, no-wrap msgid "APT::Default-Release \"stable\";\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:58 +#: apt_preferences.5.xml:65 msgid "" "If there is no preferences file or if there is no entry in the file that " "applies to a particular version then the priority assigned to that version " @@ -5856,40 +5935,40 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:83 +#: apt_preferences.5.xml:90 msgid "priority 100" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:84 +#: apt_preferences.5.xml:91 msgid "to the version that is already installed (if any)." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:88 +#: apt_preferences.5.xml:95 msgid "priority 500" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:89 +#: apt_preferences.5.xml:96 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:93 +#: apt_preferences.5.xml:100 msgid "priority 990" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:94 +#: apt_preferences.5.xml:101 msgid "" "to the versions that are not installed and belong to the target release." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:78 +#: apt_preferences.5.xml:85 msgid "" "If the target release has been specified then APT uses the following " "algorithm to set the priorities of the versions of a package. Assign: " @@ -5897,7 +5976,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:99 +#: apt_preferences.5.xml:106 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 " @@ -5905,14 +5984,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:103 +#: apt_preferences.5.xml:110 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:106 +#: apt_preferences.5.xml:113 msgid "" "Never downgrade unless the priority of an available version exceeds 1000. " "(\"Downgrading\" is installing a less recent version of a package in place " @@ -5922,19 +6001,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:112 +#: apt_preferences.5.xml:119 msgid "Install the highest priority version." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:113 +#: apt_preferences.5.xml:120 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:116 +#: apt_preferences.5.xml:123 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</" @@ -5942,7 +6021,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:122 +#: apt_preferences.5.xml:129 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 " @@ -5952,7 +6031,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:129 +#: apt_preferences.5.xml:136 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 " @@ -5961,7 +6040,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:134 +#: apt_preferences.5.xml:141 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 " @@ -5973,12 +6052,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:143 +#: apt_preferences.5.xml:150 msgid "The Effect of APT Preferences" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:145 +#: apt_preferences.5.xml:152 msgid "" "The APT preferences file allows the system administrator to control the " "assignment of priorities. The file consists of one or more multi-line " @@ -5987,7 +6066,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:151 +#: apt_preferences.5.xml:158 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 " @@ -5997,7 +6076,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:158 +#: apt_preferences.5.xml:165 #, no-wrap msgid "" "Package: perl\n" @@ -6006,7 +6085,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:164 +#: apt_preferences.5.xml:171 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 " @@ -6016,7 +6095,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:170 +#: apt_preferences.5.xml:177 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 " @@ -6024,7 +6103,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:175 +#: apt_preferences.5.xml:182 #, no-wrap msgid "" "Package: *\n" @@ -6033,7 +6112,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:180 +#: apt_preferences.5.xml:187 msgid "" "A note of caution: the keyword used here is \"<literal>origin</literal>\". " "This should not be confused with the Origin of a distribution as specified " @@ -6043,7 +6122,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:186 +#: apt_preferences.5.xml:193 msgid "" "The following record assigns a low priority to all package versions " "belonging to any distribution whose Archive name is \"<literal>unstable</" @@ -6051,7 +6130,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:190 +#: apt_preferences.5.xml:197 #, no-wrap msgid "" "Package: *\n" @@ -6060,7 +6139,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:195 +#: apt_preferences.5.xml:202 msgid "" "The following record assigns a high priority to all package versions " "belonging to any distribution whose Codename is \"<literal>squeeze</literal>" @@ -6068,7 +6147,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:199 +#: apt_preferences.5.xml:206 #, no-wrap msgid "" "Package: *\n" @@ -6077,7 +6156,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:204 +#: apt_preferences.5.xml:211 msgid "" "The following record assigns a high priority to all package versions " "belonging to any release whose Archive name is \"<literal>stable</literal>\" " @@ -6085,7 +6164,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:209 +#: apt_preferences.5.xml:216 #, no-wrap msgid "" "Package: *\n" @@ -6094,82 +6173,82 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:220 +#: apt_preferences.5.xml:227 msgid "How APT Interprets Priorities" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:228 +#: apt_preferences.5.xml:235 msgid "P > 1000" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:229 +#: apt_preferences.5.xml:236 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:233 +#: apt_preferences.5.xml:240 msgid "990 < P <=1000" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:234 +#: apt_preferences.5.xml:241 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:239 +#: apt_preferences.5.xml:246 msgid "500 < P <=990" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:240 +#: apt_preferences.5.xml:247 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:245 +#: apt_preferences.5.xml:252 msgid "100 < P <=500" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:246 +#: apt_preferences.5.xml:253 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:251 +#: apt_preferences.5.xml:258 msgid "0 < P <=100" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:252 +#: apt_preferences.5.xml:259 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:256 +#: apt_preferences.5.xml:263 msgid "P < 0" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:257 +#: apt_preferences.5.xml:264 msgid "prevents the version from being installed" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:223 +#: apt_preferences.5.xml:230 msgid "" "Priorities (P) assigned in the APT preferences file must be positive or " "negative integers. They are interpreted as follows (roughly speaking): " @@ -6177,7 +6256,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:262 +#: apt_preferences.5.xml:269 msgid "" "If any specific-form records match an available package version then the " "first such record determines the priority of the package version. Failing " @@ -6186,14 +6265,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:268 +#: apt_preferences.5.xml:275 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:272 +#: apt_preferences.5.xml:279 #, no-wrap msgid "" "Package: perl\n" @@ -6210,12 +6289,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:285 +#: apt_preferences.5.xml:292 msgid "Then:" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:287 +#: apt_preferences.5.xml:294 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 " @@ -6225,7 +6304,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:292 +#: apt_preferences.5.xml:299 msgid "" "A version of any package other than <literal>perl</literal> that is " "available from the local system has priority over other versions, even " @@ -6233,7 +6312,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:296 +#: apt_preferences.5.xml:303 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</" @@ -6242,12 +6321,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:306 +#: apt_preferences.5.xml:313 msgid "Determination of Package Version and Distribution Properties" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:308 +#: apt_preferences.5.xml:315 msgid "" "The locations listed in the &sources-list; file should provide " "<filename>Packages</filename> and <filename>Release</filename> files to " @@ -6255,27 +6334,27 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:320 +#: apt_preferences.5.xml:327 msgid "the <literal>Package:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:321 +#: apt_preferences.5.xml:328 msgid "gives the package name" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:324 apt_preferences.5.xml:374 +#: apt_preferences.5.xml:331 apt_preferences.5.xml:381 msgid "the <literal>Version:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:325 +#: apt_preferences.5.xml:332 msgid "gives the version number for the named package" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:312 +#: apt_preferences.5.xml:319 msgid "" "The <filename>Packages</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable>/" @@ -6288,12 +6367,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:341 +#: apt_preferences.5.xml:348 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:342 +#: apt_preferences.5.xml:349 msgid "" "names the archive to which all the packages in the directory tree belong. " "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies " @@ -6304,18 +6383,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:352 +#: apt_preferences.5.xml:359 #, no-wrap msgid "Pin: release a=stable\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:358 +#: apt_preferences.5.xml:365 msgid "the <literal>Codename:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:359 +#: apt_preferences.5.xml:366 msgid "" "names the codename to which all the packages in the directory tree belong. " "For example, the line \"Codename: squeeze\" specifies that all of the " @@ -6325,13 +6404,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:368 +#: apt_preferences.5.xml:375 #, no-wrap msgid "Pin: release n=squeeze\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:375 +#: apt_preferences.5.xml:382 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 " @@ -6341,7 +6420,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:384 +#: apt_preferences.5.xml:391 #, no-wrap msgid "" "Pin: release v=3.0\n" @@ -6350,12 +6429,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:393 +#: apt_preferences.5.xml:400 msgid "the <literal>Component:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:394 +#: apt_preferences.5.xml:401 msgid "" "names the licensing component associated with the packages in the directory " "tree of the <filename>Release</filename> file. For example, the line " @@ -6366,18 +6445,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:403 +#: apt_preferences.5.xml:410 #, no-wrap msgid "Pin: release c=main\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:409 +#: apt_preferences.5.xml:416 msgid "the <literal>Origin:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:410 +#: apt_preferences.5.xml:417 msgid "" "names the originator of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@ -6386,18 +6465,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:416 +#: apt_preferences.5.xml:423 #, no-wrap msgid "Pin: release o=Debian\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:422 +#: apt_preferences.5.xml:429 msgid "the <literal>Label:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:423 +#: apt_preferences.5.xml:430 msgid "" "names the label of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@ -6406,13 +6485,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:429 +#: apt_preferences.5.xml:436 #, no-wrap msgid "Pin: release l=Debian\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:330 +#: apt_preferences.5.xml:337 msgid "" "The <filename>Release</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for " @@ -6425,7 +6504,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:436 +#: apt_preferences.5.xml:443 msgid "" "All of the <filename>Packages</filename> and <filename>Release</filename> " "files retrieved from locations listed in the &sources-list; file are stored " @@ -6440,12 +6519,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:449 +#: apt_preferences.5.xml:456 msgid "Optional Lines in an APT Preferences Record" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:451 +#: apt_preferences.5.xml:458 msgid "" "Each record in the APT preferences file can optionally begin with one or " "more lines beginning with the word <literal>Explanation:</literal>. This " @@ -6453,7 +6532,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:455 +#: apt_preferences.5.xml:462 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 value " @@ -6462,12 +6541,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:464 +#: apt_preferences.5.xml:471 msgid "Tracking Stable" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:472 +#: apt_preferences.5.xml:479 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated\n" @@ -6482,7 +6561,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:466 +#: apt_preferences.5.xml:473 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 " @@ -6492,8 +6571,8 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:489 apt_preferences.5.xml:535 -#: apt_preferences.5.xml:593 +#: apt_preferences.5.xml:496 apt_preferences.5.xml:542 +#: apt_preferences.5.xml:600 #, no-wrap msgid "" "apt-get install <replaceable>package-name</replaceable>\n" @@ -6502,7 +6581,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:484 +#: apt_preferences.5.xml:491 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 " @@ -6511,13 +6590,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:501 +#: apt_preferences.5.xml:508 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/testing\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:495 +#: apt_preferences.5.xml:502 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>testing</literal> distribution; the package " @@ -6526,12 +6605,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:507 +#: apt_preferences.5.xml:514 msgid "Tracking Testing or Unstable" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:516 +#: apt_preferences.5.xml:523 #, no-wrap msgid "" "Package: *\n" @@ -6548,7 +6627,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:509 +#: apt_preferences.5.xml:516 msgid "" "The following APT preferences file will cause APT to assign a high priority " "to package versions from the <literal>testing</literal> distribution, a " @@ -6559,7 +6638,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:530 +#: apt_preferences.5.xml:537 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 " @@ -6568,13 +6647,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:550 +#: apt_preferences.5.xml:557 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/unstable\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:541 +#: apt_preferences.5.xml:548 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>unstable</literal> distribution. " @@ -6586,12 +6665,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:557 +#: apt_preferences.5.xml:564 msgid "Tracking the evolution of a codename release" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:571 +#: apt_preferences.5.xml:578 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated package versions\n" @@ -6611,7 +6690,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:559 +#: apt_preferences.5.xml:566 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 " @@ -6626,7 +6705,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:588 +#: apt_preferences.5.xml:595 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 " @@ -6635,13 +6714,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:608 +#: apt_preferences.5.xml:615 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/sid\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:599 +#: apt_preferences.5.xml:606 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>sid</literal> distribution. Thereafter, " @@ -6653,12 +6732,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt_preferences.5.xml:617 +#: apt_preferences.5.xml:624 msgid "&file-preferences;" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt_preferences.5.xml:623 +#: apt_preferences.5.xml:630 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;" msgstr "" diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po index 6f87a3d90..e6225eb67 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: 2010-01-11 15:12+0100\n" +"POT-Creation-Date: 2010-01-20 12:18+0100\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" @@ -804,7 +804,7 @@ msgid "" msgstr "" #. type: Plain text -#: apt.ent:368 +#: apt.ent:369 #, no-wrap msgid "" " <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n" @@ -815,6 +815,43 @@ msgid "" "\">\n" msgstr "" +#. type: Plain text +#: apt.ent:371 +#, fuzzy +msgid "<!ENTITY translation-title \"TRANSLATION\">" +msgstr "<!ENTITY translation-title \"Tradução\">" + +#. type: Plain text +#: apt.ent:380 +#, no-wrap, fuzzy +msgid "" +"<!-- TRANSLATOR: This is a placeholder. You should write here who has constributed\n" +" to the translation in the past, who is responsible now and maybe further information\n" +" specially related to your translation. -->\n" +"<!ENTITY translation-holder \"\n" +" The english translation was done by John Doe <email>john@doe.org</email> in 2009,\n" +" 2010 and Daniela Acme <email>daniela@acme.us</email> in 2010 together with the\n" +" Debian Dummy l10n Team <email>debian-l10n-dummy@lists.debian.org</email>.\n" +"\">\n" +msgstr "" +"<!ENTITY translation-holder \"\n" +" Esta página de manual foi traduzida para o Português do Brasil por\n" +" André Luís Lopes <email>andrelop@ig.com.br</email>.\n" +"\">\n" + +#. type: Plain text +#: apt.ent:387 +#, no-wrap +msgid "" +"<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n" +" in a shipped manpage will maybe appear english parts. -->\n" +"<!ENTITY translation-english \"\n" +" Note that this translated document may contain untranslated parts.\n" +" This is done on purpose, to avoid losing content when the\n" +" translation is lagging behind the original content.\n" +"\">\n" +msgstr "" + #. The last update date #. type: Content of: <refentry><refentryinfo> #: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13 @@ -1272,7 +1309,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 #: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89 -#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:491 apt.conf.5.xml:513 +#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524 msgid "options" msgstr "" @@ -1473,7 +1510,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122 -#: apt.conf.5.xml:1024 apt_preferences.5.xml:615 +#: apt.conf.5.xml:1035 apt_preferences.5.xml:622 msgid "Files" msgstr "" @@ -1486,7 +1523,7 @@ msgstr "" #: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 #: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569 #: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 -#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1030 apt_preferences.5.xml:622 +#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:629 #: sources.list.5.xml:233 #, fuzzy msgid "See Also" @@ -2793,7 +2830,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1018 apt_preferences.5.xml:462 +#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1029 apt_preferences.5.xml:469 #: sources.list.5.xml:193 #, fuzzy msgid "Examples" @@ -4303,7 +4340,7 @@ msgid "" "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</" "firstname> <surname>Burrows</surname> <contrib>Initial documentation of " "Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-email; " -"&apt-product; <date>18 September 2009</date>" +"&apt-product; <date>16 January 2010</date>" msgstr "" #. type: Content of: <refentry><refnamediv><refname> @@ -4325,18 +4362,54 @@ msgstr "" #: apt.conf.5.xml:40 msgid "" "<filename>apt.conf</filename> is the main configuration file for the APT " -"suite of tools, all tools make use of the configuration file and a common " -"command line parser to provide a uniform environment. When an APT tool " -"starts up it will read the configuration specified by the <envar>APT_CONFIG</" -"envar> environment variable (if any) and then read the files in " -"<literal>Dir::Etc::Parts</literal> then read the main configuration file " -"specified by <literal>Dir::Etc::main</literal> then finally apply the " -"command line options to override the configuration directives, possibly " -"loading even more config files." +"suite of tools, but by far not the only place changes to options can be " +"made. All tools therefore share the configuration files and also use a " +"common command line parser to provide a uniform environment." +msgstr "" + +#. type: Content of: <refentry><refsect1><orderedlist><para> +#: apt.conf.5.xml:45 +msgid "" +"When an APT tool starts up it will read the configuration files in the " +"following order:" +msgstr "" + +#. type: Content of: <refentry><refsect1><orderedlist><listitem><para> +#: apt.conf.5.xml:47 +msgid "" +"the file specified by the <envar>APT_CONFIG</envar> environment variable (if " +"any)" +msgstr "" + +#. type: Content of: <refentry><refsect1><orderedlist><listitem><para> +#: apt.conf.5.xml:49 +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." +msgstr "" + +#. type: Content of: <refentry><refsect1><orderedlist><listitem><para> +#: apt.conf.5.xml:54 +msgid "" +"the main configuration file specified by <literal>Dir::Etc::main</literal>" +msgstr "" + +#. type: Content of: <refentry><refsect1><orderedlist><listitem><para> +#: apt.conf.5.xml:56 +msgid "" +"the command line options are applied to override the configuration " +"directives or to load even more configuration files." +msgstr "" + +#. type: Content of: <refentry><refsect1><title> +#: apt.conf.5.xml:60 +msgid "Syntax" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:50 +#: apt.conf.5.xml:61 msgid "" "The configuration file is organized in a tree with options organized into " "functional groups. Option specification is given with a double colon " @@ -4346,7 +4419,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:56 +#: apt.conf.5.xml:67 msgid "" "Syntactically the configuration language is modeled after what the ISC tools " "such as bind and dhcp use. Lines starting with <literal>//</literal> are " @@ -4362,7 +4435,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><informalexample><programlisting> -#: apt.conf.5.xml:70 +#: apt.conf.5.xml:81 #, no-wrap msgid "" "APT {\n" @@ -4374,7 +4447,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:78 +#: apt.conf.5.xml:89 msgid "" "with newlines placed to make it more readable. Lists can be created by " "opening a scope and including a single string enclosed in quotes followed by " @@ -4382,27 +4455,27 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><informalexample><programlisting> -#: apt.conf.5.xml:83 +#: apt.conf.5.xml:94 #, no-wrap msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:86 +#: apt.conf.5.xml:97 msgid "" "In general the sample configuration file in <filename>&docdir;examples/apt." "conf</filename> &configureindex; is a good guide for how it should look." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:90 +#: apt.conf.5.xml:101 msgid "" "The names of the configuration items are not case-sensitive. So in the " "previous example you could use <literal>dpkg::pre-install-pkgs</literal>." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:93 +#: apt.conf.5.xml:104 msgid "" "Names for the configuration items are optional if a list is defined as it " "can be see in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. " @@ -4412,7 +4485,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:98 +#: apt.conf.5.xml:109 msgid "" "Two specials are allowed, <literal>#include</literal> (which is deprecated " "and not supported by alternative implementations) and <literal>#clear</" @@ -4424,7 +4497,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:106 +#: apt.conf.5.xml:117 msgid "" "The #clear command is the only way to delete a list or a complete scope. " "Reopening a scope or the ::-style described below will <emphasis>not</" @@ -4434,7 +4507,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:111 +#: apt.conf.5.xml:122 msgid "" "All of the APT tools take a -o option which allows an arbitrary " "configuration directive to be specified on the command line. The syntax is a " @@ -4445,7 +4518,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:118 +#: apt.conf.5.xml:129 msgid "" "Note that you can use :: only for appending one item per line to a list and " "that you should not use it in combination with the scope syntax. (The scope " @@ -4462,24 +4535,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:130 +#: apt.conf.5.xml:141 msgid "The APT Group" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:131 +#: apt.conf.5.xml:142 msgid "" "This group of options controls general APT behavior as well as holding the " "options for all of the tools." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:135 +#: apt.conf.5.xml:146 msgid "Architecture" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:136 +#: apt.conf.5.xml:147 msgid "" "System Architecture; sets the architecture to use when fetching files and " "parsing package lists. The internal default is the architecture apt was " @@ -4487,12 +4560,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:141 +#: apt.conf.5.xml:152 msgid "Default-Release" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:142 +#: apt.conf.5.xml:153 msgid "" "Default release to install packages from if more than one version available. " "Contains release name, codename or release version. Examples: 'stable', " @@ -4501,24 +4574,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:146 +#: apt.conf.5.xml:157 msgid "Ignore-Hold" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:147 +#: apt.conf.5.xml:158 msgid "" "Ignore Held packages; This global option causes the problem resolver to " "ignore held packages in its decision making." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:151 +#: apt.conf.5.xml:162 msgid "Clean-Installed" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:152 +#: apt.conf.5.xml:163 msgid "" "Defaults to on. When turned on the autoclean feature will remove any " "packages which can no longer be downloaded from the cache. If turned off " @@ -4527,12 +4600,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:158 +#: apt.conf.5.xml:169 msgid "Immediate-Configure" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:159 +#: apt.conf.5.xml:170 msgid "" "Defaults to on which will cause APT to install essential and important " "packages as fast as possible in the install/upgrade operation. This is done " @@ -4565,12 +4638,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:181 +#: apt.conf.5.xml:192 msgid "Force-LoopBreak" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:182 +#: apt.conf.5.xml:193 msgid "" "Never Enable this option unless you -really- know what you are doing. It " "permits APT to temporarily remove an essential package to break a Conflicts/" @@ -4581,82 +4654,82 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:190 +#: apt.conf.5.xml:201 msgid "Cache-Limit" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:191 +#: apt.conf.5.xml:202 msgid "" "APT uses a fixed size memory mapped cache file to store the 'available' " "information. This sets the size of that cache (in bytes)." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:195 +#: apt.conf.5.xml:206 msgid "Build-Essential" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:196 +#: apt.conf.5.xml:207 msgid "Defines which package(s) are considered essential build dependencies." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:199 +#: apt.conf.5.xml:210 msgid "Get" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:200 +#: apt.conf.5.xml:211 msgid "" "The Get subsection controls the &apt-get; tool, please see its documentation " "for more information about the options here." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:204 +#: apt.conf.5.xml:215 msgid "Cache" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:205 +#: apt.conf.5.xml:216 msgid "" "The Cache subsection controls the &apt-cache; tool, please see its " "documentation for more information about the options here." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:209 +#: apt.conf.5.xml:220 msgid "CDROM" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:210 +#: apt.conf.5.xml:221 msgid "" "The CDROM subsection controls the &apt-cdrom; tool, please see its " "documentation for more information about the options here." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:216 +#: apt.conf.5.xml:227 msgid "The Acquire Group" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:221 +#: apt.conf.5.xml:232 msgid "PDiffs" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:222 +#: apt.conf.5.xml:233 msgid "" "Try to download deltas called <literal>PDiffs</literal> for Packages or " "Sources files instead of downloading whole ones. True by default." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:225 +#: apt.conf.5.xml:236 msgid "" "Two sub-options to limit the use of PDiffs are also available: With " "<literal>FileLimit</literal> can be specified how many PDiff files are " @@ -4667,12 +4740,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:234 +#: apt.conf.5.xml:245 msgid "Queue-Mode" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:235 +#: apt.conf.5.xml:246 msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</" "literal> or <literal>access</literal> which determines how APT parallelizes " @@ -4682,36 +4755,36 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:242 +#: apt.conf.5.xml:253 msgid "Retries" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:243 +#: apt.conf.5.xml:254 msgid "" "Number of retries to perform. If this is non-zero APT will retry failed " "files the given number of times." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:247 +#: apt.conf.5.xml:258 msgid "Source-Symlinks" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:248 +#: apt.conf.5.xml:259 msgid "" "Use symlinks for source archives. If set to true then source archives will " "be symlinked when possible instead of copying. True is the default." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:252 sources.list.5.xml:139 +#: apt.conf.5.xml:263 sources.list.5.xml:139 msgid "http" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:253 +#: apt.conf.5.xml:264 msgid "" "HTTP URIs; http::Proxy is the default http proxy to use. It is in the " "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per " @@ -4722,7 +4795,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:261 +#: apt.conf.5.xml:272 msgid "" "Three settings are provided for cache control with HTTP/1.1 compliant proxy " "caches. <literal>No-Cache</literal> tells the proxy to not use its cached " @@ -4736,7 +4809,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:271 apt.conf.5.xml:335 +#: apt.conf.5.xml:282 apt.conf.5.xml:346 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method, this applies to all things including connection timeout and data " @@ -4744,7 +4817,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:274 +#: apt.conf.5.xml:285 msgid "" "One setting is provided to control the pipeline depth in cases where the " "remote server is not RFC conforming or buggy (such as Squid 2.0.2). " @@ -4756,7 +4829,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:282 +#: apt.conf.5.xml:293 msgid "" "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</" "literal> which accepts integer values in kilobyte. The default value is 0 " @@ -4766,7 +4839,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:287 +#: apt.conf.5.xml:298 msgid "" "<literal>Acquire::http::User-Agent</literal> can be used to set a different " "User-Agent for the http download method as some proxies allow access for " @@ -4774,12 +4847,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:293 +#: apt.conf.5.xml:304 msgid "https" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:294 +#: apt.conf.5.xml:305 msgid "" "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy " "options are the same as for <literal>http</literal> method and will also " @@ -4789,7 +4862,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:300 +#: apt.conf.5.xml:311 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is " @@ -4810,12 +4883,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:318 sources.list.5.xml:150 +#: apt.conf.5.xml:329 sources.list.5.xml:150 msgid "ftp" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:319 +#: apt.conf.5.xml:330 msgid "" "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard " "form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host " @@ -4834,7 +4907,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:338 +#: apt.conf.5.xml:349 msgid "" "Several settings are provided to control passive mode. Generally it is safe " "to leave passive mode on, it works in nearly every environment. However " @@ -4844,7 +4917,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:345 +#: apt.conf.5.xml:356 msgid "" "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</" "envar> environment variable to a http url - see the discussion of the http " @@ -4853,7 +4926,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:350 +#: apt.conf.5.xml:361 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@ -4863,18 +4936,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:357 sources.list.5.xml:132 +#: apt.conf.5.xml:368 sources.list.5.xml:132 msgid "cdrom" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:363 +#: apt.conf.5.xml:374 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:358 +#: apt.conf.5.xml:369 msgid "" "CDROM URIs; the only setting for CDROM URIs is the mount point, " "<literal>cdrom::Mount</literal> which must be the mount point for the CDROM " @@ -4887,12 +4960,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:368 +#: apt.conf.5.xml:379 msgid "gpgv" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:369 +#: apt.conf.5.xml:380 msgid "" "GPGV URIs; the only option for GPGV URIs is the option to pass additional " "parameters to gpgv. <literal>gpgv::Options</literal> Additional options " @@ -4900,18 +4973,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:374 +#: apt.conf.5.xml:385 msgid "CompressionTypes" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:380 +#: apt.conf.5.xml:391 #, no-wrap msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:375 +#: apt.conf.5.xml:386 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@ -4923,19 +4996,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:385 +#: apt.conf.5.xml:396 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:388 +#: apt.conf.5.xml:399 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:381 +#: apt.conf.5.xml:392 msgid "" "Also the <literal>Order</literal> subgroup can be used to define in which " "order the acquire system will try to download the compressed files. The " @@ -4952,13 +5025,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:392 +#: apt.conf.5.xml:403 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:390 +#: apt.conf.5.xml:401 msgid "" "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" "replaceable></literal> will be checked: If this setting exists the method " @@ -4973,7 +5046,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:397 +#: apt.conf.5.xml:408 msgid "" "While it is possible to add an empty compression type to the order list, but " "APT in its current version doesn't understand it correctly and will display " @@ -4983,12 +5056,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:403 +#: apt.conf.5.xml:414 msgid "Languages" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:404 +#: apt.conf.5.xml:415 msgid "" "The Languages subsection controls which <filename>Translation</filename> " "files are downloaded and in which order APT tries to display the Description-" @@ -5001,13 +5074,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting> -#: apt.conf.5.xml:420 +#: apt.conf.5.xml:431 #, no-wrap msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:410 +#: apt.conf.5.xml:421 msgid "" "The default list includes \"environment\" and \"en\". " "\"<literal>environment</literal>\" has a special meaning here: It will be " @@ -5030,19 +5103,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:217 +#: apt.conf.5.xml:228 msgid "" "The <literal>Acquire</literal> group of options controls the download of " "packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:427 +#: apt.conf.5.xml:438 msgid "Directories" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:429 +#: apt.conf.5.xml:440 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@ -5054,7 +5127,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:436 +#: apt.conf.5.xml:447 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@ -5067,7 +5140,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:445 +#: apt.conf.5.xml:456 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@ -5077,7 +5150,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:451 +#: apt.conf.5.xml:462 msgid "" "The <literal>Dir::Parts</literal> setting reads in all the config fragments " "in lexical order from the directory specified. After this is done then the " @@ -5085,7 +5158,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:455 +#: apt.conf.5.xml:466 msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" "Bin::Methods</literal> specifies the location of the method handlers and " @@ -5096,7 +5169,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:463 +#: apt.conf.5.xml:474 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@ -5109,12 +5182,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:476 +#: apt.conf.5.xml:487 msgid "APT in DSelect" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:478 +#: apt.conf.5.xml:489 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behaviour. These are in the <literal>DSelect</literal> " @@ -5122,12 +5195,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:482 +#: apt.conf.5.xml:493 msgid "Clean" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:483 +#: apt.conf.5.xml:494 msgid "" "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto " "and never. always and prompt will remove all packages from the cache after " @@ -5138,50 +5211,50 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:492 +#: apt.conf.5.xml:503 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the install phase." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:496 +#: apt.conf.5.xml:507 msgid "Updateoptions" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:497 +#: apt.conf.5.xml:508 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the update phase." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:501 +#: apt.conf.5.xml:512 msgid "PromptAfterUpdate" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:502 +#: apt.conf.5.xml:513 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:508 +#: apt.conf.5.xml:519 msgid "How APT calls dpkg" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:509 +#: apt.conf.5.xml:520 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:514 +#: apt.conf.5.xml:525 msgid "" "This is a list of options to pass to dpkg. The options must be specified " "using the list notation and each list item is passed as a single argument to " @@ -5189,17 +5262,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:519 +#: apt.conf.5.xml:530 msgid "Pre-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:519 +#: apt.conf.5.xml:530 msgid "Post-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:520 +#: apt.conf.5.xml:531 msgid "" "This is a list of shell commands to run before/after invoking &dpkg;. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -5208,12 +5281,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:526 +#: apt.conf.5.xml:537 msgid "Pre-Install-Pkgs" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:527 +#: apt.conf.5.xml:538 msgid "" "This is a list of shell commands to run before invoking dpkg. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -5223,7 +5296,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:533 +#: apt.conf.5.xml:544 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@ -5233,36 +5306,36 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:540 +#: apt.conf.5.xml:551 msgid "Run-Directory" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:541 +#: apt.conf.5.xml:552 msgid "" "APT chdirs to this directory before invoking dpkg, the default is <filename>/" "</filename>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:545 +#: apt.conf.5.xml:556 msgid "Build-options" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:546 +#: apt.conf.5.xml:557 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages, the " "default is to disable signing and produce all binaries." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt.conf.5.xml:551 +#: apt.conf.5.xml:562 msgid "dpkg trigger usage (and related options)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:552 +#: apt.conf.5.xml:563 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 " @@ -5277,7 +5350,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:567 +#: apt.conf.5.xml:578 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@ -5287,7 +5360,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:561 +#: apt.conf.5.xml:572 msgid "" "Note that it is not guaranteed that APT will support these options or that " "these options will not cause (big) trouble in the future. If you have " @@ -5301,12 +5374,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:573 +#: apt.conf.5.xml:584 msgid "DPkg::NoTriggers" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:574 +#: apt.conf.5.xml:585 msgid "" "Add the no triggers flag to all dpkg calls (except the ConfigurePending " "call). See &dpkg; if you are interested in what this actually means. In " @@ -5318,12 +5391,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:581 +#: apt.conf.5.xml:592 msgid "PackageManager::Configure" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:582 +#: apt.conf.5.xml:593 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@ -5339,12 +5412,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:592 +#: apt.conf.5.xml:603 msgid "DPkg::ConfigurePending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:593 +#: apt.conf.5.xml:604 msgid "" "If this option is set apt will call <command>dpkg --configure --pending</" "command> to let dpkg handle all required configurations and triggers. This " @@ -5355,12 +5428,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:599 +#: apt.conf.5.xml:610 msgid "DPkg::TriggersPending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:600 +#: apt.conf.5.xml:611 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@ -5370,12 +5443,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:605 +#: apt.conf.5.xml:616 msgid "PackageManager::UnpackAll" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:606 +#: apt.conf.5.xml:617 msgid "" "As the configuration can be deferred to be done at the end by dpkg it can be " "tried to order the unpack series only by critical needs, e.g. by Pre-" @@ -5387,12 +5460,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:613 +#: apt.conf.5.xml:624 msgid "OrderList::Score::Immediate" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:621 +#: apt.conf.5.xml:632 #, no-wrap msgid "" "OrderList::Score {\n" @@ -5404,7 +5477,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:614 +#: apt.conf.5.xml:625 msgid "" "Essential packages (and there dependencies) should be configured immediately " "after unpacking. It will be a good idea to do this quite early in the " @@ -5418,12 +5491,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:634 +#: apt.conf.5.xml:645 msgid "Periodic and Archives options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:635 +#: apt.conf.5.xml:646 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@ -5432,12 +5505,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:643 +#: apt.conf.5.xml:654 msgid "Debug options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:645 +#: apt.conf.5.xml:656 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -5448,7 +5521,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:656 +#: apt.conf.5.xml:667 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@ -5456,7 +5529,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:664 +#: apt.conf.5.xml:675 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@ -5464,7 +5537,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:673 +#: apt.conf.5.xml:684 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -5474,120 +5547,120 @@ msgstr "" #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:681 +#: apt.conf.5.xml:692 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CDROM IDs." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:691 +#: apt.conf.5.xml:702 msgid "A full list of debugging options to apt follows." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:696 +#: apt.conf.5.xml:707 #, fuzzy msgid "<literal>Debug::Acquire::cdrom</literal>" msgstr "a linha <literal>Archive:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:700 +#: apt.conf.5.xml:711 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:707 +#: apt.conf.5.xml:718 #, fuzzy msgid "<literal>Debug::Acquire::ftp</literal>" msgstr "a linha <literal>Archive:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:711 +#: apt.conf.5.xml:722 msgid "Print information related to downloading packages using FTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:718 +#: apt.conf.5.xml:729 #, fuzzy msgid "<literal>Debug::Acquire::http</literal>" msgstr "a linha <literal>Archive:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:722 +#: apt.conf.5.xml:733 msgid "Print information related to downloading packages using HTTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:729 +#: apt.conf.5.xml:740 #, fuzzy msgid "<literal>Debug::Acquire::https</literal>" msgstr "a linha <literal>Archive:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:733 +#: apt.conf.5.xml:744 msgid "Print information related to downloading packages using HTTPS." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:740 +#: apt.conf.5.xml:751 #, fuzzy msgid "<literal>Debug::Acquire::gpgv</literal>" msgstr "a linha <literal>Archive:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:744 +#: apt.conf.5.xml:755 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:751 +#: apt.conf.5.xml:762 #, fuzzy msgid "<literal>Debug::aptcdrom</literal>" msgstr "a linha <literal>Version:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:755 +#: apt.conf.5.xml:766 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:762 +#: apt.conf.5.xml:773 #, fuzzy msgid "<literal>Debug::BuildDeps</literal>" msgstr "a linha <literal>Label:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:765 +#: apt.conf.5.xml:776 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:772 +#: apt.conf.5.xml:783 #, fuzzy msgid "<literal>Debug::Hashes</literal>" msgstr "a linha <literal>Label:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:775 +#: apt.conf.5.xml:786 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:782 +#: apt.conf.5.xml:793 #, fuzzy msgid "<literal>Debug::IdentCDROM</literal>" msgstr "a linha <literal>Label:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:785 +#: apt.conf.5.xml:796 msgid "" "Do not include information from <literal>statfs</literal>, namely the number " "of used and free blocks on the CD-ROM filesystem, when generating an ID for " @@ -5595,99 +5668,99 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:793 +#: apt.conf.5.xml:804 #, fuzzy msgid "<literal>Debug::NoLocking</literal>" msgstr "a linha <literal>Origin:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:796 +#: apt.conf.5.xml:807 msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:804 +#: apt.conf.5.xml:815 #, fuzzy msgid "<literal>Debug::pkgAcquire</literal>" msgstr "a linha <literal>Archive:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:808 +#: apt.conf.5.xml:819 msgid "Log when items are added to or removed from the global download queue." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:815 +#: apt.conf.5.xml:826 #, fuzzy msgid "<literal>Debug::pkgAcquire::Auth</literal>" msgstr "a linha <literal>Archive:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:818 +#: apt.conf.5.xml:829 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:825 +#: apt.conf.5.xml:836 #, fuzzy msgid "<literal>Debug::pkgAcquire::Diffs</literal>" msgstr "a linha <literal>Archive:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:828 +#: apt.conf.5.xml:839 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:836 +#: apt.conf.5.xml:847 #, fuzzy msgid "<literal>Debug::pkgAcquire::RRed</literal>" msgstr "a linha <literal>Archive:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:840 +#: apt.conf.5.xml:851 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:847 +#: apt.conf.5.xml:858 #, fuzzy msgid "<literal>Debug::pkgAcquire::Worker</literal>" msgstr "a linha <literal>Archive:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:851 +#: apt.conf.5.xml:862 msgid "" "Log all interactions with the sub-processes that actually perform downloads." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:858 +#: apt.conf.5.xml:869 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:862 +#: apt.conf.5.xml:873 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:869 +#: apt.conf.5.xml:880 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:872 +#: apt.conf.5.xml:883 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@ -5697,12 +5770,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:883 +#: apt.conf.5.xml:894 msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:886 +#: apt.conf.5.xml:897 msgid "" "Generate debug messages describing which package is marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@ -5719,96 +5792,96 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:905 +#: apt.conf.5.xml:916 #, fuzzy msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "a linha <literal>Version:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:908 +#: apt.conf.5.xml:919 msgid "Dump the default configuration to standard error on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:915 +#: apt.conf.5.xml:926 #, fuzzy msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "a linha <literal>Package:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:918 +#: apt.conf.5.xml:929 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:926 +#: apt.conf.5.xml:937 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:929 +#: apt.conf.5.xml:940 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:936 +#: apt.conf.5.xml:947 #, fuzzy msgid "<literal>Debug::pkgOrderList</literal>" msgstr "a linha <literal>Origin:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:940 +#: apt.conf.5.xml:951 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:948 +#: apt.conf.5.xml:959 #, fuzzy msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "a linha <literal>Package:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:952 +#: apt.conf.5.xml:963 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:959 +#: apt.conf.5.xml:970 #, fuzzy msgid "<literal>Debug::pkgPolicy</literal>" msgstr "a linha <literal>Label:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:963 +#: apt.conf.5.xml:974 msgid "Output the priority of each package list on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:969 +#: apt.conf.5.xml:980 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:973 +#: apt.conf.5.xml:984 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:981 +#: apt.conf.5.xml:992 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:984 +#: apt.conf.5.xml:995 msgid "" "Display a list of all installed packages with their calculated score used by " "the pkgProblemResolver. The description of the package is the same as " @@ -5816,33 +5889,33 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:992 +#: apt.conf.5.xml:1003 #, fuzzy msgid "<literal>Debug::sourceList</literal>" msgstr "a linha <literal>Version:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:996 +#: apt.conf.5.xml:1007 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1019 +#: apt.conf.5.xml:1030 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt.conf.5.xml:1026 +#: apt.conf.5.xml:1037 msgid "&file-aptconf;" msgstr "" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1031 +#: apt.conf.5.xml:1042 #, fuzzy msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;" @@ -5917,14 +5990,25 @@ msgstr "" "antes no arquivo &sources-list; . O arquivo de preferências do APT não afeta " "a escolha da instância." -#. type: Content of: <refentry><refsect1><refsect2><title> +#. type: Content of: <refentry><refsect1><para> #: apt_preferences.5.xml:56 +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." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt_preferences.5.xml:63 #, fuzzy msgid "APT's Default Priority Assignments" msgstr "Atribuições de Prioridade Padrão do APT" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:71 +#: apt_preferences.5.xml:78 #, fuzzy, no-wrap msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n" msgstr "" @@ -5932,7 +6016,7 @@ msgstr "" "<command>apt-get install -t testing <replaceable>algum-pacote</replaceable></command>\n" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:74 +#: apt_preferences.5.xml:81 #, fuzzy, no-wrap msgid "APT::Default-Release \"stable\";\n" msgstr "" @@ -5940,7 +6024,7 @@ msgstr "" "APT::Default-Release \"stable\";\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:58 +#: apt_preferences.5.xml:65 #, fuzzy msgid "" "If there is no preferences file or if there is no entry in the file that " @@ -5965,25 +6049,25 @@ msgstr "" "etc/apt/apt.conf</filename>. Por exemplo," #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:83 +#: apt_preferences.5.xml:90 #, fuzzy msgid "priority 100" msgstr "prioridade 100" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:84 +#: apt_preferences.5.xml:91 #, fuzzy msgid "to the version that is already installed (if any)." msgstr "para a instância que já esteja instalada (caso exista)." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:88 +#: apt_preferences.5.xml:95 #, fuzzy msgid "priority 500" msgstr "prioridade 500" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:89 +#: apt_preferences.5.xml:96 #, fuzzy msgid "" "to the versions that are not installed and do not belong to the target " @@ -5992,13 +6076,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:93 +#: apt_preferences.5.xml:100 #, fuzzy msgid "priority 990" msgstr "prioridade 990" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:94 +#: apt_preferences.5.xml:101 #, fuzzy msgid "" "to the versions that are not installed and belong to the target release." @@ -6006,7 +6090,7 @@ msgstr "" "para as instâncias que não estejam instaladas e pertençam a versão alvo." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:78 +#: apt_preferences.5.xml:85 #, fuzzy msgid "" "If the target release has been specified then APT uses the following " @@ -6018,7 +6102,7 @@ msgstr "" "Atribuirá :" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:99 +#: apt_preferences.5.xml:106 #, fuzzy msgid "" "If the target release has not been specified then APT simply assigns " @@ -6030,7 +6114,7 @@ msgstr "" "prioridade 500 para todas as instâncias de pacotes não instaladas." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:103 +#: apt_preferences.5.xml:110 #, fuzzy msgid "" "APT then applies the following rules, listed in order of precedence, to " @@ -6040,7 +6124,7 @@ msgstr "" "determinar qual instância de um pacote instalar." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:106 +#: apt_preferences.5.xml:113 #, fuzzy msgid "" "Never downgrade unless the priority of an available version exceeds 1000. " @@ -6057,13 +6141,13 @@ msgstr "" "\"downgrade\" pode ser arriscado.)" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:112 +#: apt_preferences.5.xml:119 #, 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:113 +#: apt_preferences.5.xml:120 #, fuzzy msgid "" "If two or more versions have the same priority, install the most recent one " @@ -6073,7 +6157,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:116 +#: apt_preferences.5.xml:123 #, fuzzy msgid "" "If two or more versions have the same priority and version number but either " @@ -6085,7 +6169,7 @@ msgstr "" "<literal>--reinstall</literal> seja fornecida, instala aquela desinstalada." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:122 +#: apt_preferences.5.xml:129 #, fuzzy msgid "" "In a typical situation, the installed version of a package (priority 100) " @@ -6102,7 +6186,7 @@ msgstr "" "forem executados." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:129 +#: apt_preferences.5.xml:136 #, fuzzy msgid "" "More rarely, the installed version of a package is <emphasis>more</emphasis> " @@ -6117,7 +6201,7 @@ msgstr "" "upgrade</command> forem executados." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:134 +#: apt_preferences.5.xml:141 #, fuzzy msgid "" "Sometimes the installed version of a package is more recent than the version " @@ -6137,13 +6221,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:143 +#: apt_preferences.5.xml:150 #, 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:145 +#: apt_preferences.5.xml:152 #, fuzzy msgid "" "The APT preferences file allows the system administrator to control the " @@ -6157,7 +6241,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:151 +#: apt_preferences.5.xml:158 #, fuzzy msgid "" "The specific form assigns a priority (a \"Pin-Priority\") to one or more " @@ -6173,7 +6257,7 @@ msgstr "" "com \"<literal>5.8</literal>\"." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:158 +#: apt_preferences.5.xml:165 #, fuzzy, no-wrap msgid "" "Package: perl\n" @@ -6186,7 +6270,7 @@ msgstr "" "Pin-Priority: 1001\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:164 +#: apt_preferences.5.xml:171 #, fuzzy msgid "" "The general form assigns a priority to all of the package versions in a " @@ -6202,7 +6286,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:170 +#: apt_preferences.5.xml:177 #, fuzzy msgid "" "This general-form entry in the APT preferences file applies only to groups " @@ -6215,7 +6299,7 @@ msgstr "" "no site local." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:175 +#: apt_preferences.5.xml:182 #, fuzzy, no-wrap msgid "" "Package: *\n" @@ -6228,7 +6312,7 @@ msgstr "" "Pin-Priority: 999\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:180 +#: apt_preferences.5.xml:187 #, fuzzy msgid "" "A note of caution: the keyword used here is \"<literal>origin</literal>\". " @@ -6245,7 +6329,7 @@ msgstr "" "como \"Debian\" ou \"Ximian\"." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:186 +#: apt_preferences.5.xml:193 #, fuzzy msgid "" "The following record assigns a low priority to all package versions " @@ -6257,7 +6341,7 @@ msgstr "" "\"<literal>unstable</literal>\"." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:190 +#: apt_preferences.5.xml:197 #, fuzzy, no-wrap msgid "" "Package: *\n" @@ -6270,7 +6354,7 @@ msgstr "" "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:195 +#: apt_preferences.5.xml:202 #, fuzzy msgid "" "The following record assigns a high priority to all package versions " @@ -6282,7 +6366,7 @@ msgstr "" "\"<literal>unstable</literal>\"." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:199 +#: apt_preferences.5.xml:206 #, fuzzy, no-wrap msgid "" "Package: *\n" @@ -6295,7 +6379,7 @@ msgstr "" "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:204 +#: apt_preferences.5.xml:211 #, fuzzy msgid "" "The following record assigns a high priority to all package versions " @@ -6308,7 +6392,7 @@ msgstr "" "literal>\"." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:209 +#: apt_preferences.5.xml:216 #, fuzzy, no-wrap msgid "" "Package: *\n" @@ -6321,19 +6405,19 @@ msgstr "" "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:220 +#: apt_preferences.5.xml:227 #, 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:228 +#: apt_preferences.5.xml:235 #, fuzzy msgid "P > 1000" msgstr "P > 1000" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:229 +#: apt_preferences.5.xml:236 #, fuzzy msgid "" "causes a version to be installed even if this constitutes a downgrade of the " @@ -6343,13 +6427,13 @@ msgstr "" "dowgrade do pacote" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:233 +#: apt_preferences.5.xml:240 #, fuzzy msgid "990 < P <=1000" msgstr "990 < P <=1000" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:234 +#: apt_preferences.5.xml:241 #, fuzzy msgid "" "causes a version to be installed even if it does not come from the target " @@ -6359,13 +6443,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:239 +#: apt_preferences.5.xml:246 #, fuzzy msgid "500 < P <=990" msgstr "500 < P <=990" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:240 +#: apt_preferences.5.xml:247 #, fuzzy msgid "" "causes a version to be installed unless there is a version available " @@ -6375,13 +6459,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:245 +#: apt_preferences.5.xml:252 #, fuzzy msgid "100 < P <=500" msgstr "100 < P <=500" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:246 +#: apt_preferences.5.xml:253 #, fuzzy msgid "" "causes a version to be installed unless there is a version available " @@ -6392,13 +6476,13 @@ msgstr "" "seja mais recente" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:251 +#: apt_preferences.5.xml:258 #, fuzzy msgid "0 < P <=100" msgstr "0 <= P <=100" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:252 +#: apt_preferences.5.xml:259 #, fuzzy msgid "" "causes a version to be installed only if there is no installed version of " @@ -6408,19 +6492,19 @@ msgstr "" "instalada do pacote" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:256 +#: apt_preferences.5.xml:263 #, fuzzy msgid "P < 0" msgstr "P < 0" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:257 +#: apt_preferences.5.xml:264 #, 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:223 +#: apt_preferences.5.xml:230 #, fuzzy msgid "" "Priorities (P) assigned in the APT preferences file must be positive or " @@ -6432,7 +6516,7 @@ msgstr "" "seguir (a grosso modo):" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:262 +#: apt_preferences.5.xml:269 #, fuzzy msgid "" "If any specific-form records match an available package version then the " @@ -6448,7 +6532,7 @@ msgstr "" "determinará a prioridade da versão do pacote." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:268 +#: apt_preferences.5.xml:275 #, fuzzy msgid "" "For example, suppose the APT preferences file contains the three records " @@ -6458,7 +6542,7 @@ msgstr "" "registros apresentados anteriormente :" #. type: Content of: <refentry><refsect1><refsect2><programlisting> -#: apt_preferences.5.xml:272 +#: apt_preferences.5.xml:279 #, fuzzy, no-wrap msgid "" "Package: perl\n" @@ -6487,12 +6571,12 @@ msgstr "" "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:285 +#: apt_preferences.5.xml:292 msgid "Then:" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:287 +#: apt_preferences.5.xml:294 #, fuzzy msgid "" "The most recent available version of the <literal>perl</literal> package " @@ -6508,7 +6592,7 @@ msgstr "" "será feito um downgrade do <literal>perl</literal>." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:292 +#: apt_preferences.5.xml:299 #, fuzzy msgid "" "A version of any package other than <literal>perl</literal> that is " @@ -6520,7 +6604,7 @@ msgstr "" "mesmo versões pertencentes a versão alvo." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:296 +#: apt_preferences.5.xml:303 #, fuzzy msgid "" "A version of a package whose origin is not the local system but some other " @@ -6535,13 +6619,13 @@ msgstr "" "instalada." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:306 +#: apt_preferences.5.xml:313 #, 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:308 +#: apt_preferences.5.xml:315 #, fuzzy msgid "" "The locations listed in the &sources-list; file should provide " @@ -6553,31 +6637,31 @@ msgstr "" "os pacotes disponíveis nessas localidades." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:320 +#: apt_preferences.5.xml:327 #, 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:321 +#: apt_preferences.5.xml:328 #, 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:324 apt_preferences.5.xml:374 +#: apt_preferences.5.xml:331 apt_preferences.5.xml:381 #, 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:325 +#: apt_preferences.5.xml:332 #, 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:312 +#: apt_preferences.5.xml:319 #, fuzzy msgid "" "The <filename>Packages</filename> file is normally found in the directory " @@ -6599,13 +6683,13 @@ msgstr "" "do APT :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:341 +#: apt_preferences.5.xml:348 #, 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:342 +#: apt_preferences.5.xml:349 #, fuzzy msgid "" "names the archive to which all the packages in the directory tree belong. " @@ -6623,7 +6707,7 @@ msgstr "" "requerer a linha :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:352 +#: apt_preferences.5.xml:359 #, fuzzy, no-wrap msgid "Pin: release a=stable\n" msgstr "" @@ -6631,13 +6715,13 @@ msgstr "" "Pin: release a=stable\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:358 +#: apt_preferences.5.xml:365 #, 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:359 +#: apt_preferences.5.xml:366 #, fuzzy msgid "" "names the codename to which all the packages in the directory tree belong. " @@ -6654,13 +6738,13 @@ msgstr "" "requerer a linha :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:368 +#: apt_preferences.5.xml:375 #, no-wrap msgid "Pin: release n=squeeze\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:375 +#: apt_preferences.5.xml:382 #, fuzzy msgid "" "names the release version. For example, the packages in the tree might " @@ -6677,7 +6761,7 @@ msgstr "" "das linhas a seguir." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:384 +#: apt_preferences.5.xml:391 #, fuzzy, no-wrap msgid "" "Pin: release v=3.0\n" @@ -6690,13 +6774,13 @@ msgstr "" "Pin: release 3.0\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:393 +#: apt_preferences.5.xml:400 #, 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:394 +#: apt_preferences.5.xml:401 #, fuzzy msgid "" "names the licensing component associated with the packages in the directory " @@ -6715,7 +6799,7 @@ msgstr "" "requerer a linha :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:403 +#: apt_preferences.5.xml:410 #, fuzzy, no-wrap msgid "Pin: release c=main\n" msgstr "" @@ -6723,13 +6807,13 @@ msgstr "" "Pin: release c=main\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:409 +#: apt_preferences.5.xml:416 #, 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:410 +#: apt_preferences.5.xml:417 #, fuzzy msgid "" "names the originator of the packages in the directory tree of the " @@ -6743,7 +6827,7 @@ msgstr "" "requerer a linha :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:416 +#: apt_preferences.5.xml:423 #, fuzzy, no-wrap msgid "Pin: release o=Debian\n" msgstr "" @@ -6751,13 +6835,13 @@ msgstr "" "Pin: release o=Debian\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:422 +#: apt_preferences.5.xml:429 #, 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:423 +#: apt_preferences.5.xml:430 #, fuzzy msgid "" "names the label of the packages in the directory tree of the " @@ -6770,7 +6854,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:429 +#: apt_preferences.5.xml:436 #, fuzzy, no-wrap msgid "Pin: release l=Debian\n" msgstr "" @@ -6778,7 +6862,7 @@ msgstr "" "Pin: release l=Debian\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:330 +#: apt_preferences.5.xml:337 #, fuzzy msgid "" "The <filename>Release</filename> file is normally found in the directory " @@ -6801,7 +6885,7 @@ msgstr "" "do APT :" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:436 +#: apt_preferences.5.xml:443 #, fuzzy msgid "" "All of the <filename>Packages</filename> and <filename>Release</filename> " @@ -6827,13 +6911,13 @@ msgstr "" "<literal>unstable</literal>." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:449 +#: apt_preferences.5.xml:456 #, 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:451 +#: apt_preferences.5.xml:458 #, fuzzy msgid "" "Each record in the APT preferences file can optionally begin with one or " @@ -6845,7 +6929,7 @@ msgstr "" "</literal>. Isto oferece um local para inserir comentários." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:455 +#: apt_preferences.5.xml:462 #, fuzzy msgid "" "The <literal>Pin-Priority:</literal> line in each APT preferences record is " @@ -6859,13 +6943,13 @@ msgstr "" "release ...</literal>." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:464 +#: apt_preferences.5.xml:471 #, fuzzy msgid "Tracking Stable" msgstr "Acompanhando a Stable" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:472 +#: apt_preferences.5.xml:479 #, fuzzy, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated\n" @@ -6890,7 +6974,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:466 +#: apt_preferences.5.xml:473 #, fuzzy msgid "" "The following APT preferences file will cause APT to assign a priority " @@ -6906,8 +6990,8 @@ msgstr "" "outras distribuições <literal>Debian</literal>." #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:489 apt_preferences.5.xml:535 -#: apt_preferences.5.xml:593 +#: apt_preferences.5.xml:496 apt_preferences.5.xml:542 +#: apt_preferences.5.xml:600 #, fuzzy, no-wrap msgid "" "apt-get install <replaceable>package-name</replaceable>\n" @@ -6920,7 +7004,7 @@ msgstr "" "apt-get dist-upgrade\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:484 +#: apt_preferences.5.xml:491 #, fuzzy msgid "" "With a suitable &sources-list; file and the above preferences file, any of " @@ -6933,7 +7017,7 @@ msgstr "" "ulítma(s) versão(ôes) <literal>stable</literal>." #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:501 +#: apt_preferences.5.xml:508 #, fuzzy, no-wrap msgid "apt-get install <replaceable>package</replaceable>/testing\n" msgstr "" @@ -6941,7 +7025,7 @@ msgstr "" "apt-get install <replaceable>pacote</replaceable>/testing\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:495 +#: apt_preferences.5.xml:502 #, fuzzy msgid "" "The following command will cause APT to upgrade the specified package to the " @@ -6954,13 +7038,13 @@ msgstr "" "atualizado novamente a menos que esse comando seja executado novamente." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:507 +#: apt_preferences.5.xml:514 #, fuzzy msgid "Tracking Testing or Unstable" msgstr "Acompanhando a Testing" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:516 +#: apt_preferences.5.xml:523 #, fuzzy, no-wrap msgid "" "Package: *\n" @@ -6989,7 +7073,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:509 +#: apt_preferences.5.xml:516 #, fuzzy msgid "" "The following APT preferences file will cause APT to assign a high priority " @@ -7006,7 +7090,7 @@ msgstr "" "versões de pacotes de outras distribuições <literal>Debian</literal>." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:530 +#: apt_preferences.5.xml:537 #, fuzzy msgid "" "With a suitable &sources-list; file and the above preferences file, any of " @@ -7019,7 +7103,7 @@ msgstr "" "(s) última(s) versão(ões) <literal>testing</literal>." #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:550 +#: apt_preferences.5.xml:557 #, fuzzy, no-wrap msgid "apt-get install <replaceable>package</replaceable>/unstable\n" msgstr "" @@ -7027,7 +7111,7 @@ msgstr "" "apt-get install <replaceable>pacote</replaceable>/unstable\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:541 +#: apt_preferences.5.xml:548 #, fuzzy msgid "" "The following command will cause APT to upgrade the specified package to the " @@ -7047,12 +7131,12 @@ msgstr "" "recente que a versão instalada." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:557 +#: apt_preferences.5.xml:564 msgid "Tracking the evolution of a codename release" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:571 +#: apt_preferences.5.xml:578 #, fuzzy, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated package versions\n" @@ -7082,7 +7166,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:559 +#: apt_preferences.5.xml:566 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 " @@ -7097,7 +7181,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:588 +#: apt_preferences.5.xml:595 #, fuzzy msgid "" "With a suitable &sources-list; file and the above preferences file, any of " @@ -7110,7 +7194,7 @@ msgstr "" "ulítma(s) versão(ôes) <literal>stable</literal>." #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:608 +#: apt_preferences.5.xml:615 #, fuzzy, no-wrap msgid "apt-get install <replaceable>package</replaceable>/sid\n" msgstr "" @@ -7118,7 +7202,7 @@ msgstr "" "apt-get install <replaceable>pacote</replaceable>/testing\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:599 +#: apt_preferences.5.xml:606 #, fuzzy msgid "" "The following command will cause APT to upgrade the specified package to the " @@ -7138,13 +7222,13 @@ msgstr "" "recente que a versão instalada." #. type: Content of: <refentry><refsect1><variablelist> -#: apt_preferences.5.xml:617 +#: apt_preferences.5.xml:624 #, fuzzy msgid "&file-preferences;" msgstr "apt_preferences" #. type: Content of: <refentry><refsect1><para> -#: apt_preferences.5.xml:623 +#: apt_preferences.5.xml:630 #, fuzzy msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;" msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;" diff --git a/doc/po4a.conf b/doc/po4a.conf index fae80d690..25c314640 100644 --- a/doc/po4a.conf +++ b/doc/po4a.conf @@ -7,32 +7,19 @@ # define source file and translated file (one file per line) [type: man] apt.8 $lang:$lang/apt.$lang.8 [type: entity] apt.ent $lang:$lang/apt.ent -[type: docbook] apt-cache.8.xml $lang:$lang/apt-cache.$lang.8.xml \ - add_$lang:$lang/addendum/xml_$lang.add -[type: docbook] apt-cdrom.8.xml $lang:$lang/apt-cdrom.$lang.8.xml \ - add_$lang:$lang/addendum/xml_$lang.add -[type: docbook] apt-config.8.xml $lang:$lang/apt-config.$lang.8.xml \ - add_$lang:$lang/addendum/xml_$lang.add -[type: docbook] apt-extracttemplates.1.xml $lang:$lang/apt-extracttemplates.$lang.1.xml \ - add_$lang:$lang/addendum/xml_$lang.add -[type: docbook] apt-ftparchive.1.xml $lang:$lang/apt-ftparchive.$lang.1.xml \ - add_$lang:$lang/addendum/xml_$lang.add -[type: docbook] apt-get.8.xml $lang:$lang/apt-get.$lang.8.xml \ - add_$lang:$lang/addendum/xml_$lang.add -[type: docbook] apt-key.8.xml $lang:$lang/apt-key.$lang.8.xml \ - add_$lang:$lang/addendum/xml_$lang.add -[type: docbook] apt-mark.8.xml $lang:$lang/apt-mark.$lang.8.xml \ - add_$lang:$lang/addendum/xml_$lang.add -[type: docbook] apt-secure.8.xml $lang:$lang/apt-secure.$lang.8.xml \ - add_$lang:$lang/addendum/xml_$lang.add -[type: docbook] apt-sortpkgs.1.xml $lang:$lang/apt-sortpkgs.$lang.1.xml \ - add_$lang:$lang/addendum/xml_$lang.add -[type: docbook] apt.conf.5.xml $lang:$lang/apt.conf.$lang.5.xml \ - add_$lang:$lang/addendum/xml_$lang.add -[type: docbook] apt_preferences.5.xml $lang:$lang/apt_preferences.$lang.5.xml \ - add_$lang:$lang/addendum/xml_$lang.add -[type: docbook] sources.list.5.xml $lang:$lang/sources.list.$lang.5.xml \ - add_$lang:$lang/addendum/xml_$lang.add +[type: docbook] apt-cache.8.xml $lang:$lang/apt-cache.$lang.8.xml add_$lang:xml.add +[type: docbook] apt-cdrom.8.xml $lang:$lang/apt-cdrom.$lang.8.xml add_$lang:xml.add +[type: docbook] apt-config.8.xml $lang:$lang/apt-config.$lang.8.xml add_$lang:xml.add +[type: docbook] apt-extracttemplates.1.xml $lang:$lang/apt-extracttemplates.$lang.1.xml add_$lang:xml.add +[type: docbook] apt-ftparchive.1.xml $lang:$lang/apt-ftparchive.$lang.1.xml add_$lang:xml.add +[type: docbook] apt-get.8.xml $lang:$lang/apt-get.$lang.8.xml add_$lang:xml.add +[type: docbook] apt-key.8.xml $lang:$lang/apt-key.$lang.8.xml add_$lang:xml.add +[type: docbook] apt-mark.8.xml $lang:$lang/apt-mark.$lang.8.xml add_$lang:xml.add +[type: docbook] apt-secure.8.xml $lang:$lang/apt-secure.$lang.8.xml add_$lang:xml.add +[type: docbook] apt-sortpkgs.1.xml $lang:$lang/apt-sortpkgs.$lang.1.xml add_$lang:xml.add +[type: docbook] apt.conf.5.xml $lang:$lang/apt.conf.$lang.5.xml add_$lang:xml.add +[type: docbook] apt_preferences.5.xml $lang:$lang/apt_preferences.$lang.5.xml add_$lang:xml.add +[type: docbook] sources.list.5.xml $lang:$lang/sources.list.$lang.5.xml add_$lang:xml.add [type: sgml] guide.sgml $lang:$lang/guide.$lang.sgml # add_$lang::$lang/addendum/debiandoc_$lang.add diff --git a/doc/pt_BR/addendum/xml_pt_BR.add b/doc/pt_BR/addendum/xml_pt_BR.add deleted file mode 100644 index 08f94ce20..000000000 --- a/doc/pt_BR/addendum/xml_pt_BR.add +++ /dev/null @@ -1,5 +0,0 @@ -PO4A-HEADER:mode=after;position=manbugs;beginboundary=^</refentry> - <refsect1><title>Tradução - Esta página de manual foi traduzida para o Português do Brasil por - André Luís Lopes andrelop@ig.com.br. - diff --git a/doc/xml.add b/doc/xml.add new file mode 100644 index 000000000..9311c052f --- /dev/null +++ b/doc/xml.add @@ -0,0 +1,5 @@ +PO4A-HEADER:mode=after;position=manbugs;beginboundary=^ + &translation-title; + &translation-holder; + &translation-english; + -- cgit v1.2.3-70-g09d2 From d16aade9b781538ad5d6d79eda7b69ff075aad85 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 20 Jan 2010 14:18:12 +0100 Subject: * apt-pkg/contrib/strutl.cc: - fix malloc asseration fail with ja_JP.eucJP locale in apt-cache search. Thanks Kusanagi Kouichi! (Closes: #548884) --- apt-pkg/contrib/strutl.cc | 49 +++++++++++++++++++++++++++++++---------------- debian/changelog | 3 +++ 2 files changed, 36 insertions(+), 16 deletions(-) (limited to 'debian') diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc index 4c05f2df8..2913fbf44 100644 --- a/apt-pkg/contrib/strutl.cc +++ b/apt-pkg/contrib/strutl.cc @@ -43,9 +43,10 @@ bool UTF8ToCodeset(const char *codeset, const string &orig, string *dest) { iconv_t cd; const char *inbuf; - char *inptr, *outbuf, *outptr; - size_t insize, outsize; - + char *inptr, *outbuf; + size_t insize, bufsize; + dest->clear(); + cd = iconv_open(codeset, "UTF-8"); if (cd == (iconv_t)(-1)) { // Something went wrong @@ -55,33 +56,49 @@ bool UTF8ToCodeset(const char *codeset, const string &orig, string *dest) else perror("iconv_open"); - // Clean the destination string - *dest = ""; - return false; } - insize = outsize = orig.size(); + insize = bufsize = orig.size(); inbuf = orig.data(); inptr = (char *)inbuf; - outbuf = new char[insize+1]; - outptr = outbuf; + outbuf = new char[bufsize]; + size_t lastError = -1; while (insize != 0) { + char *outptr = outbuf; + size_t outsize = bufsize; size_t const err = iconv(cd, &inptr, &insize, &outptr, &outsize); + dest->append(outbuf, outptr - outbuf); if (err == (size_t)(-1)) { - insize--; - outsize++; - inptr++; - *outptr = '?'; - outptr++; + switch (errno) + { + case EILSEQ: + insize--; + inptr++; + // replace a series of unknown multibytes with a single "?" + if (lastError != insize) { + lastError = insize - 1; + dest->append("?"); + } + break; + case EINVAL: + insize = 0; + break; + case E2BIG: + if (outptr == outbuf) + { + bufsize *= 2; + delete[] outbuf; + outbuf = new char[bufsize]; + } + break; + } } } - *outptr = '\0'; - *dest = outbuf; delete[] outbuf; iconv_close(cd); diff --git a/debian/changelog b/debian/changelog index 588038b4c..9a88f084a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -42,6 +42,9 @@ apt (0.7.25.2) UNRELEASED; urgency=low - replace the per language addendum with a global addendum - add a explanation why translations include (maybe) english parts to the new global addendum (Closes: #561636) + * apt-pkg/contrib/strutl.cc: + - fix malloc asseration fail with ja_JP.eucJP locale in + apt-cache search. Thanks Kusanagi Kouichi! (Closes: #548884) -- David Kalnischkies Sat, 16 Jan 2010 21:06:38 +0100 -- cgit v1.2.3-70-g09d2 From 5c0d3668dd2b6852812502f33d64b1644c2b137a Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 30 Jan 2010 22:19:57 +0100 Subject: * apt-pkg/contrib/macros.h: - move the header system.h with a new name to the public domain, to be able to use it in other headers (Closes: #567662) --- apt-inst/contrib/extracttar.cc | 2 +- apt-pkg/contrib/error.h | 2 +- apt-pkg/contrib/hashes.cc | 4 +-- apt-pkg/contrib/macros.h | 79 +++++++++++++++++++++++++++++++++++++++++ apt-pkg/contrib/md5.cc | 3 +- apt-pkg/contrib/sha1.cc | 2 +- apt-pkg/contrib/system.h | 80 ------------------------------------------ apt-pkg/deb/deblistparser.cc | 3 +- apt-pkg/makefile | 6 ++-- apt-pkg/pkgcache.cc | 2 +- apt-pkg/pkgcachegen.cc | 2 +- debian/changelog | 10 +++++- test/versiontest.cc | 2 +- 13 files changed, 100 insertions(+), 97 deletions(-) create mode 100644 apt-pkg/contrib/macros.h delete mode 100644 apt-pkg/contrib/system.h (limited to 'debian') diff --git a/apt-inst/contrib/extracttar.cc b/apt-inst/contrib/extracttar.cc index 8338fd89d..3d2788aaf 100644 --- a/apt-inst/contrib/extracttar.cc +++ b/apt-inst/contrib/extracttar.cc @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include diff --git a/apt-pkg/contrib/error.h b/apt-pkg/contrib/error.h index 86aa9eca3..31413b2dc 100644 --- a/apt-pkg/contrib/error.h +++ b/apt-pkg/contrib/error.h @@ -53,7 +53,7 @@ #include -#include +#include using std::string; diff --git a/apt-pkg/contrib/hashes.cc b/apt-pkg/contrib/hashes.cc index b43771ea7..985d89d90 100644 --- a/apt-pkg/contrib/hashes.cc +++ b/apt-pkg/contrib/hashes.cc @@ -14,9 +14,9 @@ #include #include #include - +#include + #include -#include #include #include /*}}}*/ diff --git a/apt-pkg/contrib/macros.h b/apt-pkg/contrib/macros.h new file mode 100644 index 000000000..e53eb32df --- /dev/null +++ b/apt-pkg/contrib/macros.h @@ -0,0 +1,79 @@ +// -*- mode: cpp; mode: fold -*- +// Description /*{{{*/ +/* ###################################################################### + + Macros Header - Various useful macro definitions + + This source is placed in the Public Domain, do with it what you will + It was originally written by Brian C. White. + + ##################################################################### */ + /*}}}*/ +// Private header +#ifndef MACROS_H +#define MACROS_H + +// MIN_VAL(SINT16) will return -0x8000 and MAX_VAL(SINT16) = 0x7FFF +#define MIN_VAL(t) (((t)(-1) > 0) ? (t)( 0) : (t)(((1L<<(sizeof(t)*8-1)) ))) +#define MAX_VAL(t) (((t)(-1) > 0) ? (t)(-1) : (t)(((1L<<(sizeof(t)*8-1))-1))) + +// Min/Max functions +#if !defined(MIN) +#if defined(__HIGHC__) +#define MIN(x,y) _min(x,y) +#define MAX(x,y) _max(x,y) +#endif + +// GNU C++ has a min/max operator +#if defined(__GNUG__) +#define MIN(A,B) ((A) ? (B)) +#endif + +/* Templates tend to mess up existing code that uses min/max because of the + strict matching requirements */ +#if !defined(MIN) +#define MIN(A,B) ((A) < (B)?(A):(B)) +#define MAX(A,B) ((A) > (B)?(A):(B)) +#endif +#endif + +/* Bound functions, bound will return the value b within the limits a-c + bounv will change b so that it is within the limits of a-c. */ +#define _bound(a,b,c) MIN(c,MAX(b,a)) +#define _boundv(a,b,c) b = _bound(a,b,c) +#define ABS(a) (((a) < (0)) ?-(a) : (a)) + +/* Usefull count macro, use on an array of things and it will return the + number of items in the array */ +#define _count(a) (sizeof(a)/sizeof(a[0])) + +// Flag Macros +#define FLAG(f) (1L << (f)) +#define SETFLAG(v,f) ((v) |= FLAG(f)) +#define CLRFLAG(v,f) ((v) &=~FLAG(f)) +#define CHKFLAG(v,f) ((v) & FLAG(f) ? true : false) + +// some nice optional GNUC features +#if __GNUC__ >= 3 + #define __must_check __attribute__ ((warn_unused_result)) + #define __deprecated __attribute__ ((deprecated)) + /* likely() and unlikely() can be used to mark boolean expressions + as (not) likely true which will help the compiler to optimise */ + #define likely(x) __builtin_expect (!!(x), 1) + #define unlikely(x) __builtin_expect (!!(x), 0) +#else + #define __must_check /* no warn_unused_result */ + #define __deprecated /* no deprecated */ + #define likely(x) (x) + #define unlikely(x) (x) +#endif + +// cold functions are unlikely() to be called +#if (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) || __GNUC__ > 4 + #define __cold __attribute__ ((__cold__)) +#else + #define __cold /* no cold marker */ +#endif + +#endif diff --git a/apt-pkg/contrib/md5.cc b/apt-pkg/contrib/md5.cc index 2bfd70f1b..c0fa8493d 100644 --- a/apt-pkg/contrib/md5.cc +++ b/apt-pkg/contrib/md5.cc @@ -37,14 +37,13 @@ // Include Files /*{{{*/ #include #include +#include #include #include #include // For htonl #include #include -#include - /*}}}*/ // byteSwap - Swap bytes in a buffer /*{{{*/ diff --git a/apt-pkg/contrib/sha1.cc b/apt-pkg/contrib/sha1.cc index b70f31dc6..eae52d52f 100644 --- a/apt-pkg/contrib/sha1.cc +++ b/apt-pkg/contrib/sha1.cc @@ -31,12 +31,12 @@ // Include Files /*{{{*/ #include #include +#include #include #include #include #include -#include /*}}}*/ // SHA1Transform - Alters an existing SHA-1 hash /*{{{*/ diff --git a/apt-pkg/contrib/system.h b/apt-pkg/contrib/system.h deleted file mode 100644 index b57093b93..000000000 --- a/apt-pkg/contrib/system.h +++ /dev/null @@ -1,80 +0,0 @@ -// -*- mode: cpp; mode: fold -*- -// Description /*{{{*/ -// $Id: system.h,v 1.3 1999/12/10 23:40:29 jgg Exp $ -/* ###################################################################### - - System Header - Usefull private definitions - - This source is placed in the Public Domain, do with it what you will - It was originally written by Brian C. White. - - ##################################################################### */ - /*}}}*/ -// Private header -#ifndef SYSTEM_H -#define SYSTEM_H - -// MIN_VAL(SINT16) will return -0x8000 and MAX_VAL(SINT16) = 0x7FFF -#define MIN_VAL(t) (((t)(-1) > 0) ? (t)( 0) : (t)(((1L<<(sizeof(t)*8-1)) ))) -#define MAX_VAL(t) (((t)(-1) > 0) ? (t)(-1) : (t)(((1L<<(sizeof(t)*8-1))-1))) - -// Min/Max functions -#if !defined(MIN) -#if defined(__HIGHC__) -#define MIN(x,y) _min(x,y) -#define MAX(x,y) _max(x,y) -#endif - -// GNU C++ has a min/max operator -#if defined(__GNUG__) -#define MIN(A,B) ((A) ? (B)) -#endif - -/* Templates tend to mess up existing code that uses min/max because of the - strict matching requirements */ -#if !defined(MIN) -#define MIN(A,B) ((A) < (B)?(A):(B)) -#define MAX(A,B) ((A) > (B)?(A):(B)) -#endif -#endif - -/* Bound functions, bound will return the value b within the limits a-c - bounv will change b so that it is within the limits of a-c. */ -#define _bound(a,b,c) MIN(c,MAX(b,a)) -#define _boundv(a,b,c) b = _bound(a,b,c) -#define ABS(a) (((a) < (0)) ?-(a) : (a)) - -/* Usefull count macro, use on an array of things and it will return the - number of items in the array */ -#define _count(a) (sizeof(a)/sizeof(a[0])) - -// Flag Macros -#define FLAG(f) (1L << (f)) -#define SETFLAG(v,f) ((v) |= FLAG(f)) -#define CLRFLAG(v,f) ((v) &=~FLAG(f)) -#define CHKFLAG(v,f) ((v) & FLAG(f) ? true : false) - -// some nice optional GNUC features -#if __GNUC__ >= 3 - #define __must_check __attribute__ ((warn_unused_result)) - #define __deprecated __attribute__ ((deprecated)) - /* likely() and unlikely() can be used to mark boolean expressions - as (not) likely true which will help the compiler to optimise */ - #define likely(x) __builtin_expect (!!(x), 1) - #define unlikely(x) __builtin_expect (!!(x), 0) -#else - #define __must_check /* no warn_unused_result */ - #define __deprecated /* no deprecated */ - #define likely(x) (x) - #define unlikely(x) (x) -#endif - -// cold functions are unlikely() to be called -#if (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) || __GNUC__ > 4 - #define __cold __attribute__ ((__cold__)) -#else - #define __cold /* no cold marker */ -#endif - -#endif diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index 25a1df3f9..66108d822 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -17,10 +17,9 @@ #include #include #include +#include #include - -#include /*}}}*/ static debListParser::WordList PrioList[] = {{"important",pkgCache::State::Important}, diff --git a/apt-pkg/makefile b/apt-pkg/makefile index 3d6209658..bdd49c089 100644 --- a/apt-pkg/makefile +++ b/apt-pkg/makefile @@ -24,7 +24,8 @@ SOURCE = contrib/mmap.cc contrib/error.cc contrib/strutl.cc \ contrib/cdromutl.cc contrib/crc-16.cc contrib/netrc.cc \ contrib/fileutl.cc HEADERS = mmap.h error.h configuration.h fileutl.h cmndline.h netrc.h\ - md5.h crc-16.h cdromutl.h strutl.h sptr.h sha1.h sha256.h hashes.h + md5.h crc-16.h cdromutl.h strutl.h sptr.h sha1.h sha256.h hashes.h \ + macros.h # Source code for the core main library SOURCE+= pkgcache.cc version.cc depcache.cc \ @@ -53,7 +54,4 @@ HEADERS+= debversion.h debsrcrecords.h dpkgpm.h debrecords.h \ HEADERS := $(addprefix apt-pkg/,$(HEADERS)) -# Private header files -HEADERS+= system.h - include $(LIBRARY_H) diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index eb7e4957a..038bd7ec4 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -27,6 +27,7 @@ #include #include #include +#include #include @@ -35,7 +36,6 @@ #include #include -#include /*}}}*/ using std::string; diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index f988c1018..3eeb18cae 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -21,6 +21,7 @@ #include #include #include +#include #include @@ -32,7 +33,6 @@ #include #include #include -#include /*}}}*/ typedef vector::iterator FileIterator; diff --git a/debian/changelog b/debian/changelog index 9a88f084a..c287600e8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,7 +20,15 @@ apt (0.7.26) UNRELEASED; urgency=low -- Michael Vogt Thu, 10 Dec 2009 22:02:38 +0100 -apt (0.7.25.2) UNRELEASED; urgency=low +apt (0.7.25.3) UNRELEASED; urgency=low + + * apt-pkg/contrib/macros.h: + - move the header system.h with a new name to the public domain, + to be able to use it in other headers (Closes: #567662) + + -- David Kalnischkies Sat, 30 Jan 2010 22:13:48 +0100 + +apt (0.7.25.2) unstable; urgency=low * apt-pkg/contrib/fileutl.cc: - Fix the newly introduced method GetListOfFilesInDir to not diff --git a/test/versiontest.cc b/test/versiontest.cc index 5438eb4de..4ede4b280 100644 --- a/test/versiontest.cc +++ b/test/versiontest.cc @@ -14,7 +14,7 @@ ##################################################################### */ /*}}}*/ -#include +#include #include #include #include -- cgit v1.2.3-70-g09d2 From ee6970ea70dff6f700d13424a3d0ed620f056547 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 30 Jan 2010 22:40:25 +0100 Subject: * cmdline/acqprogress.cc: - Set Mode to Medium so that the correct prefix is used. Thanks Stefan Haller for the patch! (Closes: #567304 LP: #275243) --- cmdline/acqprogress.cc | 2 +- debian/changelog | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/cmdline/acqprogress.cc b/cmdline/acqprogress.cc index b3ded4142..32e8243bf 100644 --- a/cmdline/acqprogress.cc +++ b/cmdline/acqprogress.cc @@ -150,7 +150,7 @@ bool AcqTextStatus::Pulse(pkgAcquire *Owner) if (Quiet > 0) return true; - enum {Long = 0,Medium,Short} Mode = Long; + enum {Long = 0,Medium,Short} Mode = Medium; char Buffer[sizeof(BlankLine)]; char *End = Buffer + sizeof(Buffer); diff --git a/debian/changelog b/debian/changelog index c287600e8..d791eb5a0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,9 @@ apt (0.7.25.3) UNRELEASED; urgency=low * apt-pkg/contrib/macros.h: - move the header system.h with a new name to the public domain, to be able to use it in other headers (Closes: #567662) + * cmdline/acqprogress.cc: + - Set Mode to Medium so that the correct prefix is used. + Thanks Stefan Haller for the patch! (Closes: #567304 LP: #275243) -- David Kalnischkies Sat, 30 Jan 2010 22:13:48 +0100 -- cgit v1.2.3-70-g09d2 From f99da9089c1122bdb47173171d3c6a692fb4d439 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 30 Jan 2010 23:57:27 +0100 Subject: * ftparchive/writer.cc: - generate sha1 and sha256 checksums for dsc (Closes: #567343) --- debian/changelog | 2 ++ ftparchive/writer.cc | 30 +++++++++++++++++++++++++----- 2 files changed, 27 insertions(+), 5 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index d791eb5a0..57c9c1f7b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,6 +28,8 @@ apt (0.7.25.3) UNRELEASED; urgency=low * cmdline/acqprogress.cc: - Set Mode to Medium so that the correct prefix is used. Thanks Stefan Haller for the patch! (Closes: #567304 LP: #275243) + * ftparchive/writer.cc: + - generate sha1 and sha256 checksums for dsc (Closes: #567343) -- David Kalnischkies Sat, 30 Jan 2010 22:13:48 +0100 diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc index 5547c6aa5..b9dd554b3 100644 --- a/ftparchive/writer.cc +++ b/ftparchive/writer.cc @@ -555,7 +555,12 @@ bool SourcesWriter::DoPackage(string FileName) char *BlkEnd = Buffer + St.st_size; MD5Summation MD5; MD5.Add((unsigned char *)Start,BlkEnd - Start); - + + SHA1Summation SHA1; + SHA256Summation SHA256; + SHA1.Add((unsigned char *)Start,BlkEnd - Start); + SHA256.Add((unsigned char *)Start,BlkEnd - Start); + // Add an extra \n to the end, just in case *BlkEnd++ = '\n'; @@ -646,12 +651,25 @@ bool SourcesWriter::DoPackage(string FileName) } // Add the dsc to the files hash list + string const strippedName = flNotDir(FileName); char Files[1000]; snprintf(Files,sizeof(Files),"\n %s %lu %s\n %s", string(MD5.Result()).c_str(),St.st_size, - flNotDir(FileName).c_str(), + strippedName.c_str(), Tags.FindS("Files").c_str()); - + + char ChecksumsSha1[1000]; + snprintf(ChecksumsSha1,sizeof(ChecksumsSha1),"\n %s %lu %s\n %s", + string(SHA1.Result()).c_str(),St.st_size, + strippedName.c_str(), + Tags.FindS("Checksums-Sha1").c_str()); + + char ChecksumsSha256[1000]; + snprintf(ChecksumsSha256,sizeof(ChecksumsSha256),"\n %s %lu %s\n %s", + string(SHA256.Result()).c_str(),St.st_size, + strippedName.c_str(), + Tags.FindS("Checksums-Sha256").c_str()); + // Strip the DirStrip prefix from the FileName and add the PathPrefix string NewFileName; if (DirStrip.empty() == false && @@ -694,12 +712,14 @@ bool SourcesWriter::DoPackage(string FileName) Directory.erase(Directory.end()-1); // This lists all the changes to the fields we are going to make. - // (5 hardcoded + maintainer + end marker) - TFRewriteData Changes[5+1+SOverItem->FieldOverride.size()+1]; + // (5 hardcoded + checksums + maintainer + end marker) + TFRewriteData Changes[5+2+1+SOverItem->FieldOverride.size()+1]; unsigned int End = 0; SetTFRewriteData(Changes[End++],"Source",Package.c_str(),"Package"); SetTFRewriteData(Changes[End++],"Files",Files); + SetTFRewriteData(Changes[End++],"Checksums-Sha1",ChecksumsSha1); + SetTFRewriteData(Changes[End++],"Checksums-Sha256",ChecksumsSha256); if (Directory != "./") SetTFRewriteData(Changes[End++],"Directory",Directory.c_str()); SetTFRewriteData(Changes[End++],"Priority",BestPrio.c_str()); -- cgit v1.2.3-70-g09d2 From e57a5bff9c131aaa02f5756186927c755289089e Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 31 Jan 2010 02:16:17 +0100 Subject: * cmdline/apt-get.cc: - don't mark as manually if in download only (Closes: #468180) --- cmdline/apt-get.cc | 3 ++- debian/changelog | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index dede0137e..34ae2fed9 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1776,7 +1776,8 @@ bool DoInstall(CommandLine &CmdL) if(!Remove && Cache[Pkg].Install() == false && (Cache[Pkg].Flags & pkgCache::Flag::Auto) && - _config->FindB("APT::Get::ReInstall",false) == false) + _config->FindB("APT::Get::ReInstall",false) == false && + _config->FindB("APT::Get::Download-Only",false) == false) { ioprintf(c1out,_("%s set to manually installed.\n"), Pkg.Name()); diff --git a/debian/changelog b/debian/changelog index 57c9c1f7b..5da8edb3b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -30,6 +30,8 @@ apt (0.7.25.3) UNRELEASED; urgency=low Thanks Stefan Haller for the patch! (Closes: #567304 LP: #275243) * ftparchive/writer.cc: - generate sha1 and sha256 checksums for dsc (Closes: #567343) + * cmdline/apt-get.cc: + - don't mark as manually if in download only (Closes: #468180) -- David Kalnischkies Sat, 30 Jan 2010 22:13:48 +0100 -- cgit v1.2.3-70-g09d2