From: David Kalnischkies Date: Thu, 10 Dec 2009 22:05:23 +0000 (+0100) Subject: merge with lp:~mvo/apt/debian-sid : move all my ABI break changes X-Git-Tag: 0.8.0~39^2~38 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/f932cd7c75cd7b0da99c97064f8d112075ccd7f5?hp=-c merge with lp:~mvo/apt/debian-sid : move all my ABI break changes to the "new" 0.7.26 version --- f932cd7c75cd7b0da99c97064f8d112075ccd7f5 diff --combined debian/changelog index 26b3e8c1e,1f4fa38b8..5cd6eeb4a --- a/debian/changelog +++ b/debian/changelog @@@ -1,3 -1,3 +1,45 @@@ ++apt (0.7.26) UNRELEASED; urgency=low ++ ++ [ David Kalnischkies ] ++ * [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) ++ * doc/apt.conf.5.xml: ++ - briefly document the behaviour of the new https options ++ * methods/connect.cc: ++ - add AI_ADDRCONFIG to ai_flags as suggested by Aurelien Jarno ++ in response to Bernhard R. Link, thanks! (Closes: #505020) ++ * methods/rred.cc: ++ - rewrite to be able to handle even big patch files ++ - adopt optional mmap+iovec patch from Morten Hustveit ++ (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) ++ * apt-pkg/acquire-item.cc: ++ - allow also to skip the last patch if target is reached, ++ thanks Bernhard R. Link! (Closes: #545699) ++ * 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) ++ * ftparchive/writer.{cc,h}: ++ - 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) ++ * debian/apt.cron.daily: ++ - check cache size even if we do nothing else otherwise, thanks ++ Francesco Poli for patch(s) and patience! (Closes: #459344) ++ ++ -- Michael Vogt Thu, 10 Dec 2009 22:02:38 +0100 ++ apt (0.7.25) UNRELEASED; urgency=low [ Christian Perrier ] @@@ -17,13 -17,36 +59,36 @@@ Closes: #552606 * Italian translation update by Milo Casagrande Closes: #555797 + * Simplified Chinese translation update by Aron Xu + Closes: #558737 + * Slovak translation update by Ivan Masár + Closes: #559277 + + [ Michael Vogt ] + * apt-pkg/packagemanager.cc: + - add output about pre-depends configuring when debug::pkgPackageManager + is used + * methods/https.cc: + - fix incorrect use of CURLOPT_TIMEOUT, closes: #497983, LP: #354972 + thanks to Brian Thomason for the patch + * merge lp:~mvo/apt/netrc branch, this adds support for a + /etc/apt/auth.conf that can be used to store username/passwords + in a "netrc" style file (with the extension that it supports "/" + in a machine definition). Based on the maemo git branch (Closes: #518473) + (thanks also to Jussi Hakala and Julian Andres Klode) + * apt-pkg/deb/dpkgpm.cc: + - add "purge" to list of known actions + + [ Brian Murray ] + * apt-pkg/depcache.cc, apt-pkg/indexcopy.cc: + - typo fix (LP: #462328) + + [ Loïc Minier ] + * cmdline/apt-key: + - Emit a warning if removed keys keyring is missing and skip associated + checks (LP: #218971) [ David Kalnischkies ] - * [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 @@@ -31,7 -54,6 +96,6 @@@ * 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: @@@ -44,8 -66,6 +108,6 @@@ - 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 @@@ -59,40 -79,15 +121,15 @@@ - bump policy to 3.8.3 as we have no outdated manpages anymore * debian/NEWS: - fix a typo in 0.7.24: Allready -> Already (Closes: #557674) - * methods/rred.cc: - - rewrite to be able to handle even big patch files - - adopt optional mmap+iovec patch from Morten Hustveit - (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) - * 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) - 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) - - 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) - * 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: - - 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: @@@ -113,13 -108,12 +150,12 @@@ - Restrict option names to alphanumerical characters and "/-:._+". - Deprecate #include, we have apt.conf.d nowadays which should be sufficient. - * methods/https.cc: - - Add support for authentication using netrc (Closes: #518473), patch - by Jussi Hakala . * ftparchive/apt-ftparchive.cc: - Call setlocale() so translations are actually used. + * debian/apt.conf.autoremove: + - Add kfreebsd-image-* to the list (Closes: #558803) - -- Michael Vogt Tue, 29 Sep 2009 15:51:34 +0200 + -- Michael Vogt Thu, 10 Dec 2009 22:02:38 +0100 apt (0.7.24) unstable; urgency=low diff --combined doc/examples/configure-index index 05826feaa,f5f996460..0a20e8f2b --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@@ -191,37 -191,19 +191,37 @@@ Acquir 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: - // - 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"; }; ftp @@@ -273,15 -255,6 +273,15 @@@ Order { "gz"; "lzma"; "bz2"; }; }; + + Languages + { + "environment"; + "de"; + "en"; + "none"; + "fr"; + }; }; // Directory layout @@@ -309,6 -282,7 +309,7 @@@ Dir "/ // Config files Etc "etc/apt/" { Main "apt.conf"; + Netrc "auth.conf"; Parts "apt.conf.d/"; Preferences "preferences"; PreferencesParts "preferences.d"; @@@ -407,6 -381,7 +408,7 @@@ Debu Acquire::gpgv "false"; // Show the gpgv traffic aptcdrom "false"; // Show found package files IdentCdrom "false"; + acquire::netrc "false"; // netrc parser } diff --combined doc/po/apt-doc.pot index 5172f7f84,f833cec6c..58af2ebdf --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@@ -7,7 -7,7 +7,7 @@@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" - "POT-Creation-Date: 2009-11-28 02:08+0100\n" + "POT-Creation-Date: 2009-12-10 22:04+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@@ -1218,7 -1218,7 +1218,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:456 apt.conf.5.xml:478 +#: 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 msgid "options" msgstr "" @@@ -1411,12 -1411,12 +1411,12 @@@ 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:568 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:556 apt-get.8.xml:554 apt-sortpkgs.1.xml:64 msgid "&apt-commonoptions;" msgstr "" #. type: Content of: - #: 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:138 apt-mark.8.xml:122 apt.conf.5.xml:988 apt_preferences.5.xml:615 msgid "Files" msgstr "" @@@ -1426,7 -1426,7 +1426,7 @@@ msgid "&file-sourceslist; &file-stateli 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: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: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:994 apt_preferences.5.xml:622 sources.list.5.xml:233 msgid "See Also" msgstr "" @@@ -1436,7 -1436,7 +1436,7 @@@ msgid "&apt-conf;, &sources-list;, &apt 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:588 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:576 apt-get.8.xml:575 apt-mark.8.xml:137 apt-sortpkgs.1.xml:73 msgid "Diagnostics" msgstr "" @@@ -1735,7 -1735,7 +1735,7 @@@ msgid "Just show the contents of the co msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:585 apt-sortpkgs.1.xml:70 + #: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:573 apt-sortpkgs.1.xml:70 msgid "&apt-conf;" msgstr "" @@@ -2690,30 -2690,11 +2690,11 @@@ msgstr " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-ftparchive.1.xml:547 - 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 + #: apt-ftparchive.1.xml:549 msgid "" "This configuration option defaults to \"<literal>true</literal>\" and should " "only be set to <literal>\"false\"</literal> if the Archive generated with " @@@ -2723,12 -2704,12 +2704,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> - #: apt-ftparchive.1.xml:573 apt.conf.5.xml:1011 apt_preferences.5.xml:462 sources.list.5.xml:193 + #: apt-ftparchive.1.xml:561 apt.conf.5.xml:982 apt_preferences.5.xml:462 sources.list.5.xml:193 msgid "Examples" msgstr "" #. type: Content of: <refentry><refsect1><para><programlisting> - #: apt-ftparchive.1.xml:579 + #: apt-ftparchive.1.xml:567 #, no-wrap msgid "" "<command>apt-ftparchive</command> packages " @@@ -2737,14 -2718,14 +2718,14 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt-ftparchive.1.xml:575 + #: apt-ftparchive.1.xml:563 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:589 + #: apt-ftparchive.1.xml:577 msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@@ -4642,7 -4623,7 +4623,7 @@@ msgid " msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:264 apt.conf.5.xml:328 + #: apt.conf.5.xml:264 apt.conf.5.xml:321 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method, this applies to all things including connection timeout and data " @@@ -4671,31 -4652,21 +4652,31 @@@ msgid " "deactivates the download from multiple servers at the same time.)" msgstr "" +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:280 +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 " +"clients only if the client uses a known identifier." +msgstr "" + #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> - #: apt.conf.5.xml:286 + #: apt.conf.5.xml:281 msgid "https" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:287 + #: apt.conf.5.xml:282 msgid "" -"HTTPS URIs. Cache-control and proxy options are the same as for " -"<literal>http</literal> method. <literal>Pipeline-Depth</literal> option is " +"HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy " +"options are the same as for <literal>http</literal> method and will also " +"default to the options from the <literal>http</literal> method if they are " +"not explicitly set for https. <literal>Pipeline-Depth</literal> option is " "not supported yet." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:293 + #: apt.conf.5.xml:286 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is " @@@ -4717,12 -4688,12 +4698,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> - #: apt.conf.5.xml:311 sources.list.5.xml:150 + #: apt.conf.5.xml:304 sources.list.5.xml:150 msgid "ftp" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:312 + #: apt.conf.5.xml:305 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 " @@@ -4742,7 -4713,7 +4723,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:331 + #: apt.conf.5.xml:324 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 " @@@ -4752,7 -4723,7 +4733,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:338 + #: apt.conf.5.xml:331 msgid "" "It is possible to proxy FTP over HTTP by setting the " "<envar>ftp_proxy</envar> environment variable to a http url - see the " @@@ -4762,7 -4733,7 +4743,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:343 + #: apt.conf.5.xml:336 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@@ -4772,18 -4743,18 +4753,18 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> - #: apt.conf.5.xml:350 sources.list.5.xml:132 + #: apt.conf.5.xml:343 sources.list.5.xml:132 msgid "cdrom" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> - #: apt.conf.5.xml:356 + #: apt.conf.5.xml:349 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:351 + #: apt.conf.5.xml:344 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 " @@@ -4796,12 -4767,12 +4777,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> - #: apt.conf.5.xml:361 + #: apt.conf.5.xml:354 msgid "gpgv" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:362 + #: apt.conf.5.xml:355 msgid "" "GPGV URIs; the only option for GPGV URIs is the option to pass additional " "parameters to gpgv. <literal>gpgv::Options</literal> Additional options " @@@ -4809,12 -4780,12 +4790,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> - #: apt.conf.5.xml:367 + #: apt.conf.5.xml:360 msgid "CompressionTypes" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> - #: apt.conf.5.xml:373 + #: apt.conf.5.xml:366 #, no-wrap msgid "" "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> " @@@ -4822,7 -4793,7 +4803,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:368 + #: apt.conf.5.xml:361 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@@ -4834,19 -4805,19 +4815,19 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> - #: apt.conf.5.xml:378 + #: apt.conf.5.xml:371 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> - #: apt.conf.5.xml:381 + #: apt.conf.5.xml:374 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:374 + #: apt.conf.5.xml:367 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 " @@@ -4863,13 -4834,13 +4844,13 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> - #: apt.conf.5.xml:385 + #: apt.conf.5.xml:378 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:383 + #: apt.conf.5.xml:376 msgid "" "Note that at run time the " "<literal>Dir::Bin::<replaceable>Methodname</replaceable></literal> will be " @@@ -4884,7 -4855,7 +4865,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:390 + #: apt.conf.5.xml:383 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 " @@@ -4893,53 -4864,6 +4874,53 @@@ "prefer uncompressed files to support the usage of local mirrors." msgstr "" +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:396 +msgid "Languages" +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:397 +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." +msgstr "" + +#. 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 "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:403 +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\"/>" +msgstr "" + #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:217 msgid "" @@@ -4949,12 -4873,12 +4930,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:420 + #: apt.conf.5.xml:392 msgid "Directories" msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:422 + #: apt.conf.5.xml:394 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@@ -4966,7 -4890,7 +4947,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:429 + #: apt.conf.5.xml:401 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@@ -4979,7 -4903,7 +4960,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:438 + #: apt.conf.5.xml:410 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@@ -4989,7 -4913,7 +4970,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:444 + #: apt.conf.5.xml:416 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 " @@@ -4997,7 -4921,7 +4978,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:448 + #: apt.conf.5.xml:420 msgid "" "Binary programs are pointed to by " "<literal>Dir::Bin</literal>. <literal>Dir::Bin::Methods</literal> specifies " @@@ -5009,7 -4933,7 +4990,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:456 + #: apt.conf.5.xml:428 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@@ -5022,12 -4946,12 +5003,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:469 + #: apt.conf.5.xml:441 msgid "APT in DSelect" msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:471 + #: apt.conf.5.xml:443 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behaviour. These are in the <literal>DSelect</literal> " @@@ -5035,12 -4959,12 +5016,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:475 + #: apt.conf.5.xml:447 msgid "Clean" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:476 + #: apt.conf.5.xml:448 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 " @@@ -5051,50 -4975,50 +5032,50 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:485 + #: apt.conf.5.xml:457 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:489 + #: apt.conf.5.xml:461 msgid "Updateoptions" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:490 + #: apt.conf.5.xml:462 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:494 + #: apt.conf.5.xml:466 msgid "PromptAfterUpdate" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:495 + #: apt.conf.5.xml:467 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:501 + #: apt.conf.5.xml:473 msgid "How APT calls dpkg" msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:502 + #: apt.conf.5.xml:474 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:507 + #: apt.conf.5.xml:479 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 " @@@ -5102,17 -5026,17 +5083,17 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:512 + #: apt.conf.5.xml:484 msgid "Pre-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:512 + #: apt.conf.5.xml:484 msgid "Post-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:513 + #: apt.conf.5.xml:485 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 " @@@ -5121,12 -5045,12 +5102,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:519 + #: apt.conf.5.xml:491 msgid "Pre-Install-Pkgs" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:520 + #: apt.conf.5.xml:492 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 " @@@ -5136,7 -5060,7 +5117,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:526 + #: apt.conf.5.xml:498 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@@ -5147,36 -5071,36 +5128,36 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:533 + #: apt.conf.5.xml:505 msgid "Run-Directory" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:534 + #: apt.conf.5.xml:506 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:538 + #: apt.conf.5.xml:510 msgid "Build-options" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:539 + #: apt.conf.5.xml:511 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:544 + #: apt.conf.5.xml:516 msgid "dpkg trigger usage (and related options)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> - #: apt.conf.5.xml:545 + #: apt.conf.5.xml:517 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 " @@@ -5191,7 -5115,7 +5172,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> - #: apt.conf.5.xml:560 + #: apt.conf.5.xml:532 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@@ -5201,7 -5125,7 +5182,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> - #: apt.conf.5.xml:554 + #: apt.conf.5.xml:526 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 " @@@ -5215,12 -5139,12 +5196,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> - #: apt.conf.5.xml:566 + #: apt.conf.5.xml:538 msgid "DPkg::NoTriggers" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:567 + #: apt.conf.5.xml:539 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 " @@@ -5232,12 -5156,12 +5213,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> - #: apt.conf.5.xml:574 + #: apt.conf.5.xml:546 msgid "PackageManager::Configure" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:575 + #: apt.conf.5.xml:547 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@@ -5254,12 -5178,12 +5235,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> - #: apt.conf.5.xml:585 + #: apt.conf.5.xml:557 msgid "DPkg::ConfigurePending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:586 + #: apt.conf.5.xml:558 msgid "" "If this option is set apt will call <command>dpkg --configure " "--pending</command> to let dpkg handle all required configurations and " @@@ -5271,12 -5195,12 +5252,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> - #: apt.conf.5.xml:592 + #: apt.conf.5.xml:564 msgid "DPkg::TriggersPending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:593 + #: apt.conf.5.xml:565 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@@ -5286,12 -5210,12 +5267,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> - #: apt.conf.5.xml:598 + #: apt.conf.5.xml:570 msgid "PackageManager::UnpackAll" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:599 + #: apt.conf.5.xml:571 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 " @@@ -5303,12 -5227,12 +5284,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> - #: apt.conf.5.xml:606 + #: apt.conf.5.xml:578 msgid "OrderList::Score::Immediate" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> - #: apt.conf.5.xml:614 + #: apt.conf.5.xml:586 #, no-wrap msgid "" "OrderList::Score {\n" @@@ -5320,7 -5244,7 +5301,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:607 + #: apt.conf.5.xml:579 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 " @@@ -5334,12 -5258,12 +5315,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:627 + #: apt.conf.5.xml:599 msgid "Periodic and Archives options" msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:628 + #: apt.conf.5.xml:600 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@@ -5348,12 -5272,12 +5329,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:636 + #: apt.conf.5.xml:608 msgid "Debug options" msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:638 + #: apt.conf.5.xml:610 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@@ -5364,7 -5288,7 +5345,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> - #: apt.conf.5.xml:649 + #: apt.conf.5.xml:621 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, " @@@ -5372,7 -5296,7 +5353,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> - #: apt.conf.5.xml:657 + #: apt.conf.5.xml:629 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s " @@@ -5380,7 -5304,7 +5361,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> - #: apt.conf.5.xml:666 + #: apt.conf.5.xml:638 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@@ -5390,110 -5314,110 +5371,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:674 + #: apt.conf.5.xml:646 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:684 + #: apt.conf.5.xml:656 msgid "A full list of debugging options to apt follows." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:689 + #: apt.conf.5.xml:661 msgid "<literal>Debug::Acquire::cdrom</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:693 + #: apt.conf.5.xml:665 msgid "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:700 + #: apt.conf.5.xml:672 msgid "<literal>Debug::Acquire::ftp</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:704 + #: apt.conf.5.xml:676 msgid "Print information related to downloading packages using FTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:711 + #: apt.conf.5.xml:683 msgid "<literal>Debug::Acquire::http</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:715 + #: apt.conf.5.xml:687 msgid "Print information related to downloading packages using HTTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:722 + #: apt.conf.5.xml:694 msgid "<literal>Debug::Acquire::https</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:726 + #: apt.conf.5.xml:698 msgid "Print information related to downloading packages using HTTPS." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:733 + #: apt.conf.5.xml:705 msgid "<literal>Debug::Acquire::gpgv</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:737 + #: apt.conf.5.xml:709 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:744 + #: apt.conf.5.xml:716 msgid "<literal>Debug::aptcdrom</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:748 + #: apt.conf.5.xml:720 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:755 + #: apt.conf.5.xml:727 msgid "<literal>Debug::BuildDeps</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:758 + #: apt.conf.5.xml:730 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:765 + #: apt.conf.5.xml:737 msgid "<literal>Debug::Hashes</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:768 + #: apt.conf.5.xml:740 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:775 + #: apt.conf.5.xml:747 msgid "<literal>Debug::IdentCDROM</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:778 + #: apt.conf.5.xml:750 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 " @@@ -5501,92 -5425,92 +5482,92 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:786 + #: apt.conf.5.xml:758 msgid "<literal>Debug::NoLocking</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:789 + #: apt.conf.5.xml:761 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:797 + #: apt.conf.5.xml:769 msgid "<literal>Debug::pkgAcquire</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:801 + #: apt.conf.5.xml:773 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:808 + #: apt.conf.5.xml:780 msgid "<literal>Debug::pkgAcquire::Auth</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:811 + #: apt.conf.5.xml:783 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:818 + #: apt.conf.5.xml:790 msgid "<literal>Debug::pkgAcquire::Diffs</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:821 + #: apt.conf.5.xml:793 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:829 + #: apt.conf.5.xml:801 msgid "<literal>Debug::pkgAcquire::RRed</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:833 + #: apt.conf.5.xml:805 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:840 + #: apt.conf.5.xml:812 msgid "<literal>Debug::pkgAcquire::Worker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:844 + #: apt.conf.5.xml:816 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:851 + #: apt.conf.5.xml:823 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:855 + #: apt.conf.5.xml:827 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:862 + #: apt.conf.5.xml:834 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:865 + #: apt.conf.5.xml:837 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial " @@@ -5596,12 -5520,12 +5577,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:876 + #: apt.conf.5.xml:848 msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:879 + #: apt.conf.5.xml:851 msgid "" "Generate debug messages describing which package is marked as " "keep/install/remove while the ProblemResolver does his work. Each addition " @@@ -5619,90 -5543,90 +5600,90 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:898 + #: apt.conf.5.xml:870 msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:901 + #: apt.conf.5.xml:873 msgid "Dump the default configuration to standard error on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:908 + #: apt.conf.5.xml:880 msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:911 + #: apt.conf.5.xml:883 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:919 + #: apt.conf.5.xml:891 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:922 + #: apt.conf.5.xml:894 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:929 + #: apt.conf.5.xml:901 msgid "<literal>Debug::pkgOrderList</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:933 + #: apt.conf.5.xml:905 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:941 + #: apt.conf.5.xml:913 msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:945 + #: apt.conf.5.xml:917 msgid "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:952 + #: apt.conf.5.xml:924 msgid "<literal>Debug::pkgPolicy</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:956 + #: apt.conf.5.xml:928 msgid "Output the priority of each package list on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:962 + #: apt.conf.5.xml:934 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:966 + #: apt.conf.5.xml:938 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:974 + #: apt.conf.5.xml:946 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:977 + #: apt.conf.5.xml:949 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 " @@@ -5710,32 -5634,32 +5691,32 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:985 + #: apt.conf.5.xml:957 msgid "<literal>Debug::sourceList</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:989 + #: apt.conf.5.xml:961 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:1012 + #: apt.conf.5.xml:983 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." msgstr "" #. type: Content of: <refentry><refsect1><variablelist> - #: apt.conf.5.xml:1019 + #: apt.conf.5.xml:990 msgid "&file-aptconf;" msgstr "" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:1024 + #: apt.conf.5.xml:995 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "" diff --combined doc/po/de.po index 3ec7c4a5b,b6cbeef6a..bc15abae3 --- a/doc/po/de.po +++ b/doc/po/de.po @@@ -7,7 -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: 2009-11-27 00:05+0100\n" + "POT-Creation-Date: 2009-12-10 22:04+0100\n" "PO-Revision-Date: 2009-10-28 23:51+GMT\n" "Last-Translator: Chris Leick <c.leick@vollbio.de>\n" "Language-Team: German <debian-l10n-german@lists.debian.org>\n" @@@ -1585,10 -1585,6 +1585,10 @@@ 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 " @@@ -1706,7 -1702,7 +1706,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:456 apt.conf.5.xml:478 +#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:484 apt.conf.5.xml:506 msgid "options" msgstr "Optionen" @@@ -1949,7 -1945,7 +1949,7 @@@ 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.conf.5.xml:988 apt_preferences.5.xml:615 msgid "Files" msgstr "Dateien" @@@ -1962,7 -1958,7 +1962,7 @@@ msgstr "&file-sourceslist; &file-statel #: 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-sortpkgs.1.xml:69 apt.conf.5.xml:994 apt_preferences.5.xml:622 #: sources.list.5.xml:233 msgid "See Also" msgstr "Siehe auch" @@@ -3594,7 -3590,7 +3594,7 @@@ msgid " msgstr "" #. 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:561 apt.conf.5.xml:982 apt_preferences.5.xml:462 #: sources.list.5.xml:193 msgid "Examples" msgstr "Beispiele" @@@ -3991,14 -3987,6 +3991,14 @@@ 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 " @@@ -5703,14 -5691,6 +5703,14 @@@ 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 " @@@ -5809,13 -5789,6 +5809,13 @@@ 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</" @@@ -6234,7 -6207,7 +6234,7 @@@ msgstr " "unterstützt keine dieser Optionen." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:264 apt.conf.5.xml:328 + #: apt.conf.5.xml:264 apt.conf.5.xml:321 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method, this applies to all things including connection timeout and data " @@@ -6289,31 -6262,16 +6289,31 @@@ msgstr " "implizit das Herunterladen von mehreren Servern zur gleichen Zeit " "deaktiviert.)" +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:280 +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 " +"clients only if the client uses a known identifier." +msgstr "" + #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> - #: apt.conf.5.xml:286 + #: apt.conf.5.xml:281 msgid "https" msgstr "https" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:287 + #: apt.conf.5.xml:282 -msgid "" -"HTTPS URIs. Cache-control and proxy options are the same as for " -"<literal>http</literal> method. <literal>Pipeline-Depth</literal> option is " +#, 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 " +"default to the options from the <literal>http</literal> method if they are " +"not explicitly set for https. <literal>Pipeline-Depth</literal> option is " "not supported yet." msgstr "" "HTTPS-URIs. Zwischenspeichersteuerung und Proxy-Optionen entsprehen denen " @@@ -6321,7 -6279,7 +6321,7 @@@ "literal> wird noch nicht unterstützt." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:293 + #: apt.conf.5.xml:286 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is " @@@ -6360,12 -6318,12 +6360,12 @@@ msgstr " "SslForceVersion</literal> ist die entsprechende per-Host-Option." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> - #: apt.conf.5.xml:311 sources.list.5.xml:150 + #: apt.conf.5.xml:304 sources.list.5.xml:150 msgid "ftp" msgstr "ftp" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:312 + #: apt.conf.5.xml:305 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 " @@@ -6400,7 -6358,7 +6400,7 @@@ msgstr " "entsprechenden URI-Bestandteil genommen." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:331 + #: apt.conf.5.xml:324 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 " @@@ -6417,7 -6375,7 +6417,7 @@@ msgstr " "Beispielskonfiguration, um Beispiele zu erhalten)." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:338 + #: apt.conf.5.xml:331 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 " @@@ -6431,7 -6389,7 +6431,7 @@@ msgstr " "Effizienz nicht empfohlen FTP über HTTP zu benutzen." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:343 + #: apt.conf.5.xml:336 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@@ -6447,19 -6405,18 +6447,19 @@@ msgstr " "Server RFC2428 unterstützen." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> - #: apt.conf.5.xml:350 sources.list.5.xml:132 + #: apt.conf.5.xml:343 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:349 #, fuzzy, 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:344 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 " @@@ -6481,12 -6438,12 +6481,12 @@@ msgstr " "können per UMount angegeben werden." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> - #: apt.conf.5.xml:361 + #: apt.conf.5.xml:354 msgid "gpgv" msgstr "gpgv" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:362 + #: apt.conf.5.xml:355 msgid "" "GPGV URIs; the only option for GPGV URIs is the option to pass additional " "parameters to gpgv. <literal>gpgv::Options</literal> Additional options " @@@ -6497,18 -6454,18 +6497,18 @@@ msgstr " "Zusätzliche Parameter werden an gpgv weitergeleitet." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> - #: apt.conf.5.xml:367 + #: apt.conf.5.xml:360 msgid "CompressionTypes" msgstr "CompressionTypes" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> - #: apt.conf.5.xml:373 + #: apt.conf.5.xml:366 #, 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:368 + #: apt.conf.5.xml:361 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@@ -6528,19 -6485,19 +6528,19 @@@ msgstr " "\"synopsis\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> - #: apt.conf.5.xml:378 + #: apt.conf.5.xml:371 #, 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:374 #, 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:367 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 " @@@ -6562,7 -6519,7 +6562,7 @@@ msgstr " "Fehler fortfahren. Um daher einen nach dem anderen Typ vorzuziehen, fügen " "Sie einfach den bevorzugten Typ zuerst in die Liste – noch nicht " "hinzugefügte Standardtypen werden zur Laufzeit an das Ende der Liste " -"angehängt, so kann z.B. <placeholder type=\"synopsis\"id=\"0\"/> verwandt " +"angehängt, so kann z.B. <placeholder type=\"synopsis\" id=\"0\"/> verwandt " "werden, um <command>gzip</command>-komprimierte Dateien über <command>bzip2</" "command> und <command>lzma</command> zu bevorzugen. Falls <command>lzma</" "command> vor <command>gzip</command> und <command>bzip2</command> vorgezogen " @@@ -6571,13 -6528,13 +6571,13 @@@ "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:385 + #: apt.conf.5.xml:378 #, 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:376 msgid "" "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" "replaceable></literal> will be checked: If this setting exists the method " @@@ -6603,7 -6560,7 +6603,7 @@@ msgstr " "diesen Typ nur vor die Liste setzen." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:390 + #: apt.conf.5.xml:383 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 " @@@ -6619,53 -6576,6 +6619,53 @@@ msgstr " "unkomprimierte Dateien vorzuziehen, um den Gebrauch lokaler Spiegel zu " "unterstützen." +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:396 +msgid "Languages" +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:397 +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." +msgstr "" + +#. 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 "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:403 +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" +"\"/>" +msgstr "" + #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:217 msgid "" @@@ -6677,12 -6587,12 +6677,12 @@@ msgstr " "id=\"0\"/>" #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:420 + #: apt.conf.5.xml:392 msgid "Directories" msgstr "Verzeichnisse" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:422 + #: apt.conf.5.xml:394 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@@ -6702,7 -6612,7 +6702,7 @@@ msgstr " "filename> oder <filename>./</filename> beginnen." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:429 + #: apt.conf.5.xml:401 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@@ -6725,7 -6635,7 +6725,7 @@@ msgstr " "<literal>Dir::Cache</literal> enthalten." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:438 + #: apt.conf.5.xml:410 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@@ -6740,7 -6650,7 +6740,7 @@@ msgstr " "Konfigurationsdatei erfolgt)." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:444 + #: apt.conf.5.xml:416 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 " @@@ -6752,7 -6662,7 +6752,7 @@@ msgstr " "geladen." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:448 + #: apt.conf.5.xml:420 msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" "Bin::Methods</literal> specifies the location of the method handlers and " @@@ -6770,7 -6680,7 +6770,7 @@@ msgstr " "Programms an." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:456 + #: apt.conf.5.xml:428 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@@ -6790,12 -6700,12 +6790,12 @@@ msgstr " "<filename>/tmp/staging/var/lib/dpkg/status</filename> nachgesehen." #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:469 + #: apt.conf.5.xml:441 msgid "APT in DSelect" msgstr "APT in DSelect" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:471 + #: apt.conf.5.xml:443 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behaviour. These are in the <literal>DSelect</literal> " @@@ -6806,12 -6716,12 +6806,12 @@@ msgstr " "<literal>DSelect</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:475 + #: apt.conf.5.xml:447 msgid "Clean" msgstr "Clean" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:476 + #: apt.conf.5.xml:448 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 " @@@ -6829,7 -6739,7 +6829,7 @@@ msgstr " "Herunterladen neuer Pakete durch." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:485 + #: apt.conf.5.xml:457 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the install phase." @@@ -6838,12 -6748,12 +6838,12 @@@ msgstr " "übermittelt, wenn es für die Installationsphase durchlaufen wird." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:489 + #: apt.conf.5.xml:461 msgid "Updateoptions" msgstr "Updateoptions" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:490 + #: apt.conf.5.xml:462 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the update phase." @@@ -6852,12 -6762,12 +6852,12 @@@ msgstr " "übermittelt, wenn es für die Aktualisierungsphase durchlaufen wird." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:494 + #: apt.conf.5.xml:466 msgid "PromptAfterUpdate" msgstr "PromptAfterUpdate" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:495 + #: apt.conf.5.xml:467 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." @@@ -6866,12 -6776,12 +6866,12 @@@ msgstr " "nachfragen, um fortzufahren. Vorgabe ist es, nur bei Fehlern nachzufragen." #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:501 + #: apt.conf.5.xml:473 msgid "How APT calls dpkg" msgstr "Wie APT Dpkg aufruft" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:502 + #: apt.conf.5.xml:474 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." @@@ -6880,7 -6790,7 +6880,7 @@@ msgstr " "stehen im Abschnitt <literal>DPkg</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:507 + #: apt.conf.5.xml:479 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 " @@@ -6891,17 -6801,17 +6891,17 @@@ msgstr " "jedes Listenelement wird als einzelnes Argument an &dpkg; übermittelt." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:512 + #: apt.conf.5.xml:484 msgid "Pre-Invoke" msgstr "Pre-Invoke" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:512 + #: apt.conf.5.xml:484 msgid "Post-Invoke" msgstr "Post-Invoke" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:513 + #: apt.conf.5.xml:485 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 " @@@ -6915,12 -6825,12 +6915,12 @@@ msgstr " "APT abgebrochen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:519 + #: apt.conf.5.xml:491 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:492 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 " @@@ -6937,7 -6847,7 +6937,7 @@@ msgstr " "pro Zeile." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:526 + #: apt.conf.5.xml:498 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@@ -6953,12 -6863,12 +6953,12 @@@ msgstr " "literal> gegeben wird." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:533 + #: apt.conf.5.xml:505 msgid "Run-Directory" msgstr "Run-Directory" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:534 + #: apt.conf.5.xml:506 msgid "" "APT chdirs to this directory before invoking dpkg, the default is <filename>/" "</filename>." @@@ -6967,12 -6877,12 +6967,12 @@@ msgstr " "die Vorgabe ist <filename>/</filename>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:538 + #: apt.conf.5.xml:510 msgid "Build-options" msgstr "Build-options" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:539 + #: apt.conf.5.xml:511 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages, the " "default is to disable signing and produce all binaries." @@@ -6982,12 -6892,12 +6982,12 @@@ msgstr " "Programme werden erstellt." #. type: Content of: <refentry><refsect1><refsect2><title> - #: apt.conf.5.xml:544 + #: apt.conf.5.xml:516 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:545 + #: apt.conf.5.xml:517 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 " @@@ -7013,7 -6923,7 +7013,7 @@@ msgstr " "Status 100% stehen, während es aktuell alle Pakete konfiguriert." #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> - #: apt.conf.5.xml:560 + #: apt.conf.5.xml:532 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@@ -7027,7 -6937,7 +7027,7 @@@ msgstr " "DPkg::TriggersPending \"true\";" #. type: Content of: <refentry><refsect1><refsect2><para> - #: apt.conf.5.xml:554 + #: apt.conf.5.xml:526 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 " @@@ -7052,12 -6962,12 +7052,12 @@@ msgstr " "wäre <placeholder type=\"literallayout\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> - #: apt.conf.5.xml:566 + #: apt.conf.5.xml:538 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:539 #, fuzzy #| msgid "" #| "Add the no triggers flag to all dpkg calls (expect the ConfigurePending " @@@ -7088,12 -6998,12 +7088,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:574 + #: apt.conf.5.xml:546 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:547 #, fuzzy #| msgid "" #| "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " @@@ -7136,12 -7046,12 +7136,12 @@@ msgstr " "mehr startbar sein könnte." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> - #: apt.conf.5.xml:585 + #: apt.conf.5.xml:557 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:558 #, fuzzy #| msgid "" #| "If this option is set apt will call <command>dpkg --configure --pending</" @@@ -7168,12 -7078,12 +7168,12 @@@ msgstr " "deaktivieren." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> - #: apt.conf.5.xml:592 + #: apt.conf.5.xml:564 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:565 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@@ -7189,12 -7099,12 +7189,12 @@@ msgstr " "benötigt werden." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> - #: apt.conf.5.xml:598 + #: apt.conf.5.xml:570 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:571 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-" @@@ -7213,12 -7123,12 +7213,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:606 + #: apt.conf.5.xml:578 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:586 #, no-wrap msgid "" "OrderList::Score {\n" @@@ -7236,7 -7146,7 +7236,7 @@@ msgstr " "};" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:607 + #: apt.conf.5.xml:579 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 " @@@ -7260,12 -7170,12 +7260,12 @@@ msgstr " "mit ihren Vorgabewerten. <placeholder type=\"literallayout\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:627 + #: apt.conf.5.xml:599 msgid "Periodic and Archives options" msgstr "Periodische- und Archivoptionen" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:628 + #: apt.conf.5.xml:600 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@@ -7279,12 -7189,12 +7279,12 @@@ msgstr " "Dokumentation dieser Optionen zu erhalten." #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:636 + #: apt.conf.5.xml:608 msgid "Debug options" msgstr "Fehlersuchoptionen" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:638 + #: apt.conf.5.xml:610 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@@ -7302,7 -7212,7 +7302,7 @@@ msgstr " "könnten es sein:" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> - #: apt.conf.5.xml:649 + #: apt.conf.5.xml:621 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@@ -7313,7 -7223,7 +7313,7 @@@ msgstr " "getroffenen Entscheidungen ein." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> - #: apt.conf.5.xml:657 + #: apt.conf.5.xml:629 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@@ -7324,7 -7234,7 +7324,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:666 + #: apt.conf.5.xml:638 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@@ -7336,7 -7246,7 +7336,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:674 + #: apt.conf.5.xml:646 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CDROM IDs." @@@ -7345,17 -7255,17 +7345,17 @@@ msgstr " "Daten in CDROM-IDs aus." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:684 + #: apt.conf.5.xml:656 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:689 + #: apt.conf.5.xml:661 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 + #: apt.conf.5.xml:665 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" @@@ -7363,48 -7273,48 +7363,48 @@@ "literal>-Quellen beziehen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:700 + #: apt.conf.5.xml:672 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:676 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:711 + #: apt.conf.5.xml:683 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:687 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:722 + #: apt.conf.5.xml:694 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:698 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:733 + #: apt.conf.5.xml:705 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:709 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." @@@ -7413,12 -7323,12 +7413,12 @@@ msgstr " "mittels <literal>gpg</literal> beziehen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:744 + #: apt.conf.5.xml:716 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:720 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." @@@ -7427,23 -7337,23 +7427,23 @@@ msgstr " "CD-ROMs gespeichert sind." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:755 + #: apt.conf.5.xml:727 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:730 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:765 + #: apt.conf.5.xml:737 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:740 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." @@@ -7452,12 -7362,12 +7452,12 @@@ msgstr " "Bibliotheken generiert wurde." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:775 + #: apt.conf.5.xml:747 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:750 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 " @@@ -7468,12 -7378,12 +7468,12 @@@ msgstr " "ID für eine CD-ROM generiert wird." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:786 + #: apt.conf.5.xml:758 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:761 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." @@@ -7483,24 -7393,24 +7483,24 @@@ msgstr " "gleichen Zeit laufen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:797 + #: apt.conf.5.xml:769 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:773 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:808 + #: apt.conf.5.xml:780 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:783 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." @@@ -7509,12 -7419,12 +7509,12 @@@ msgstr " "und kryptografischen Signaturen von heruntergeladenen Dateien beziehen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:818 + #: apt.conf.5.xml:790 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:793 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." @@@ -7523,12 -7433,12 +7523,12 @@@ msgstr " "und Fehler, die die Paketindexlisten-Diffs betreffen, ausgeben." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:829 + #: apt.conf.5.xml:801 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:805 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." @@@ -7538,12 -7448,12 +7538,12 @@@ msgstr " "werden." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:840 + #: apt.conf.5.xml:812 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 + #: apt.conf.5.xml:816 msgid "" "Log all interactions with the sub-processes that actually perform downloads." msgstr "" @@@ -7551,12 -7461,12 +7551,12 @@@ "durchführen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:851 + #: apt.conf.5.xml:823 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:827 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." @@@ -7566,12 -7476,12 +7566,12 @@@ msgstr " "beziehen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:862 + #: apt.conf.5.xml:834 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:837 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@@ -7587,12 -7497,12 +7587,12 @@@ msgstr " "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:876 + #: apt.conf.5.xml:848 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:851 msgid "" "Generate debug messages describing which package is marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@@ -7624,23 -7534,23 +7624,23 @@@ msgstr " "erscheint." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:898 + #: apt.conf.5.xml:870 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:873 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:908 + #: apt.conf.5.xml:880 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:883 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." @@@ -7650,12 -7560,12 +7650,12 @@@ msgstr " "sind." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:919 + #: apt.conf.5.xml:891 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:894 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." @@@ -7664,12 -7574,12 +7664,12 @@@ msgstr " "alle während deren Auswertung gefundenen Fehler ausgeben." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:929 + #: apt.conf.5.xml:901 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:905 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." @@@ -7679,12 -7589,12 +7679,12 @@@ msgstr " "soll." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:941 + #: apt.conf.5.xml:913 msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "<literal>Debug::pkgPackageManager</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:945 + #: apt.conf.5.xml:917 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" @@@ -7692,22 -7602,22 +7692,22 @@@ "von &dpkg; ausgeführt werden." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:952 + #: apt.conf.5.xml:924 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:928 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:962 + #: apt.conf.5.xml:934 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:938 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." @@@ -7717,12 -7627,12 +7717,12 @@@ msgstr " "aufgetreten ist)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:974 + #: apt.conf.5.xml:946 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:949 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 " @@@ -7734,12 -7644,12 +7734,12 @@@ msgstr " "beschrieben." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:985 + #: apt.conf.5.xml:957 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:961 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." @@@ -7748,7 -7658,7 +7748,7 @@@ msgstr " "gelesenen Anbieter ausgeben." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:1012 + #: apt.conf.5.xml:983 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." @@@ -7757,13 -7667,13 +7757,13 @@@ msgstr " "möglichen Optionen zeigen." #. type: Content of: <refentry><refsect1><variablelist> - #: apt.conf.5.xml:1019 + #: apt.conf.5.xml:990 msgid "&file-aptconf;" msgstr "&file-aptconf;" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:1024 + #: apt.conf.5.xml:995 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-cache;, &apt-config;, &apt-preferences;." diff --combined doc/po/es.po index 266f69c02,d80f57e65..d79d8d0ec --- a/doc/po/es.po +++ b/doc/po/es.po @@@ -14,7 -14,7 +14,7 @@@ msgid "" msgstr "" "Project-Id-Version: apt\n" - "POT-Creation-Date: 2009-11-27 00:05+0100\n" + "POT-Creation-Date: 2009-12-10 22:04+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" @@@ -1494,7 -1494,7 +1494,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:456 apt.conf.5.xml:478 +#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:484 apt.conf.5.xml:506 #, fuzzy msgid "options" msgstr "Opciones" @@@ -1770,7 -1770,7 +1770,7 @@@ msgstr " #. 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.conf.5.xml:988 apt_preferences.5.xml:615 #, fuzzy msgid "Files" msgstr "Ficheros" @@@ -1784,7 -1784,7 +1784,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: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-sortpkgs.1.xml:69 apt.conf.5.xml:994 apt_preferences.5.xml:622 #: sources.list.5.xml:233 #, fuzzy msgid "See Also" @@@ -3284,7 -3284,7 +3284,7 @@@ msgid " msgstr "" #. 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:561 apt.conf.5.xml:982 apt_preferences.5.xml:462 #: sources.list.5.xml:193 #, fuzzy msgid "Examples" @@@ -5728,7 -5728,7 +5728,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:264 apt.conf.5.xml:328 + #: apt.conf.5.xml:264 apt.conf.5.xml:321 #, fuzzy msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " @@@ -5769,32 -5769,22 +5769,32 @@@ msgid " "multiple servers at the same time.)" msgstr "" +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:280 +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 " +"clients only if the client uses a known identifier." +msgstr "" + #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> - #: apt.conf.5.xml:286 + #: apt.conf.5.xml:281 #, fuzzy msgid "https" msgstr "http" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:287 + #: apt.conf.5.xml:282 msgid "" -"HTTPS URIs. Cache-control and proxy options are the same as for " -"<literal>http</literal> method. <literal>Pipeline-Depth</literal> option is " +"HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy " +"options are the same as for <literal>http</literal> method and will also " +"default to the options from the <literal>http</literal> method if they are " +"not explicitly set for https. <literal>Pipeline-Depth</literal> option is " "not supported yet." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:293 + #: apt.conf.5.xml:286 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is " @@@ -5815,13 -5805,13 +5815,13 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> - #: apt.conf.5.xml:311 sources.list.5.xml:150 + #: apt.conf.5.xml:304 sources.list.5.xml:150 #, fuzzy msgid "ftp" msgstr "ftp" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:312 + #: apt.conf.5.xml:305 #, fuzzy msgid "" "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard " @@@ -5853,7 -5843,7 +5853,7 @@@ msgstr " "de la URI correspondiente." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:331 + #: apt.conf.5.xml:324 #, fuzzy msgid "" "Several settings are provided to control passive mode. Generally it is safe " @@@ -5870,7 -5860,7 +5870,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:338 + #: apt.conf.5.xml:331 #, fuzzy msgid "" "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</" @@@ -5885,7 -5875,7 +5885,7 @@@ msgstr " "eficiencia." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:343 + #: apt.conf.5.xml:336 #, fuzzy msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " @@@ -5901,19 -5891,19 +5901,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:350 sources.list.5.xml:132 + #: apt.conf.5.xml:343 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:356 + #: apt.conf.5.xml:349 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:351 + #: apt.conf.5.xml:344 #, fuzzy msgid "" "CDROM URIs; the only setting for CDROM URIs is the mount point, " @@@ -5933,12 -5923,12 +5933,12 @@@ msgstr " "antiguas). Respecto a la sintaxis se pone" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> - #: apt.conf.5.xml:361 + #: apt.conf.5.xml:354 msgid "gpgv" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:362 + #: apt.conf.5.xml:355 msgid "" "GPGV URIs; the only option for GPGV URIs is the option to pass additional " "parameters to gpgv. <literal>gpgv::Options</literal> Additional options " @@@ -5946,18 -5936,18 +5946,18 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> - #: apt.conf.5.xml:367 + #: apt.conf.5.xml:360 msgid "CompressionTypes" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> - #: apt.conf.5.xml:373 + #: apt.conf.5.xml:366 #, 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:368 + #: apt.conf.5.xml:361 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@@ -5969,19 -5959,19 +5969,19 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> - #: apt.conf.5.xml:378 + #: apt.conf.5.xml:371 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> - #: apt.conf.5.xml:381 + #: apt.conf.5.xml:374 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:374 + #: apt.conf.5.xml:367 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 " @@@ -5998,13 -5988,13 +5998,13 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> - #: apt.conf.5.xml:385 + #: apt.conf.5.xml:378 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:383 + #: apt.conf.5.xml:376 msgid "" "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" "replaceable></literal> will be checked: If this setting exists the method " @@@ -6019,7 -6009,7 +6019,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:390 + #: apt.conf.5.xml:383 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 " @@@ -6028,53 -6018,6 +6028,53 @@@ "prefer uncompressed files to support the usage of local mirrors." msgstr "" +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:396 +msgid "Languages" +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:397 +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." +msgstr "" + +#. 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 "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:403 +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" +"\"/>" +msgstr "" + #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:217 #, fuzzy @@@ -6086,13 -6029,13 +6086,13 @@@ msgstr " "paquetes y los manejadores de URI." #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:420 + #: apt.conf.5.xml:392 #, fuzzy msgid "Directories" msgstr "Directorios" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:422 + #: apt.conf.5.xml:394 #, fuzzy msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " @@@ -6113,7 -6056,7 +6113,7 @@@ msgstr " "filename> o <filename>./</filename>." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:429 + #: apt.conf.5.xml:401 #, fuzzy msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " @@@ -6135,7 -6078,7 +6135,7 @@@ msgstr " "literal> el directorio predeterminado está en <literal>Dir::Cache</literal>" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:438 + #: apt.conf.5.xml:410 #, fuzzy msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " @@@ -6152,7 -6095,7 +6152,7 @@@ msgstr " "envar>)." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:444 + #: apt.conf.5.xml:416 #, fuzzy msgid "" "The <literal>Dir::Parts</literal> setting reads in all the config fragments " @@@ -6164,7 -6107,7 +6164,7 @@@ msgstr " "esto se carga el fichero principal de configuración." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:448 + #: apt.conf.5.xml:420 #, fuzzy msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" @@@ -6182,7 -6125,7 +6182,7 @@@ msgstr " "respectivos programas." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:456 + #: apt.conf.5.xml:428 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@@ -6195,13 -6138,13 +6195,13 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:469 + #: apt.conf.5.xml:441 #, fuzzy msgid "APT in DSelect" msgstr "APT con DSelect" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:471 + #: apt.conf.5.xml:443 #, fuzzy msgid "" "When APT is used as a &dselect; method several configuration directives " @@@ -6213,13 -6156,13 +6213,13 @@@ msgstr " "la sección <literal>DSelect</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:475 + #: apt.conf.5.xml:447 #, fuzzy msgid "Clean" msgstr "clean" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:476 + #: apt.conf.5.xml:448 #, fuzzy msgid "" "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto " @@@ -6237,7 -6180,7 +6237,7 @@@ msgstr " "descargar los paquetes nuevos." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:485 + #: apt.conf.5.xml:457 #, fuzzy msgid "" "The contents of this variable is passed to &apt-get; as command line options " @@@ -6247,13 -6190,13 +6247,13 @@@ msgstr " "ordenes cuando se ejecuta en la fase de instalación." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:489 + #: apt.conf.5.xml:461 #, fuzzy msgid "Updateoptions" msgstr "Opciones" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:490 + #: apt.conf.5.xml:462 #, fuzzy msgid "" "The contents of this variable is passed to &apt-get; as command line options " @@@ -6263,13 -6206,13 +6263,13 @@@ msgstr " "ordenes cuando se ejecuta en la fase de actualización." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:494 + #: apt.conf.5.xml:466 #, fuzzy msgid "PromptAfterUpdate" msgstr "PromptAfterUpdate" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:495 + #: apt.conf.5.xml:467 #, fuzzy msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " @@@ -6279,13 -6222,13 +6279,13 @@@ msgstr " "continuar. Por omisión sólo pregunta en caso de error." #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:501 + #: apt.conf.5.xml:473 #, fuzzy msgid "How APT calls dpkg" msgstr "Como APT llama a dpkg" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:502 + #: apt.conf.5.xml:474 #, fuzzy msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " @@@ -6295,7 -6238,7 +6295,7 @@@ msgstr " "encuentran en la sección <literal>DPkg</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:507 + #: apt.conf.5.xml:479 #, fuzzy msgid "" "This is a list of options to pass to dpkg. The options must be specified " @@@ -6307,19 -6250,19 +6307,19 @@@ msgstr " "como un sólo argumento." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:512 + #: apt.conf.5.xml:484 #, fuzzy msgid "Pre-Invoke" msgstr "Pre-Invoke" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:512 + #: apt.conf.5.xml:484 #, fuzzy msgid "Post-Invoke" msgstr "Post-Invoke" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:513 + #: apt.conf.5.xml:485 #, fuzzy msgid "" "This is a list of shell commands to run before/after invoking &dpkg;. Like " @@@ -6333,13 -6276,13 +6333,13 @@@ msgstr " "si alguna falla APT abortará." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:519 + #: apt.conf.5.xml:491 #, fuzzy 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:492 #, fuzzy msgid "" "This is a list of shell commands to run before invoking dpkg. Like " @@@ -6355,7 -6298,7 +6355,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:526 + #: apt.conf.5.xml:498 #, fuzzy msgid "" "Version 2 of this protocol dumps more information, including the protocol " @@@ -6371,13 -6314,13 +6371,13 @@@ msgstr " "dada a <literal>Pre-Install-Pkgs</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:533 + #: apt.conf.5.xml:505 #, fuzzy msgid "Run-Directory" msgstr "Run-Directory" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:534 + #: apt.conf.5.xml:506 #, fuzzy msgid "" "APT chdirs to this directory before invoking dpkg, the default is <filename>/" @@@ -6387,13 -6330,13 +6387,13 @@@ msgstr " "omisión es <filename>/</filename>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:538 + #: apt.conf.5.xml:510 #, fuzzy msgid "Build-options" msgstr "Opciones" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:539 + #: apt.conf.5.xml:511 #, fuzzy msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages, the " @@@ -6404,12 -6347,12 +6404,12 @@@ msgstr " "binarios." #. type: Content of: <refentry><refsect1><refsect2><title> - #: apt.conf.5.xml:544 + #: apt.conf.5.xml:516 msgid "dpkg trigger usage (and related options)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> - #: apt.conf.5.xml:545 + #: apt.conf.5.xml:517 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 " @@@ -6424,7 -6367,7 +6424,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> - #: apt.conf.5.xml:560 + #: apt.conf.5.xml:532 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@@ -6434,7 -6377,7 +6434,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> - #: apt.conf.5.xml:554 + #: apt.conf.5.xml:526 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 " @@@ -6448,12 -6391,12 +6448,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> - #: apt.conf.5.xml:566 + #: apt.conf.5.xml:538 msgid "DPkg::NoTriggers" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:567 + #: apt.conf.5.xml:539 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 " @@@ -6465,12 -6408,12 +6465,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> - #: apt.conf.5.xml:574 + #: apt.conf.5.xml:546 msgid "PackageManager::Configure" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:575 + #: apt.conf.5.xml:547 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@@ -6486,12 -6429,12 +6486,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> - #: apt.conf.5.xml:585 + #: apt.conf.5.xml:557 msgid "DPkg::ConfigurePending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:586 + #: apt.conf.5.xml:558 msgid "" "If this option is set apt will call <command>dpkg --configure --pending</" "command> to let dpkg handle all required configurations and triggers. This " @@@ -6502,12 -6445,12 +6502,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> - #: apt.conf.5.xml:592 + #: apt.conf.5.xml:564 msgid "DPkg::TriggersPending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:593 + #: apt.conf.5.xml:565 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@@ -6517,12 -6460,12 +6517,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> - #: apt.conf.5.xml:598 + #: apt.conf.5.xml:570 msgid "PackageManager::UnpackAll" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:599 + #: apt.conf.5.xml:571 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-" @@@ -6534,12 -6477,12 +6534,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> - #: apt.conf.5.xml:606 + #: apt.conf.5.xml:578 msgid "OrderList::Score::Immediate" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> - #: apt.conf.5.xml:614 + #: apt.conf.5.xml:586 #, no-wrap msgid "" "OrderList::Score {\n" @@@ -6551,7 -6494,7 +6551,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:607 + #: apt.conf.5.xml:579 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 " @@@ -6565,12 -6508,12 +6565,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:627 + #: apt.conf.5.xml:599 msgid "Periodic and Archives options" msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:628 + #: apt.conf.5.xml:600 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@@ -6579,13 -6522,13 +6579,13 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:636 + #: apt.conf.5.xml:608 #, fuzzy msgid "Debug options" msgstr "Opciones" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:638 + #: apt.conf.5.xml:610 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@@ -6596,7 -6539,7 +6596,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> - #: apt.conf.5.xml:649 + #: apt.conf.5.xml:621 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@@ -6604,7 -6547,7 +6604,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> - #: apt.conf.5.xml:657 + #: apt.conf.5.xml:629 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@@ -6612,7 -6555,7 +6612,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> - #: apt.conf.5.xml:666 + #: apt.conf.5.xml:638 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@@ -6622,120 -6565,120 +6622,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:674 + #: apt.conf.5.xml:646 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:684 + #: apt.conf.5.xml:656 msgid "A full list of debugging options to apt follows." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:689 + #: apt.conf.5.xml:661 #, 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:693 + #: apt.conf.5.xml:665 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:700 + #: apt.conf.5.xml:672 #, 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:704 + #: apt.conf.5.xml:676 msgid "Print information related to downloading packages using FTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:711 + #: apt.conf.5.xml:683 #, 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:715 + #: apt.conf.5.xml:687 msgid "Print information related to downloading packages using HTTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:722 + #: apt.conf.5.xml:694 #, 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:726 + #: apt.conf.5.xml:698 msgid "Print information related to downloading packages using HTTPS." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:733 + #: apt.conf.5.xml:705 #, 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:737 + #: apt.conf.5.xml:709 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:744 + #: apt.conf.5.xml:716 #, 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:748 + #: apt.conf.5.xml:720 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:755 + #: apt.conf.5.xml:727 #, 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:758 + #: apt.conf.5.xml:730 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:765 + #: apt.conf.5.xml:737 #, 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:768 + #: apt.conf.5.xml:740 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:775 + #: apt.conf.5.xml:747 #, 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:778 + #: apt.conf.5.xml:750 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 " @@@ -6743,99 -6686,99 +6743,99 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:786 + #: apt.conf.5.xml:758 #, 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:789 + #: apt.conf.5.xml:761 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:797 + #: apt.conf.5.xml:769 #, 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:801 + #: apt.conf.5.xml:773 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:808 + #: apt.conf.5.xml:780 #, 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:811 + #: apt.conf.5.xml:783 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:818 + #: apt.conf.5.xml:790 #, 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:821 + #: apt.conf.5.xml:793 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:829 + #: apt.conf.5.xml:801 #, 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:833 + #: apt.conf.5.xml:805 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:840 + #: apt.conf.5.xml:812 #, 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:844 + #: apt.conf.5.xml:816 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:851 + #: apt.conf.5.xml:823 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:855 + #: apt.conf.5.xml:827 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:862 + #: apt.conf.5.xml:834 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:865 + #: apt.conf.5.xml:837 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@@ -6845,12 -6788,12 +6845,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:876 + #: apt.conf.5.xml:848 msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:879 + #: apt.conf.5.xml:851 msgid "" "Generate debug messages describing which package is marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@@ -6867,96 -6810,96 +6867,96 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:898 + #: apt.conf.5.xml:870 #, 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:901 + #: apt.conf.5.xml:873 msgid "Dump the default configuration to standard error on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:908 + #: apt.conf.5.xml:880 #, 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:911 + #: apt.conf.5.xml:883 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:919 + #: apt.conf.5.xml:891 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:922 + #: apt.conf.5.xml:894 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:929 + #: apt.conf.5.xml:901 #, 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:933 + #: apt.conf.5.xml:905 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:941 + #: apt.conf.5.xml:913 #, 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:945 + #: apt.conf.5.xml:917 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:952 + #: apt.conf.5.xml:924 #, 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:956 + #: apt.conf.5.xml:928 msgid "Output the priority of each package list on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:962 + #: apt.conf.5.xml:934 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:966 + #: apt.conf.5.xml:938 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:974 + #: apt.conf.5.xml:946 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:977 + #: apt.conf.5.xml:949 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 " @@@ -6964,20 -6907,20 +6964,20 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:985 + #: apt.conf.5.xml:957 #, 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:989 + #: apt.conf.5.xml:961 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:1012 + #: apt.conf.5.xml:983 #, fuzzy msgid "" "&configureindex; is a configuration file showing example values for all " @@@ -6987,14 -6930,14 +6987,14 @@@ msgstr " "los valores predeterminados para todas las opciones posibles." #. type: Content of: <refentry><refsect1><variablelist> - #: apt.conf.5.xml:1019 + #: apt.conf.5.xml:990 #, fuzzy msgid "&file-aptconf;" msgstr "apt-cdrom" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:1024 + #: apt.conf.5.xml:995 #, fuzzy msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-cache; &apt-conf;" @@@ -9866,6 -9809,6 +9866,10 @@@ msgstr " msgid "Which will use the already fetched archives on the disc." msgstr "" ++#, fuzzy ++#~ msgid "<option>APT::FTPArchive::AlwaysStat</option>" ++#~ msgstr "<option>--all-versions</option>" ++ #, fuzzy #~ msgid "/usr/share/doc/apt/" #~ msgstr "/usr/share/doc/apt/" diff --combined doc/po/fr.po index 49dc38f7f,fbdf0b2db..0bc12a321 --- a/doc/po/fr.po +++ b/doc/po/fr.po @@@ -9,7 -9,7 +9,7 @@@ msgid "" msgstr "" "Project-Id-Version: \n" - "POT-Creation-Date: 2009-11-27 00:05+0100\n" + "POT-Creation-Date: 2009-12-10 22:04+0100\n" "PO-Revision-Date: 2009-09-26 19:25+0200\n" "Last-Translator: Christian Perrier <bubulle@debian.org>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" @@@ -696,7 -696,6 +696,6 @@@ msgstr " "<!ENTITY apt-author.team \"\n" " <author>\n" " <othername>Équipe de développement d'APT</othername>\n" - " <contrib></contrib>\n" " </author>\n" "\">\n" @@@ -1586,10 -1585,6 +1585,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 " @@@ -1709,7 -1704,7 +1704,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:456 apt.conf.5.xml:478 +#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:484 apt.conf.5.xml:506 msgid "options" msgstr "options" @@@ -1955,7 -1950,7 +1950,7 @@@ 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.conf.5.xml:988 apt_preferences.5.xml:615 msgid "Files" msgstr "Fichiers" @@@ -1968,7 -1963,7 +1963,7 @@@ msgstr "&file-sourceslist; &file-statel #: 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-sortpkgs.1.xml:69 apt.conf.5.xml:994 apt_preferences.5.xml:622 #: sources.list.5.xml:233 msgid "See Also" msgstr "Voir aussi" @@@ -2477,9 -2472,6 +2472,6 @@@ msgstr " #. type: Content of: <refentry><refentryinfo> #: apt-ftparchive.1.xml:13 #, fuzzy - #| 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>" @@@ -3597,7 -3589,7 +3589,7 @@@ msgid " msgstr "" #. 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:561 apt.conf.5.xml:982 apt_preferences.5.xml:462 #: sources.list.5.xml:193 msgid "Examples" msgstr "Exemples" @@@ -3993,14 -3985,6 +3985,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 " @@@ -4315,14 -4299,6 +4299,6 @@@ msgstr " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:386 #, fuzzy - #| 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 " @@@ -4999,9 -4975,6 +4975,6 @@@ msgstr "&apt-get;, &apt-secure; #. type: Content of: <refentry><refentryinfo> #: apt-mark.8.xml:13 #, fuzzy - #| 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>" @@@ -5022,11 -4995,6 +4995,6 @@@ msgstr "marquer/démarquer un paquet co #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> #: apt-mark.8.xml:36 #, fuzzy - #| 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" @@@ -5052,12 -5020,6 +5020,6 @@@ msgstr " #. type: Content of: <refentry><refsect1><para> #: apt-mark.8.xml:57 #, fuzzy - #| 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 " @@@ -5110,10 -5072,6 +5072,6 @@@ msgstr " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-mark.8.xml:82 #, fuzzy - #| 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." @@@ -5125,7 -5083,6 +5083,6 @@@ msgstr " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-mark.8.xml:93 #, fuzzy - #| msgid "<option>-f=<filename>FILENAME</filename></option>" msgid "" "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>" msgstr "<option>-f=<filename>FICHIER</filename></option>" @@@ -5133,7 -5090,6 +5090,6 @@@ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-mark.8.xml:94 #, fuzzy - #| msgid "<option>--file=<filename>FILENAME</filename></option>" msgid "" "<option>--file=<filename><replaceable>FILENAME</replaceable></filename></" "option>" @@@ -5142,11 -5098,6 +5098,6 @@@ msgstr "<option>--file=<filename>FICHIE #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-mark.8.xml:97 #, fuzzy - #| 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 " @@@ -5191,7 -5142,6 +5142,6 @@@ msgstr "Afficher la version du programm #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-mark.8.xml:124 #, fuzzy - #| msgid "<filename>/etc/apt/preferences</filename>" msgid "<filename>/var/lib/apt/extended_states</filename>" msgstr "<filename>/etc/apt/preferences</filename>" @@@ -5206,7 -5156,6 +5156,6 @@@ msgstr " #. type: Content of: <refentry><refsect1><para> #: apt-mark.8.xml:134 #, fuzzy - #| msgid "&apt-cache; &apt-conf;" msgid "&apt-get;,&aptitude;,&apt-conf;" msgstr "&apt-cache; &apt-conf;" @@@ -5386,11 -5335,11 +5335,11 @@@ msgid " "element (router, switch, etc.) or by redirecting traffic to a rogue server " "(through arp or DNS spoofing attacks)." msgstr "" - "<literal>Attaque réseau de type <quote>homme au milieu</quote></literal>. " - "Sans vérification de signature, quelqu'un de malveillant peut s'introduire " - "au milieu du processus de téléchargement et insérer du code soit en " - "contrôlant un élément du réseau, routeur, commutateur, etc. soit en " - "détournant le trafic vers un serveur fourbe (par usurpation d'adresses)." + "<literal>Attaque réseau de type « homme au milieu »</literal>. Sans " + "vérification de signature, quelqu'un de malveillant peut s'introduire au " + "milieu du processus de téléchargement et insérer du code soit en contrôlant " + "un élément du réseau, routeur, commutateur, etc. soit en détournant le " + "trafic vers un serveur fourbe (par usurpation d'adresses)." #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para> #: apt-secure.8.xml:122 @@@ -5630,11 -5579,6 +5579,6 @@@ msgstr " #. 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>" msgid "" "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</" "firstname> <surname>Burrows</surname> <contrib>Initial documentation of " @@@ -5711,14 -5655,6 +5655,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 " @@@ -5810,13 -5746,6 +5746,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 descendents are " - #| "erased." msgid "" "Two specials are allowed, <literal>#include</literal> (which is deprecated " "and not supported by alternative implementations) and <literal>#clear</" @@@ -5846,12 -5775,6 +5775,6 @@@ msgstr " #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:111 #, fuzzy - #| 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." 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 " @@@ -6178,13 -6101,6 +6101,6 @@@ msgstr "http #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:246 #, fuzzy - #| 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." 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 " @@@ -6228,7 -6144,7 +6144,7 @@@ 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:264 apt.conf.5.xml:321 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method, this applies to all things including connection timeout and data " @@@ -6276,31 -6192,16 +6192,31 @@@ msgid " "multiple servers at the same time.)" msgstr "" +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:280 +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 " +"clients only if the client uses a known identifier." +msgstr "" + #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> - #: apt.conf.5.xml:286 + #: apt.conf.5.xml:281 msgid "https" msgstr "https" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:287 + #: apt.conf.5.xml:282 -msgid "" -"HTTPS URIs. Cache-control and proxy options are the same as for " -"<literal>http</literal> method. <literal>Pipeline-Depth</literal> option is " +#, 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 " +"default to the options from the <literal>http</literal> method if they are " +"not explicitly set for https. <literal>Pipeline-Depth</literal> option is " "not supported yet." msgstr "" "URI HTTPS. Les options de contrôle de cache et de mandataire (proxy) sont " @@@ -6308,7 -6209,7 +6224,7 @@@ "<literal>Pipeline-Depth</literal> n'est pas encore supportée." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:293 + #: apt.conf.5.xml:286 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is " @@@ -6340,25 -6241,13 +6256,13 @@@ 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:304 sources.list.5.xml:150 msgid "ftp" msgstr "ftp" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:312 + #: apt.conf.5.xml:305 #, fuzzy - #| 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." 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 " @@@ -6393,7 -6282,7 +6297,7 @@@ msgstr " "respectif de l'URI." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:331 + #: apt.conf.5.xml:324 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 " @@@ -6410,7 -6299,7 +6314,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:331 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 " @@@ -6425,7 -6314,7 +6329,7 @@@ msgstr " "de cette méthode." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:343 + #: apt.conf.5.xml:336 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@@ -6441,19 -6330,18 +6345,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:343 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:349 #, fuzzy, 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:344 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 " @@@ -6475,12 -6363,12 +6378,12 @@@ msgstr " "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:354 msgid "gpgv" msgstr "gpgv" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:362 + #: apt.conf.5.xml:355 msgid "" "GPGV URIs; the only option for GPGV URIs is the option to pass additional " "parameters to gpgv. <literal>gpgv::Options</literal> Additional options " @@@ -6491,18 -6379,18 +6394,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:360 msgid "CompressionTypes" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> - #: apt.conf.5.xml:373 + #: apt.conf.5.xml:366 #, 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:368 + #: apt.conf.5.xml:361 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@@ -6514,19 -6402,19 +6417,19 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> - #: apt.conf.5.xml:378 + #: apt.conf.5.xml:371 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> - #: apt.conf.5.xml:381 + #: apt.conf.5.xml:374 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:374 + #: apt.conf.5.xml:367 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 " @@@ -6543,13 -6431,13 +6446,13 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> - #: apt.conf.5.xml:385 + #: apt.conf.5.xml:378 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:383 + #: apt.conf.5.xml:376 msgid "" "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" "replaceable></literal> will be checked: If this setting exists the method " @@@ -6564,7 -6452,7 +6467,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:390 + #: apt.conf.5.xml:383 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 " @@@ -6573,53 -6461,6 +6476,53 @@@ "prefer uncompressed files to support the usage of local mirrors." msgstr "" +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:396 +msgid "Languages" +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:397 +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." +msgstr "" + +#. 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 "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:403 +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" +"\"/>" +msgstr "" + #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:217 msgid "" @@@ -6631,12 -6472,12 +6534,12 @@@ msgstr " "id=\"0\"/>" #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:420 + #: apt.conf.5.xml:392 msgid "Directories" msgstr "Les répertoires" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:422 + #: apt.conf.5.xml:394 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@@ -6656,7 -6497,7 +6559,7 @@@ msgstr " "filename>." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:429 + #: apt.conf.5.xml:401 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@@ -6679,7 -6520,7 +6582,7 @@@ msgstr " "literal>." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:438 + #: apt.conf.5.xml:410 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@@ -6694,7 -6535,7 +6597,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:416 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 " @@@ -6705,15 -6546,8 +6608,8 @@@ msgstr " "configuration est chargé." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:448 + #: apt.conf.5.xml:420 #, fuzzy - #| 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." msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" "Bin::Methods</literal> specifies the location of the method handlers and " @@@ -6730,7 -6564,7 +6626,7 @@@ msgstr " "l'emplacement des programmes correspondants." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:456 + #: apt.conf.5.xml:428 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@@ -6752,12 -6586,12 +6648,12 @@@ msgstr " "staging/var/lib/dpkg/status</filename>." #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:469 + #: apt.conf.5.xml:441 msgid "APT in DSelect" msgstr "APT et DSelect" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:471 + #: apt.conf.5.xml:443 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behaviour. These are in the <literal>DSelect</literal> " @@@ -6768,12 -6602,12 +6664,12 @@@ msgstr " "<literal>DSelect</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:475 + #: apt.conf.5.xml:447 msgid "Clean" msgstr "Clean" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:476 + #: apt.conf.5.xml:448 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 " @@@ -6791,7 -6625,7 +6687,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:457 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the install phase." @@@ -6800,12 -6634,12 +6696,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:461 msgid "Updateoptions" msgstr "UpdateOptions" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:490 + #: apt.conf.5.xml:462 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the update phase." @@@ -6814,12 -6648,12 +6710,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:466 msgid "PromptAfterUpdate" msgstr "PromptAfterUpdate" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:495 + #: apt.conf.5.xml:467 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." @@@ -6829,12 -6663,12 +6725,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:473 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:474 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." @@@ -6843,7 -6677,7 +6739,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:479 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 " @@@ -6854,17 -6688,17 +6750,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:484 msgid "Pre-Invoke" msgstr "Pre-Invoke" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:512 + #: apt.conf.5.xml:484 msgid "Post-Invoke" msgstr "Post-Invoke" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:513 + #: apt.conf.5.xml:485 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 " @@@ -6877,12 -6711,12 +6773,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:491 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:492 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 " @@@ -6898,7 -6732,7 +6794,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:498 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@@ -6914,12 -6748,12 +6810,12 @@@ msgstr " "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:533 + #: apt.conf.5.xml:505 msgid "Run-Directory" msgstr "Run-Directory" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:534 + #: apt.conf.5.xml:506 msgid "" "APT chdirs to this directory before invoking dpkg, the default is <filename>/" "</filename>." @@@ -6928,12 -6762,12 +6824,12 @@@ msgstr " "le répertoire <filename>/</filename>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:538 + #: apt.conf.5.xml:510 msgid "Build-options" msgstr "Build-options" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:539 + #: apt.conf.5.xml:511 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages, the " "default is to disable signing and produce all binaries." @@@ -6943,12 -6777,12 +6839,12 @@@ msgstr " "créés." #. type: Content of: <refentry><refsect1><refsect2><title> - #: apt.conf.5.xml:544 + #: apt.conf.5.xml:516 msgid "dpkg trigger usage (and related options)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> - #: apt.conf.5.xml:545 + #: apt.conf.5.xml:517 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 " @@@ -6963,7 -6797,7 +6859,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> - #: apt.conf.5.xml:560 + #: apt.conf.5.xml:532 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@@ -6973,7 -6807,7 +6869,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> - #: apt.conf.5.xml:554 + #: apt.conf.5.xml:526 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 " @@@ -6987,12 -6821,12 +6883,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> - #: apt.conf.5.xml:566 + #: apt.conf.5.xml:538 msgid "DPkg::NoTriggers" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:567 + #: apt.conf.5.xml:539 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 " @@@ -7004,14 -6838,13 +6900,13 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> - #: apt.conf.5.xml:574 + #: apt.conf.5.xml:546 #, fuzzy - #| msgid "Packages::Compress" msgid "PackageManager::Configure" msgstr "Packages::Compress" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:575 + #: apt.conf.5.xml:547 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@@ -7027,12 -6860,12 +6922,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> - #: apt.conf.5.xml:585 + #: apt.conf.5.xml:557 msgid "DPkg::ConfigurePending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:586 + #: apt.conf.5.xml:558 msgid "" "If this option is set apt will call <command>dpkg --configure --pending</" "command> to let dpkg handle all required configurations and triggers. This " @@@ -7043,12 -6876,12 +6938,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> - #: apt.conf.5.xml:592 + #: apt.conf.5.xml:564 msgid "DPkg::TriggersPending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:593 + #: apt.conf.5.xml:565 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@@ -7058,12 -6891,12 +6953,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> - #: apt.conf.5.xml:598 + #: apt.conf.5.xml:570 msgid "PackageManager::UnpackAll" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:599 + #: apt.conf.5.xml:571 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-" @@@ -7075,12 -6908,12 +6970,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> - #: apt.conf.5.xml:606 + #: apt.conf.5.xml:578 msgid "OrderList::Score::Immediate" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> - #: apt.conf.5.xml:614 + #: apt.conf.5.xml:586 #, no-wrap msgid "" "OrderList::Score {\n" @@@ -7092,7 -6925,7 +6987,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:607 + #: apt.conf.5.xml:579 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 " @@@ -7106,12 -6939,12 +7001,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:627 + #: apt.conf.5.xml:599 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:600 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@@ -7123,12 -6956,12 +7018,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:608 msgid "Debug options" msgstr "Les options de débogage" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:638 + #: apt.conf.5.xml:610 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@@ -7146,7 -6979,7 +7041,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:621 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@@ -7157,7 -6990,7 +7052,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:629 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@@ -7169,7 -7002,7 +7064,7 @@@ msgstr " "superutilisateur." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> - #: apt.conf.5.xml:666 + #: apt.conf.5.xml:638 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@@ -7181,7 -7014,7 +7076,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:674 + #: apt.conf.5.xml:646 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CDROM IDs." @@@ -7190,17 -7023,17 +7085,17 @@@ msgstr " "type statfs dans les identifiants de CD." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:684 + #: apt.conf.5.xml:656 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:661 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 + #: apt.conf.5.xml:665 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" @@@ -7208,44 -7041,44 +7103,44 @@@ "literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:700 + #: apt.conf.5.xml:672 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:676 msgid "Print information related to downloading packages using 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:683 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:687 msgid "Print information related to downloading packages using 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:694 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:698 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:705 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:709 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." @@@ -7254,12 -7087,12 +7149,12 @@@ msgstr " "cryptographiques avec <literal>gpg</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:744 + #: apt.conf.5.xml:716 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:720 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." @@@ -7268,24 -7101,24 +7163,24 @@@ msgstr " "stockées sur CD." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:755 + #: apt.conf.5.xml:727 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:730 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:737 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:740 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." @@@ -7294,12 -7127,12 +7189,12 @@@ msgstr " "librairies d'<literal>apt</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:775 + #: apt.conf.5.xml:747 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:750 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 " @@@ -7310,12 -7143,12 +7205,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:758 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:761 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." @@@ -7325,24 -7158,24 +7220,24 @@@ msgstr " "temps." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:797 + #: apt.conf.5.xml:769 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:773 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:780 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:783 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." @@@ -7352,12 -7185,12 +7247,12 @@@ msgstr " "éventuelles." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:818 + #: apt.conf.5.xml:790 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:793 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." @@@ -7367,12 -7200,12 +7262,12 @@@ msgstr " "éventuelles." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:829 + #: apt.conf.5.xml:801 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:805 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." @@@ -7382,12 -7215,12 +7277,12 @@@ msgstr " "place des fichiers complets." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:840 + #: apt.conf.5.xml:812 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 + #: apt.conf.5.xml:816 msgid "" "Log all interactions with the sub-processes that actually perform downloads." msgstr "" @@@ -7395,12 -7228,12 +7290,12 @@@ "effectivement des téléchargements." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:851 + #: apt.conf.5.xml:823 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:827 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." @@@ -7409,12 -7242,12 +7304,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:834 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:837 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@@ -7429,12 -7262,12 +7324,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:848 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:851 msgid "" "Generate debug messages describing which package is marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@@ -7469,24 -7302,24 +7364,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:870 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:873 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:880 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:883 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." @@@ -7495,12 -7328,12 +7390,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:891 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:894 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." @@@ -7510,12 -7343,12 +7405,12 @@@ msgstr " "fichier." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:929 + #: apt.conf.5.xml:901 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:905 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." @@@ -7524,33 -7357,33 +7419,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:913 msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "<literal>Debug::pkgPackageManager</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:945 + #: apt.conf.5.xml:917 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:924 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:928 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:934 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:938 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." @@@ -7559,12 -7392,12 +7454,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:946 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:949 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 " @@@ -7575,12 -7408,12 +7470,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:957 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:961 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." @@@ -7589,7 -7422,7 +7484,7 @@@ msgstr " "list</filename>." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:1012 + #: apt.conf.5.xml:983 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." @@@ -7598,15 -7431,14 +7493,14 @@@ msgstr " "exemples pour toutes les options existantes." #. type: Content of: <refentry><refsect1><variablelist> - #: apt.conf.5.xml:1019 + #: apt.conf.5.xml:990 #, fuzzy - #| msgid "&apt-conf;" msgid "&file-aptconf;" msgstr "&apt-conf;" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:1024 + #: apt.conf.5.xml:995 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-cache;, &apt-config;, &apt-preferences;." @@@ -7629,10 -7461,6 +7523,6 @@@ msgstr "Fichier de contrôle des préfà #. type: Content of: <refentry><refsect1><para> #: apt_preferences.5.xml:34 #, fuzzy - #| 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 " @@@ -8810,7 -8638,6 +8700,6 @@@ msgstr " #. type: Content of: <refentry><refsect1><variablelist> #: apt_preferences.5.xml:617 #, fuzzy - #| msgid "apt_preferences" msgid "&file-preferences;" msgstr "apt_preferences" diff --combined doc/po/it.po index 37cf5d078,4e02c188d..5c5a65595 --- a/doc/po/it.po +++ b/doc/po/it.po @@@ -9,7 -9,7 +9,7 @@@ msgid "" msgstr "" "Project-Id-Version: \n" - "POT-Creation-Date: 2009-11-27 00:05+0100\n" + "POT-Creation-Date: 2009-12-10 22:04+0100\n" "PO-Revision-Date: 2003-04-26 23:26+0100\n" "Last-Translator: Traduzione di Eugenia Franzoni <eugenia@linuxcare.com>\n" "Language-Team: <debian-l10n-italian@lists.debian.org>\n" @@@ -1203,7 -1203,7 +1203,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:456 apt.conf.5.xml:478 +#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:484 apt.conf.5.xml:506 msgid "options" msgstr "" @@@ -1404,7 -1404,7 +1404,7 @@@ msgstr " #. 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.conf.5.xml:988 apt_preferences.5.xml:615 msgid "Files" msgstr "" @@@ -1417,7 -1417,7 +1417,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: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-sortpkgs.1.xml:69 apt.conf.5.xml:994 apt_preferences.5.xml:622 #: sources.list.5.xml:233 msgid "See Also" msgstr "" @@@ -2696,7 -2696,7 +2696,7 @@@ msgid " msgstr "" #. 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:561 apt.conf.5.xml:982 apt_preferences.5.xml:462 #: sources.list.5.xml:193 msgid "Examples" msgstr "" @@@ -4609,7 -4609,7 +4609,7 @@@ msgid " msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:264 apt.conf.5.xml:328 + #: apt.conf.5.xml:264 apt.conf.5.xml:321 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method, this applies to all things including connection timeout and data " @@@ -4638,31 -4638,21 +4638,31 @@@ msgid " "multiple servers at the same time.)" msgstr "" +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:280 +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 " +"clients only if the client uses a known identifier." +msgstr "" + #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> - #: apt.conf.5.xml:286 + #: apt.conf.5.xml:281 msgid "https" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:287 + #: apt.conf.5.xml:282 msgid "" -"HTTPS URIs. Cache-control and proxy options are the same as for " -"<literal>http</literal> method. <literal>Pipeline-Depth</literal> option is " +"HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy " +"options are the same as for <literal>http</literal> method and will also " +"default to the options from the <literal>http</literal> method if they are " +"not explicitly set for https. <literal>Pipeline-Depth</literal> option is " "not supported yet." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:293 + #: apt.conf.5.xml:286 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is " @@@ -4683,12 -4673,12 +4683,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> - #: apt.conf.5.xml:311 sources.list.5.xml:150 + #: apt.conf.5.xml:304 sources.list.5.xml:150 msgid "ftp" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:312 + #: apt.conf.5.xml:305 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 " @@@ -4707,7 -4697,7 +4707,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:331 + #: apt.conf.5.xml:324 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 " @@@ -4717,7 -4707,7 +4717,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:338 + #: apt.conf.5.xml:331 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 " @@@ -4726,7 -4716,7 +4726,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:343 + #: apt.conf.5.xml:336 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@@ -4736,18 -4726,18 +4736,18 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> - #: apt.conf.5.xml:350 sources.list.5.xml:132 + #: apt.conf.5.xml:343 sources.list.5.xml:132 msgid "cdrom" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> - #: apt.conf.5.xml:356 + #: apt.conf.5.xml:349 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:351 + #: apt.conf.5.xml:344 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 " @@@ -4760,12 -4750,12 +4760,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> - #: apt.conf.5.xml:361 + #: apt.conf.5.xml:354 msgid "gpgv" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:362 + #: apt.conf.5.xml:355 msgid "" "GPGV URIs; the only option for GPGV URIs is the option to pass additional " "parameters to gpgv. <literal>gpgv::Options</literal> Additional options " @@@ -4773,18 -4763,18 +4773,18 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> - #: apt.conf.5.xml:367 + #: apt.conf.5.xml:360 msgid "CompressionTypes" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> - #: apt.conf.5.xml:373 + #: apt.conf.5.xml:366 #, 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:368 + #: apt.conf.5.xml:361 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@@ -4796,19 -4786,19 +4796,19 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> - #: apt.conf.5.xml:378 + #: apt.conf.5.xml:371 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> - #: apt.conf.5.xml:381 + #: apt.conf.5.xml:374 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:374 + #: apt.conf.5.xml:367 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 " @@@ -4825,13 -4815,13 +4825,13 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> - #: apt.conf.5.xml:385 + #: apt.conf.5.xml:378 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:383 + #: apt.conf.5.xml:376 msgid "" "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" "replaceable></literal> will be checked: If this setting exists the method " @@@ -4846,7 -4836,7 +4846,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:390 + #: apt.conf.5.xml:383 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 " @@@ -4855,53 -4845,6 +4855,53 @@@ "prefer uncompressed files to support the usage of local mirrors." msgstr "" +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:396 +msgid "Languages" +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:397 +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." +msgstr "" + +#. 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 "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:403 +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" +"\"/>" +msgstr "" + #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:217 msgid "" @@@ -4910,12 -4853,12 +4910,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:420 + #: apt.conf.5.xml:392 msgid "Directories" msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:422 + #: apt.conf.5.xml:394 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@@ -4927,7 -4870,7 +4927,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:429 + #: apt.conf.5.xml:401 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@@ -4940,7 -4883,7 +4940,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:438 + #: apt.conf.5.xml:410 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@@ -4950,7 -4893,7 +4950,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:444 + #: apt.conf.5.xml:416 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 " @@@ -4958,7 -4901,7 +4958,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:448 + #: apt.conf.5.xml:420 msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" "Bin::Methods</literal> specifies the location of the method handlers and " @@@ -4969,7 -4912,7 +4969,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:456 + #: apt.conf.5.xml:428 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@@ -4982,13 -4925,13 +4982,13 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:469 + #: apt.conf.5.xml:441 #, fuzzy msgid "APT in DSelect" msgstr "DSelect" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:471 + #: apt.conf.5.xml:443 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behaviour. These are in the <literal>DSelect</literal> " @@@ -4996,12 -4939,12 +4996,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:475 + #: apt.conf.5.xml:447 msgid "Clean" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:476 + #: apt.conf.5.xml:448 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 " @@@ -5012,50 -4955,50 +5012,50 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:485 + #: apt.conf.5.xml:457 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:489 + #: apt.conf.5.xml:461 msgid "Updateoptions" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:490 + #: apt.conf.5.xml:462 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:494 + #: apt.conf.5.xml:466 msgid "PromptAfterUpdate" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:495 + #: apt.conf.5.xml:467 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:501 + #: apt.conf.5.xml:473 msgid "How APT calls dpkg" msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:502 + #: apt.conf.5.xml:474 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:507 + #: apt.conf.5.xml:479 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 " @@@ -5063,17 -5006,17 +5063,17 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:512 + #: apt.conf.5.xml:484 msgid "Pre-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:512 + #: apt.conf.5.xml:484 msgid "Post-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:513 + #: apt.conf.5.xml:485 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 " @@@ -5082,12 -5025,12 +5082,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:519 + #: apt.conf.5.xml:491 msgid "Pre-Install-Pkgs" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:520 + #: apt.conf.5.xml:492 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 " @@@ -5097,7 -5040,7 +5097,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:526 + #: apt.conf.5.xml:498 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@@ -5107,36 -5050,36 +5107,36 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:533 + #: apt.conf.5.xml:505 msgid "Run-Directory" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:534 + #: apt.conf.5.xml:506 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:538 + #: apt.conf.5.xml:510 msgid "Build-options" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:539 + #: apt.conf.5.xml:511 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:544 + #: apt.conf.5.xml:516 msgid "dpkg trigger usage (and related options)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> - #: apt.conf.5.xml:545 + #: apt.conf.5.xml:517 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 " @@@ -5151,7 -5094,7 +5151,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> - #: apt.conf.5.xml:560 + #: apt.conf.5.xml:532 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@@ -5161,7 -5104,7 +5161,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> - #: apt.conf.5.xml:554 + #: apt.conf.5.xml:526 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 " @@@ -5175,12 -5118,12 +5175,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> - #: apt.conf.5.xml:566 + #: apt.conf.5.xml:538 msgid "DPkg::NoTriggers" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:567 + #: apt.conf.5.xml:539 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 " @@@ -5192,12 -5135,12 +5192,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> - #: apt.conf.5.xml:574 + #: apt.conf.5.xml:546 msgid "PackageManager::Configure" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:575 + #: apt.conf.5.xml:547 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@@ -5213,12 -5156,12 +5213,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> - #: apt.conf.5.xml:585 + #: apt.conf.5.xml:557 msgid "DPkg::ConfigurePending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:586 + #: apt.conf.5.xml:558 msgid "" "If this option is set apt will call <command>dpkg --configure --pending</" "command> to let dpkg handle all required configurations and triggers. This " @@@ -5229,12 -5172,12 +5229,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> - #: apt.conf.5.xml:592 + #: apt.conf.5.xml:564 msgid "DPkg::TriggersPending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:593 + #: apt.conf.5.xml:565 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@@ -5244,12 -5187,12 +5244,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> - #: apt.conf.5.xml:598 + #: apt.conf.5.xml:570 msgid "PackageManager::UnpackAll" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:599 + #: apt.conf.5.xml:571 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-" @@@ -5261,12 -5204,12 +5261,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> - #: apt.conf.5.xml:606 + #: apt.conf.5.xml:578 msgid "OrderList::Score::Immediate" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> - #: apt.conf.5.xml:614 + #: apt.conf.5.xml:586 #, no-wrap msgid "" "OrderList::Score {\n" @@@ -5278,7 -5221,7 +5278,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:607 + #: apt.conf.5.xml:579 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 " @@@ -5292,12 -5235,12 +5292,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:627 + #: apt.conf.5.xml:599 msgid "Periodic and Archives options" msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:628 + #: apt.conf.5.xml:600 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@@ -5306,12 -5249,12 +5306,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:636 + #: apt.conf.5.xml:608 msgid "Debug options" msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:638 + #: apt.conf.5.xml:610 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@@ -5322,7 -5265,7 +5322,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> - #: apt.conf.5.xml:649 + #: apt.conf.5.xml:621 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@@ -5330,7 -5273,7 +5330,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> - #: apt.conf.5.xml:657 + #: apt.conf.5.xml:629 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@@ -5338,7 -5281,7 +5338,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> - #: apt.conf.5.xml:666 + #: apt.conf.5.xml:638 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@@ -5348,111 -5291,111 +5348,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:674 + #: apt.conf.5.xml:646 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:684 + #: apt.conf.5.xml:656 msgid "A full list of debugging options to apt follows." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:689 + #: apt.conf.5.xml:661 msgid "<literal>Debug::Acquire::cdrom</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:693 + #: apt.conf.5.xml:665 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:700 + #: apt.conf.5.xml:672 msgid "<literal>Debug::Acquire::ftp</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:704 + #: apt.conf.5.xml:676 msgid "Print information related to downloading packages using FTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:711 + #: apt.conf.5.xml:683 msgid "<literal>Debug::Acquire::http</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:715 + #: apt.conf.5.xml:687 msgid "Print information related to downloading packages using HTTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:722 + #: apt.conf.5.xml:694 msgid "<literal>Debug::Acquire::https</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:726 + #: apt.conf.5.xml:698 msgid "Print information related to downloading packages using HTTPS." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:733 + #: apt.conf.5.xml:705 msgid "<literal>Debug::Acquire::gpgv</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:737 + #: apt.conf.5.xml:709 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:744 + #: apt.conf.5.xml:716 msgid "<literal>Debug::aptcdrom</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:748 + #: apt.conf.5.xml:720 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:755 + #: apt.conf.5.xml:727 msgid "<literal>Debug::BuildDeps</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:758 + #: apt.conf.5.xml:730 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:765 + #: apt.conf.5.xml:737 msgid "<literal>Debug::Hashes</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:768 + #: apt.conf.5.xml:740 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:775 + #: apt.conf.5.xml:747 msgid "<literal>Debug::IdentCDROM</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:778 + #: apt.conf.5.xml:750 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 " @@@ -5460,93 -5403,93 +5460,93 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:786 + #: apt.conf.5.xml:758 msgid "<literal>Debug::NoLocking</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:789 + #: apt.conf.5.xml:761 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:797 + #: apt.conf.5.xml:769 msgid "<literal>Debug::pkgAcquire</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:801 + #: apt.conf.5.xml:773 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:808 + #: apt.conf.5.xml:780 msgid "<literal>Debug::pkgAcquire::Auth</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:811 + #: apt.conf.5.xml:783 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:818 + #: apt.conf.5.xml:790 msgid "<literal>Debug::pkgAcquire::Diffs</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:821 + #: apt.conf.5.xml:793 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:829 + #: apt.conf.5.xml:801 msgid "<literal>Debug::pkgAcquire::RRed</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:833 + #: apt.conf.5.xml:805 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:840 + #: apt.conf.5.xml:812 msgid "<literal>Debug::pkgAcquire::Worker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:844 + #: apt.conf.5.xml:816 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:851 + #: apt.conf.5.xml:823 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:855 + #: apt.conf.5.xml:827 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:862 + #: apt.conf.5.xml:834 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:865 + #: apt.conf.5.xml:837 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@@ -5556,12 -5499,12 +5556,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:876 + #: apt.conf.5.xml:848 msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:879 + #: apt.conf.5.xml:851 msgid "" "Generate debug messages describing which package is marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@@ -5578,91 -5521,91 +5578,91 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:898 + #: apt.conf.5.xml:870 msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:901 + #: apt.conf.5.xml:873 msgid "Dump the default configuration to standard error on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:908 + #: apt.conf.5.xml:880 msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:911 + #: apt.conf.5.xml:883 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:919 + #: apt.conf.5.xml:891 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:922 + #: apt.conf.5.xml:894 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:929 + #: apt.conf.5.xml:901 msgid "<literal>Debug::pkgOrderList</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:933 + #: apt.conf.5.xml:905 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:941 + #: apt.conf.5.xml:913 msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:945 + #: apt.conf.5.xml:917 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:952 + #: apt.conf.5.xml:924 msgid "<literal>Debug::pkgPolicy</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:956 + #: apt.conf.5.xml:928 msgid "Output the priority of each package list on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:962 + #: apt.conf.5.xml:934 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:966 + #: apt.conf.5.xml:938 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:974 + #: apt.conf.5.xml:946 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:977 + #: apt.conf.5.xml:949 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 " @@@ -5670,32 -5613,32 +5670,32 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:985 + #: apt.conf.5.xml:957 msgid "<literal>Debug::sourceList</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:989 + #: apt.conf.5.xml:961 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:1012 + #: apt.conf.5.xml:983 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." msgstr "" #. type: Content of: <refentry><refsect1><variablelist> - #: apt.conf.5.xml:1019 + #: apt.conf.5.xml:990 msgid "&file-aptconf;" msgstr "" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:1024 + #: apt.conf.5.xml:995 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "" diff --combined doc/po/ja.po index ba04b200f,ee2d4aca1..80da7c0a2 --- a/doc/po/ja.po +++ b/doc/po/ja.po @@@ -6,7 -6,7 +6,7 @@@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" - "POT-Creation-Date: 2009-11-27 00:05+0100\n" + "POT-Creation-Date: 2009-12-10 22:04+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" @@@ -604,15 -604,6 +604,6 @@@ msgstr " #. type: Plain text #: apt.ent:168 #, fuzzy, no-wrap - #| msgid "" - #| "<!-- Boiler plate docinfo section -->\n" - #| "<!ENTITY apt-docinfo \"\n" - #| " <refentryinfo>\n" - #| " <address><email>apt@packages.debian.org</email></address>\n" - #| " <author><firstname>Jason</firstname> <surname>Gunthorpe</surname></author>\n" - #| " <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></copyright>\n" - #| " <date>28 October 2008</date>\n" - #| " <productname>Linux</productname>\n" msgid "" "<!-- Boiler plate docinfo section -->\n" "<!ENTITY apt-docinfo \"\n" @@@ -664,13 -655,6 +655,6 @@@ msgstr " #. type: Plain text #: apt.ent:185 #, fuzzy, no-wrap - #| msgid "" - #| "<!ENTITY apt-author.jgunthorpe \"\n" - #| " <author>\n" - #| " <firstname>Jason</firstname>\n" - #| " <surname>Gunthorpe</surname>\n" - #| " </author>\n" - #| "\">\n" msgid "" "<!ENTITY apt-author.jgunthorpe \"\n" " <author>\n" @@@ -690,13 -674,6 +674,6 @@@ msgstr " #. type: Plain text #: apt.ent:193 #, fuzzy, no-wrap - #| msgid "" - #| "<!ENTITY apt-author.moconnor \"\n" - #| " <author>\n" - #| " <firstname>Mike</firstname>\n" - #| " <surname>O'Connor</surname>\n" - #| " </author>\n" - #| "\">\n" msgid "" "<!ENTITY apt-author.moconnor \"\n" " <author>\n" @@@ -716,12 -693,6 +693,6 @@@ msgstr " #. type: Plain text #: apt.ent:200 #, fuzzy, no-wrap - #| msgid "" - #| "<!ENTITY apt-author.team \"\n" - #| " <author>\n" - #| " <othername>APT team</othername>\n" - #| " </author>\n" - #| "\">\n" msgid "" "<!ENTITY apt-author.team \"\n" " <author>\n" @@@ -986,7 -957,6 +957,6 @@@ msgstr " #. type: Plain text #: apt.ent:315 #, fuzzy, no-wrap - #| msgid "Storage area for package files in transit. Configuration Item: <literal>Dir::Cache::Archives</literal> (implicit partial)." msgid "" " <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n" " <listitem><para>Storage area for package files in transit.\n" @@@ -999,7 -969,6 +969,6 @@@ msgstr "取得中パッケージファã #. type: Plain text #: apt.ent:325 #, fuzzy, no-wrap - #| msgid "Version preferences file. This is where you would specify \"pinning\", i.e. a preference to get certain packages from a separate source or from a different version of a distribution. Configuration Item: <literal>Dir::Etc::Preferences</literal>." msgid "" "<!ENTITY file-preferences \"\n" " <varlistentry><term><filename>/etc/apt/preferences</filename></term>\n" @@@ -1049,7 -1018,6 +1018,6 @@@ msgstr " #. type: Plain text #: apt.ent:350 #, fuzzy, no-wrap - #| msgid "Storage area for state information for each package resource specified in &sources-list; Configuration Item: <literal>Dir::State::Lists</literal>." msgid "" "<!ENTITY file-statelists \"\n" " <varlistentry><term><filename>&statedir;/lists/</filename></term>\n" @@@ -1063,7 -1031,6 +1031,6 @@@ msgstr "&sources-list; に指定したã #. type: Plain text #: apt.ent:355 #, fuzzy, no-wrap - #| msgid "Storage area for state information in transit. Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial)." msgid "" " <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n" " <listitem><para>Storage area for state information in transit.\n" @@@ -1589,12 -1556,6 +1556,6 @@@ msgstr "pkgnames <replaceable>[ prefix #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:229 #, fuzzy - #| msgid "" - #| "This command prints the name of each package in the system. The optional " - #| "argument is a prefix match to filter the name list. The output is " - #| "suitable for use in a shell tab complete function and the output is " - #| "generated extremely quickly. This command is best used with the <option>--" - #| "generate</option> option." msgid "" "This command prints the name of each package APT knows. The optional " "argument is a prefix match to filter the name list. The output is suitable " @@@ -1724,7 -1685,7 +1685,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:456 apt.conf.5.xml:478 +#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:484 apt.conf.5.xml:506 msgid "options" msgstr "オプション" @@@ -1974,7 -1935,7 +1935,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:138 apt-mark.8.xml:122 - #: apt.conf.5.xml:1017 apt_preferences.5.xml:615 + #: apt.conf.5.xml:988 apt_preferences.5.xml:615 msgid "Files" msgstr "ファイル" @@@ -1988,7 -1949,7 +1949,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: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-sortpkgs.1.xml:69 apt.conf.5.xml:994 apt_preferences.5.xml:622 #: sources.list.5.xml:233 msgid "See Also" msgstr "関連項目" @@@ -2526,9 -2487,6 +2487,6 @@@ msgstr " #. type: Content of: <refentry><refentryinfo> #: apt-ftparchive.1.xml:13 #, fuzzy - #| 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>" @@@ -2552,25 -2510,6 +2510,6 @@@ msgstr "インデックスファイルç #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> #: apt-ftparchive.1.xml:36 #, fuzzy - #| msgid "" - #| "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> " - #| "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> " - #| "<arg><option>--readonly</option></arg> <arg><option>--contents</option></" - #| "arg> <arg><option>-o=<replaceable>config string</replaceable></option></" - #| "arg> <arg><option>-c=<replaceable>file</replaceable></option></arg> " - #| "<group choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=\"repeat" - #| "\"><replaceable>path</replaceable></arg><arg><replaceable>override</" - #| "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> " - #| "<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>path</" - #| "replaceable></arg><arg><replaceable>override</" - #| "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> " - #| "<arg>contents <arg choice=\"plain\"><replaceable>path</replaceable></" - #| "arg></arg> <arg>release <arg choice=\"plain\"><replaceable>path</" - #| "replaceable></arg></arg> <arg>generate <arg choice=\"plain" - #| "\"><replaceable>config-file</replaceable></arg> <arg choice=\"plain\" rep=" - #| "\"repeat\"><replaceable>section</replaceable></arg></arg> <arg>clean <arg " - #| "choice=\"plain\"><replaceable>config-file</replaceable></arg></arg> </" - #| "group>" msgid "" "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> " "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> " @@@ -3738,7 -3677,7 +3677,7 @@@ msgstr " # type: Content of: <refentry><refsect1><title> #. 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:561 apt.conf.5.xml:982 apt_preferences.5.xml:462 #: sources.list.5.xml:193 msgid "Examples" msgstr "サンプル" @@@ -3795,37 -3734,6 +3734,6 @@@ msgstr "APT パッケージ操作ユー #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> #: apt-get.8.xml:36 #, fuzzy - #| msgid "" - #| "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> " - #| "<option>-o= <replaceable>config_string</replaceable> </option> </arg> " - #| "<arg> <option>-c= <replaceable>config_file</replaceable> </option> </arg> " - #| "<arg> <option>-t=</option> <group choice='req'> <arg choice='plain'> " - #| "<replaceable>target_release_name</replaceable> </arg> <arg " - #| "choice='plain'> <replaceable>target_release_number_expression</" - #| "replaceable> </arg> <arg choice='plain'> " - #| "<replaceable>target_release_codename</replaceable> </arg> </group> </arg> " - #| "<group choice=\"req\"> <arg choice='plain'>update</arg> <arg " - #| "choice='plain'>upgrade</arg> <arg choice='plain'>dselect-upgrade</arg> " - #| "<arg choice='plain'>dist-upgrade</arg> <arg choice='plain'>install <arg " - #| "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> " - #| "<group choice='req'> <arg choice='plain'> " - #| "=<replaceable>pkg_version_number</replaceable> </arg> <arg " - #| "choice='plain'> /<replaceable>target_release_name</replaceable> </arg> " - #| "<arg choice='plain'> /<replaceable>target_release_codename</replaceable> " - #| "</arg> </group> </arg> </arg> </arg> <arg choice='plain'>remove <arg " - #| "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></" - #| "arg> <arg choice='plain'>purge <arg choice=\"plain\" rep=\"repeat" - #| "\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>source " - #| "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> " - #| "=<replaceable>pkg_version_number</replaceable> </arg> </arg> </arg> <arg " - #| "choice='plain'>build-dep <arg choice=\"plain\" rep=\"repeat" - #| "\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>check</" - #| "arg> <arg choice='plain'>clean</arg> <arg choice='plain'>autoclean</arg> " - #| "<arg choice='plain'>autoremove</arg> <arg choice='plain'> <group " - #| "choice='req'> <arg choice='plain'>-v</arg> <arg choice='plain'>--version</" - #| "arg> </group> </arg> <arg choice='plain'> <group choice='req'> <arg " - #| "choice='plain'>-h</arg> <arg choice='plain'>--help</arg> </group> </arg> " - #| "</group>" msgid "" "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> " "<option>-o= <replaceable>config_string</replaceable> </option> </arg> <arg> " @@@ -4162,18 -4070,6 +4070,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. Source " - #| "packages are tracked separately from binary packages via <literal>deb-" - #| "src</literal> type lines in the &sources-list; file. This probably will " - #| "mean that you will not get the same source as the package you have " - #| "installed or as you could install. If the --compile options is specified " - #| "then the package will be compiled to a binary .deb using dpkg-" - #| "buildpackage, if --download-only is specified then the source package " - #| "will not be unpacked." msgid "" "<literal>source</literal> causes <command>apt-get</command> to fetch source " "packages. APT will examine the available packages to decide which source " @@@ -5177,9 -5073,6 +5073,6 @@@ msgstr "&apt-get;, &apt-secure; #. type: Content of: <refentry><refentryinfo> #: apt-mark.8.xml:13 #, fuzzy - #| 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>" @@@ -5203,11 -5096,6 +5096,6 @@@ msgstr "パッケージが自動的にã #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> #: apt-mark.8.xml:36 #, fuzzy - #| 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" @@@ -5235,12 -5123,6 +5123,6 @@@ msgstr " #. type: Content of: <refentry><refsect1><para> #: apt-mark.8.xml:57 #, fuzzy - #| 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 " @@@ -5296,10 -5178,6 +5178,6 @@@ msgstr " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-mark.8.xml:82 #, fuzzy - #| 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." @@@ -5310,7 -5188,6 +5188,6 @@@ msgstr " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-mark.8.xml:93 #, fuzzy - #| msgid "<option>-f=<filename>FILENAME</filename></option>" msgid "" "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>" msgstr "<option>-f=<filename>FILENAME</filename></option>" @@@ -5318,7 -5195,6 +5195,6 @@@ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-mark.8.xml:94 #, fuzzy - #| msgid "<option>--file=<filename>FILENAME</filename></option>" msgid "" "<option>--file=<filename><replaceable>FILENAME</replaceable></filename></" "option>" @@@ -5328,11 -5204,6 +5204,6 @@@ msgstr "<option>--file=<filename>FILENA #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-mark.8.xml:97 #, fuzzy - #| 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 " @@@ -5379,7 -5250,6 +5250,6 @@@ msgstr "プログラムのバージョã #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-mark.8.xml:124 #, fuzzy - #| msgid "<filename>/etc/apt/preferences</filename>" msgid "<filename>/var/lib/apt/extended_states</filename>" msgstr "<filename>/etc/apt/preferences</filename>" @@@ -5395,7 -5265,6 +5265,6 @@@ msgstr " #. type: Content of: <refentry><refsect1><para> #: apt-mark.8.xml:134 #, fuzzy - #| msgid "&apt-cache; &apt-conf;" msgid "&apt-get;,&aptitude;,&apt-conf;" msgstr "&apt-cache; &apt-conf;" @@@ -5847,11 -5716,6 +5716,6 @@@ msgstr " #. 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>" msgid "" "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</" "firstname> <surname>Burrows</surname> <contrib>Initial documentation of " @@@ -5928,14 -5792,6 +5792,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 " @@@ -6028,13 -5884,6 +5884,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 descendents are " - #| "erased." msgid "" "Two specials are allowed, <literal>#include</literal> (which is deprecated " "and not supported by alternative implementations) and <literal>#clear</" @@@ -6064,12 -5913,6 +5913,6 @@@ msgstr " #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:111 #, fuzzy - #| 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." 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 " @@@ -6406,13 -6249,6 +6249,6 @@@ msgstr "http #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:246 #, fuzzy - #| 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." 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 " @@@ -6455,7 -6291,7 +6291,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:264 apt.conf.5.xml:328 + #: apt.conf.5.xml:264 apt.conf.5.xml:321 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method, this applies to all things including connection timeout and data " @@@ -6504,32 -6340,17 +6340,32 @@@ msgid " "multiple servers at the same time.)" msgstr "" +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:280 +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 " +"clients only if the client uses a known identifier." +msgstr "" + # type: <tag></tag> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> - #: apt.conf.5.xml:286 + #: apt.conf.5.xml:281 msgid "https" msgstr "https" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:287 + #: apt.conf.5.xml:282 -msgid "" -"HTTPS URIs. Cache-control and proxy options are the same as for " -"<literal>http</literal> method. <literal>Pipeline-Depth</literal> option is " +#, 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 " +"default to the options from the <literal>http</literal> method if they are " +"not explicitly set for https. <literal>Pipeline-Depth</literal> option is " "not supported yet." msgstr "" "HTTPS URI - キャッシュの制御やプロキシオプションは <literal>http</literal> メ" @@@ -6537,7 -6358,7 +6373,7 @@@ "していません。" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:293 + #: apt.conf.5.xml:286 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is " @@@ -6559,26 -6380,14 +6395,14 @@@ msgstr " # type: <tag></tag> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> - #: apt.conf.5.xml:311 sources.list.5.xml:150 + #: apt.conf.5.xml:304 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:312 + #: apt.conf.5.xml:305 #, fuzzy - #| 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." 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 " @@@ -6608,7 -6417,7 +6432,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:331 + #: apt.conf.5.xml:324 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 " @@@ -6624,7 -6433,7 +6448,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:331 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 " @@@ -6638,7 -6447,7 +6462,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:343 + #: apt.conf.5.xml:336 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@@ -6655,20 -6464,19 +6479,19 @@@ msgstr " # type: Content of: <refentry><refnamediv><refname> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> - #: apt.conf.5.xml:350 sources.list.5.xml:132 + #: apt.conf.5.xml:343 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:349 #, fuzzy, no-wrap - #| msgid "\"/cdrom/\"::Mount \"foo\";" msgid "/cdrom/::Mount \"foo\";" 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:351 + #: apt.conf.5.xml:344 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 " @@@ -6689,13 -6497,13 +6512,13 @@@ msgstr " "す。" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> - #: apt.conf.5.xml:361 + #: apt.conf.5.xml:354 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:362 + #: apt.conf.5.xml:355 msgid "" "GPGV URIs; the only option for GPGV URIs is the option to pass additional " "parameters to gpgv. <literal>gpgv::Options</literal> Additional options " @@@ -6706,18 -6514,18 +6529,18 @@@ msgstr " "す。" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> - #: apt.conf.5.xml:367 + #: apt.conf.5.xml:360 msgid "CompressionTypes" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> - #: apt.conf.5.xml:373 + #: apt.conf.5.xml:366 #, 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:368 + #: apt.conf.5.xml:361 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@@ -6729,19 -6537,19 +6552,19 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> - #: apt.conf.5.xml:378 + #: apt.conf.5.xml:371 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> - #: apt.conf.5.xml:381 + #: apt.conf.5.xml:374 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:374 + #: apt.conf.5.xml:367 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 " @@@ -6758,13 -6566,13 +6581,13 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> - #: apt.conf.5.xml:385 + #: apt.conf.5.xml:378 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:383 + #: apt.conf.5.xml:376 msgid "" "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" "replaceable></literal> will be checked: If this setting exists the method " @@@ -6779,7 -6587,7 +6602,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:390 + #: apt.conf.5.xml:383 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 " @@@ -6788,53 -6596,6 +6611,53 @@@ "prefer uncompressed files to support the usage of local mirrors." msgstr "" +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:396 +msgid "Languages" +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:397 +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." +msgstr "" + +#. 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 "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:403 +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" +"\"/>" +msgstr "" + # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:217 @@@ -6848,13 -6609,13 +6671,13 @@@ msgstr " # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:420 + #: apt.conf.5.xml:392 msgid "Directories" msgstr "ディレクトリ" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:422 + #: apt.conf.5.xml:394 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@@ -6874,7 -6635,7 +6697,7 @@@ msgstr " # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:429 + #: apt.conf.5.xml:401 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@@ -6896,7 -6657,7 +6719,7 @@@ msgstr " # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:438 + #: apt.conf.5.xml:410 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@@ -6911,7 -6672,7 +6734,7 @@@ msgstr " # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:444 + #: apt.conf.5.xml:416 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 " @@@ -6923,15 -6684,8 +6746,8 @@@ msgstr " # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:448 + #: apt.conf.5.xml:420 #, fuzzy - #| 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." msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" "Bin::Methods</literal> specifies the location of the method handlers and " @@@ -6948,7 -6702,7 +6764,7 @@@ msgstr " # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:456 + #: apt.conf.5.xml:428 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@@ -6969,13 -6723,13 +6785,13 @@@ msgstr " # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:469 + #: apt.conf.5.xml:441 msgid "APT in DSelect" msgstr "DSelect での APT" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:471 + #: apt.conf.5.xml:443 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behaviour. These are in the <literal>DSelect</literal> " @@@ -6985,13 -6739,13 +6801,13 @@@ msgstr " "設定項目で、デフォルトの動作を制御します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:475 + #: apt.conf.5.xml:447 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:476 + #: apt.conf.5.xml:448 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 " @@@ -7008,7 -6762,7 +6824,7 @@@ msgstr " # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:485 + #: apt.conf.5.xml:457 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the install phase." @@@ -7018,13 -6772,13 +6834,13 @@@ msgstr " # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:489 + #: apt.conf.5.xml:461 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:490 + #: apt.conf.5.xml:462 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the update phase." @@@ -7033,13 -6787,13 +6849,13 @@@ msgstr " "されます。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:494 + #: apt.conf.5.xml:466 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:495 + #: apt.conf.5.xml:467 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." @@@ -7049,13 -6803,13 +6865,13 @@@ msgstr " # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:501 + #: apt.conf.5.xml:473 msgid "How APT calls dpkg" msgstr "APT が dpkg を呼ぶ方法" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:502 + #: apt.conf.5.xml:474 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." @@@ -7065,7 -6819,7 +6881,7 @@@ msgstr " # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:507 + #: apt.conf.5.xml:479 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 " @@@ -7075,18 -6829,18 +6891,18 @@@ msgstr " "ければなりません。また、各リストは単一の引数として &dpkg; に渡されます。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:512 + #: apt.conf.5.xml:484 msgid "Pre-Invoke" msgstr "Pre-Invoke" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:512 + #: apt.conf.5.xml:484 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:513 + #: apt.conf.5.xml:485 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 " @@@ -7100,13 -6854,13 +6916,13 @@@ msgstr " # type: <tag></tag> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:519 + #: apt.conf.5.xml:491 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:520 + #: apt.conf.5.xml:492 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 " @@@ -7122,7 -6876,7 +6938,7 @@@ msgstr " # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:526 + #: apt.conf.5.xml:498 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@@ -7138,13 -6892,13 +6954,13 @@@ msgstr " # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:533 + #: apt.conf.5.xml:505 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:534 + #: apt.conf.5.xml:506 msgid "" "APT chdirs to this directory before invoking dpkg, the default is <filename>/" "</filename>." @@@ -7154,13 -6908,13 +6970,13 @@@ msgstr " # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:538 + #: apt.conf.5.xml:510 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:539 + #: apt.conf.5.xml:511 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages, the " "default is to disable signing and produce all binaries." @@@ -7169,12 -6923,12 +6985,12 @@@ msgstr " "ます。デフォルトでは署名を無効にし、全バイナリを生成します。" #. type: Content of: <refentry><refsect1><refsect2><title> - #: apt.conf.5.xml:544 + #: apt.conf.5.xml:516 msgid "dpkg trigger usage (and related options)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> - #: apt.conf.5.xml:545 + #: apt.conf.5.xml:517 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 " @@@ -7189,7 -6943,7 +7005,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> - #: apt.conf.5.xml:560 + #: apt.conf.5.xml:532 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@@ -7199,7 -6953,7 +7015,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> - #: apt.conf.5.xml:554 + #: apt.conf.5.xml:526 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 " @@@ -7213,12 -6967,12 +7029,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> - #: apt.conf.5.xml:566 + #: apt.conf.5.xml:538 msgid "DPkg::NoTriggers" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:567 + #: apt.conf.5.xml:539 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 " @@@ -7231,14 -6985,13 +7047,13 @@@ msgstr " # type: <tag></tag> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> - #: apt.conf.5.xml:574 + #: apt.conf.5.xml:546 #, fuzzy - #| msgid "Packages::Compress" msgid "PackageManager::Configure" msgstr "Packages::Compress" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:575 + #: apt.conf.5.xml:547 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@@ -7255,13 -7008,13 +7070,13 @@@ msgstr " # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> - #: apt.conf.5.xml:585 + #: apt.conf.5.xml:557 #, fuzzy msgid "DPkg::ConfigurePending" msgstr "ユーザの設定" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:586 + #: apt.conf.5.xml:558 msgid "" "If this option is set apt will call <command>dpkg --configure --pending</" "command> to let dpkg handle all required configurations and triggers. This " @@@ -7272,12 -7025,12 +7087,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> - #: apt.conf.5.xml:592 + #: apt.conf.5.xml:564 msgid "DPkg::TriggersPending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:593 + #: apt.conf.5.xml:565 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@@ -7287,12 -7040,12 +7102,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> - #: apt.conf.5.xml:598 + #: apt.conf.5.xml:570 msgid "PackageManager::UnpackAll" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:599 + #: apt.conf.5.xml:571 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-" @@@ -7304,12 -7057,12 +7119,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> - #: apt.conf.5.xml:606 + #: apt.conf.5.xml:578 msgid "OrderList::Score::Immediate" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> - #: apt.conf.5.xml:614 + #: apt.conf.5.xml:586 #, no-wrap msgid "" "OrderList::Score {\n" @@@ -7321,7 -7074,7 +7136,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:607 + #: apt.conf.5.xml:579 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 " @@@ -7335,12 -7088,12 +7150,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:627 + #: apt.conf.5.xml:599 msgid "Periodic and Archives options" msgstr "Periodic オプションと Archives オプション" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:628 + #: apt.conf.5.xml:600 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@@ -7354,12 -7107,12 +7169,12 @@@ msgstr " # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:636 + #: apt.conf.5.xml:608 msgid "Debug options" msgstr "デバッグオプション" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:638 + #: apt.conf.5.xml:610 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@@ -7370,7 -7123,7 +7185,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> - #: apt.conf.5.xml:649 + #: apt.conf.5.xml:621 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@@ -7381,7 -7134,7 +7196,7 @@@ msgstr " "にします。" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> - #: apt.conf.5.xml:657 + #: apt.conf.5.xml:629 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@@ -7392,7 -7145,7 +7207,7 @@@ msgstr " "literal>) を行う場合に使用します。" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> - #: apt.conf.5.xml:666 + #: apt.conf.5.xml:638 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@@ -7402,66 -7155,66 +7217,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:674 + #: apt.conf.5.xml:646 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:684 + #: apt.conf.5.xml:656 msgid "A full list of debugging options to apt follows." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:689 + #: apt.conf.5.xml:661 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 + #: apt.conf.5.xml:665 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:700 + #: apt.conf.5.xml:672 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:676 msgid "Print information related to downloading packages using FTP." msgstr "FTP を用いたパッケージのダウンロードに関する情報を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:711 + #: apt.conf.5.xml:683 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:687 msgid "Print information related to downloading packages using HTTP." msgstr "HTTP を用いたパッケージのダウンロードに関する情報を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:722 + #: apt.conf.5.xml:694 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:698 msgid "Print information related to downloading packages using HTTPS." msgstr "HTTPS を用いたパッケージのダウンロードに関する情報を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:733 + #: apt.conf.5.xml:705 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:709 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." @@@ -7469,46 -7222,46 +7284,46 @@@ msgstr " "<literal>gpg</literal> を用いた暗号署名の検証に関する情報を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:744 + #: apt.conf.5.xml:716 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:720 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:755 + #: apt.conf.5.xml:727 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:730 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:765 + #: apt.conf.5.xml:737 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:740 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:775 + #: apt.conf.5.xml:747 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:750 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 " @@@ -7516,93 -7269,93 +7331,93 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:786 + #: apt.conf.5.xml:758 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:761 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:797 + #: apt.conf.5.xml:769 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:773 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:808 + #: apt.conf.5.xml:780 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:783 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:818 + #: apt.conf.5.xml:790 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:793 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:829 + #: apt.conf.5.xml:801 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:805 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:840 + #: apt.conf.5.xml:812 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 + #: apt.conf.5.xml:816 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:851 + #: apt.conf.5.xml:823 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:827 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:862 + #: apt.conf.5.xml:834 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:837 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@@ -7612,12 -7365,12 +7427,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:876 + #: apt.conf.5.xml:848 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:851 msgid "" "Generate debug messages describing which package is marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@@ -7634,91 -7387,91 +7449,91 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:898 + #: apt.conf.5.xml:870 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:873 msgid "Dump the default configuration to standard error on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:908 + #: apt.conf.5.xml:880 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:883 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:919 + #: apt.conf.5.xml:891 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:894 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:929 + #: apt.conf.5.xml:901 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:905 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:941 + #: apt.conf.5.xml:913 msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "<literal>Debug::pkgPackageManager</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:945 + #: apt.conf.5.xml:917 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:952 + #: apt.conf.5.xml:924 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:928 msgid "Output the priority of each package list on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:962 + #: apt.conf.5.xml:934 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:938 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:974 + #: apt.conf.5.xml:946 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:949 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 " @@@ -7726,12 -7479,12 +7541,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:985 + #: apt.conf.5.xml:957 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:961 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." @@@ -7739,7 -7492,7 +7554,7 @@@ msgstr " # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:1012 + #: apt.conf.5.xml:983 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." @@@ -7749,16 -7502,15 +7564,15 @@@ msgstr " # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><variablelist> - #: apt.conf.5.xml:1019 + #: apt.conf.5.xml:990 #, fuzzy - #| msgid "&apt-conf;" msgid "&file-aptconf;" msgstr "&apt-conf;" # type: Content of: <refentry><refsect1><para> #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:1024 + #: apt.conf.5.xml:995 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-cache;, &apt-config;, &apt-preferences;." @@@ -7784,10 -7536,6 +7598,6 @@@ msgstr "APT 設定制御ファイル #. type: Content of: <refentry><refsect1><para> #: apt_preferences.5.xml:34 #, fuzzy - #| 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 " @@@ -9022,7 -8770,6 +8832,6 @@@ msgstr " #. type: Content of: <refentry><refsect1><variablelist> #: apt_preferences.5.xml:617 #, fuzzy - #| msgid "apt_preferences" msgid "&file-preferences;" msgstr "apt_preferences" diff --combined doc/po/pl.po index 27b7a8a7b,3b3670abf..a413bb862 --- a/doc/po/pl.po +++ b/doc/po/pl.po @@@ -9,7 -9,7 +9,7 @@@ msgid "" msgstr "" "Project-Id-Version: apt\n" - "POT-Creation-Date: 2009-11-27 00:05+0100\n" + "POT-Creation-Date: 2009-12-10 22:04+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" @@@ -1203,7 -1203,7 +1203,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:456 apt.conf.5.xml:478 +#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:484 apt.conf.5.xml:506 #, fuzzy msgid "options" msgstr "Kolejne kroki" @@@ -1405,7 -1405,7 +1405,7 @@@ msgstr " #. 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.conf.5.xml:988 apt_preferences.5.xml:615 msgid "Files" msgstr "" @@@ -1418,7 -1418,7 +1418,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: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-sortpkgs.1.xml:69 apt.conf.5.xml:994 apt_preferences.5.xml:622 #: sources.list.5.xml:233 msgid "See Also" msgstr "" @@@ -2702,7 -2702,7 +2702,7 @@@ msgid " msgstr "" #. 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:561 apt.conf.5.xml:982 apt_preferences.5.xml:462 #: sources.list.5.xml:193 msgid "Examples" msgstr "" @@@ -4611,7 -4611,7 +4611,7 @@@ msgid " msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:264 apt.conf.5.xml:328 + #: apt.conf.5.xml:264 apt.conf.5.xml:321 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method, this applies to all things including connection timeout and data " @@@ -4640,31 -4640,21 +4640,31 @@@ msgid " "multiple servers at the same time.)" msgstr "" +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:280 +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 " +"clients only if the client uses a known identifier." +msgstr "" + #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> - #: apt.conf.5.xml:286 + #: apt.conf.5.xml:281 msgid "https" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:287 + #: apt.conf.5.xml:282 msgid "" -"HTTPS URIs. Cache-control and proxy options are the same as for " -"<literal>http</literal> method. <literal>Pipeline-Depth</literal> option is " +"HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy " +"options are the same as for <literal>http</literal> method and will also " +"default to the options from the <literal>http</literal> method if they are " +"not explicitly set for https. <literal>Pipeline-Depth</literal> option is " "not supported yet." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:293 + #: apt.conf.5.xml:286 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is " @@@ -4685,12 -4675,12 +4685,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> - #: apt.conf.5.xml:311 sources.list.5.xml:150 + #: apt.conf.5.xml:304 sources.list.5.xml:150 msgid "ftp" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:312 + #: apt.conf.5.xml:305 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 " @@@ -4709,7 -4699,7 +4709,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:331 + #: apt.conf.5.xml:324 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 " @@@ -4719,7 -4709,7 +4719,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:338 + #: apt.conf.5.xml:331 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 " @@@ -4728,7 -4718,7 +4728,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:343 + #: apt.conf.5.xml:336 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@@ -4738,18 -4728,18 +4738,18 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> - #: apt.conf.5.xml:350 sources.list.5.xml:132 + #: apt.conf.5.xml:343 sources.list.5.xml:132 msgid "cdrom" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> - #: apt.conf.5.xml:356 + #: apt.conf.5.xml:349 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:351 + #: apt.conf.5.xml:344 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 " @@@ -4762,12 -4752,12 +4762,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> - #: apt.conf.5.xml:361 + #: apt.conf.5.xml:354 msgid "gpgv" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:362 + #: apt.conf.5.xml:355 msgid "" "GPGV URIs; the only option for GPGV URIs is the option to pass additional " "parameters to gpgv. <literal>gpgv::Options</literal> Additional options " @@@ -4775,18 -4765,18 +4775,18 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> - #: apt.conf.5.xml:367 + #: apt.conf.5.xml:360 msgid "CompressionTypes" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> - #: apt.conf.5.xml:373 + #: apt.conf.5.xml:366 #, 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:368 + #: apt.conf.5.xml:361 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@@ -4798,19 -4788,19 +4798,19 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> - #: apt.conf.5.xml:378 + #: apt.conf.5.xml:371 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> - #: apt.conf.5.xml:381 + #: apt.conf.5.xml:374 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:374 + #: apt.conf.5.xml:367 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 " @@@ -4827,13 -4817,13 +4827,13 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> - #: apt.conf.5.xml:385 + #: apt.conf.5.xml:378 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:383 + #: apt.conf.5.xml:376 msgid "" "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" "replaceable></literal> will be checked: If this setting exists the method " @@@ -4848,7 -4838,7 +4848,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:390 + #: apt.conf.5.xml:383 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 " @@@ -4857,53 -4847,6 +4857,53 @@@ "prefer uncompressed files to support the usage of local mirrors." msgstr "" +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:396 +msgid "Languages" +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:397 +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." +msgstr "" + +#. 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 "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:403 +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" +"\"/>" +msgstr "" + #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:217 msgid "" @@@ -4912,12 -4855,12 +4912,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:420 + #: apt.conf.5.xml:392 msgid "Directories" msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:422 + #: apt.conf.5.xml:394 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@@ -4929,7 -4872,7 +4929,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:429 + #: apt.conf.5.xml:401 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@@ -4942,7 -4885,7 +4942,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:438 + #: apt.conf.5.xml:410 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@@ -4952,7 -4895,7 +4952,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:444 + #: apt.conf.5.xml:416 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 " @@@ -4960,7 -4903,7 +4960,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:448 + #: apt.conf.5.xml:420 msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" "Bin::Methods</literal> specifies the location of the method handlers and " @@@ -4971,7 -4914,7 +4971,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:456 + #: apt.conf.5.xml:428 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@@ -4984,12 -4927,12 +4984,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:469 + #: apt.conf.5.xml:441 msgid "APT in DSelect" msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:471 + #: apt.conf.5.xml:443 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behaviour. These are in the <literal>DSelect</literal> " @@@ -4997,12 -4940,12 +4997,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:475 + #: apt.conf.5.xml:447 msgid "Clean" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:476 + #: apt.conf.5.xml:448 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 " @@@ -5013,50 -4956,50 +5013,50 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:485 + #: apt.conf.5.xml:457 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:489 + #: apt.conf.5.xml:461 msgid "Updateoptions" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:490 + #: apt.conf.5.xml:462 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:494 + #: apt.conf.5.xml:466 msgid "PromptAfterUpdate" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:495 + #: apt.conf.5.xml:467 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:501 + #: apt.conf.5.xml:473 msgid "How APT calls dpkg" msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:502 + #: apt.conf.5.xml:474 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:507 + #: apt.conf.5.xml:479 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 " @@@ -5064,17 -5007,17 +5064,17 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:512 + #: apt.conf.5.xml:484 msgid "Pre-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:512 + #: apt.conf.5.xml:484 msgid "Post-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:513 + #: apt.conf.5.xml:485 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 " @@@ -5083,12 -5026,12 +5083,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:519 + #: apt.conf.5.xml:491 msgid "Pre-Install-Pkgs" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:520 + #: apt.conf.5.xml:492 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 " @@@ -5098,7 -5041,7 +5098,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:526 + #: apt.conf.5.xml:498 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@@ -5108,36 -5051,36 +5108,36 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:533 + #: apt.conf.5.xml:505 msgid "Run-Directory" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:534 + #: apt.conf.5.xml:506 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:538 + #: apt.conf.5.xml:510 msgid "Build-options" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:539 + #: apt.conf.5.xml:511 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:544 + #: apt.conf.5.xml:516 msgid "dpkg trigger usage (and related options)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> - #: apt.conf.5.xml:545 + #: apt.conf.5.xml:517 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 " @@@ -5152,7 -5095,7 +5152,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> - #: apt.conf.5.xml:560 + #: apt.conf.5.xml:532 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@@ -5162,7 -5105,7 +5162,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> - #: apt.conf.5.xml:554 + #: apt.conf.5.xml:526 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 " @@@ -5176,12 -5119,12 +5176,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> - #: apt.conf.5.xml:566 + #: apt.conf.5.xml:538 msgid "DPkg::NoTriggers" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:567 + #: apt.conf.5.xml:539 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 " @@@ -5193,12 -5136,12 +5193,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> - #: apt.conf.5.xml:574 + #: apt.conf.5.xml:546 msgid "PackageManager::Configure" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:575 + #: apt.conf.5.xml:547 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@@ -5214,12 -5157,12 +5214,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> - #: apt.conf.5.xml:585 + #: apt.conf.5.xml:557 msgid "DPkg::ConfigurePending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:586 + #: apt.conf.5.xml:558 msgid "" "If this option is set apt will call <command>dpkg --configure --pending</" "command> to let dpkg handle all required configurations and triggers. This " @@@ -5230,12 -5173,12 +5230,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> - #: apt.conf.5.xml:592 + #: apt.conf.5.xml:564 msgid "DPkg::TriggersPending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:593 + #: apt.conf.5.xml:565 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@@ -5245,12 -5188,12 +5245,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> - #: apt.conf.5.xml:598 + #: apt.conf.5.xml:570 msgid "PackageManager::UnpackAll" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:599 + #: apt.conf.5.xml:571 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-" @@@ -5262,12 -5205,12 +5262,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> - #: apt.conf.5.xml:606 + #: apt.conf.5.xml:578 msgid "OrderList::Score::Immediate" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> - #: apt.conf.5.xml:614 + #: apt.conf.5.xml:586 #, no-wrap msgid "" "OrderList::Score {\n" @@@ -5279,7 -5222,7 +5279,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:607 + #: apt.conf.5.xml:579 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 " @@@ -5293,12 -5236,12 +5293,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:627 + #: apt.conf.5.xml:599 msgid "Periodic and Archives options" msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:628 + #: apt.conf.5.xml:600 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@@ -5307,12 -5250,12 +5307,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:636 + #: apt.conf.5.xml:608 msgid "Debug options" msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:638 + #: apt.conf.5.xml:610 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@@ -5323,7 -5266,7 +5323,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> - #: apt.conf.5.xml:649 + #: apt.conf.5.xml:621 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@@ -5331,7 -5274,7 +5331,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> - #: apt.conf.5.xml:657 + #: apt.conf.5.xml:629 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@@ -5339,7 -5282,7 +5339,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> - #: apt.conf.5.xml:666 + #: apt.conf.5.xml:638 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@@ -5349,111 -5292,111 +5349,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:674 + #: apt.conf.5.xml:646 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:684 + #: apt.conf.5.xml:656 msgid "A full list of debugging options to apt follows." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:689 + #: apt.conf.5.xml:661 msgid "<literal>Debug::Acquire::cdrom</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:693 + #: apt.conf.5.xml:665 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:700 + #: apt.conf.5.xml:672 msgid "<literal>Debug::Acquire::ftp</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:704 + #: apt.conf.5.xml:676 msgid "Print information related to downloading packages using FTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:711 + #: apt.conf.5.xml:683 msgid "<literal>Debug::Acquire::http</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:715 + #: apt.conf.5.xml:687 msgid "Print information related to downloading packages using HTTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:722 + #: apt.conf.5.xml:694 msgid "<literal>Debug::Acquire::https</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:726 + #: apt.conf.5.xml:698 msgid "Print information related to downloading packages using HTTPS." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:733 + #: apt.conf.5.xml:705 msgid "<literal>Debug::Acquire::gpgv</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:737 + #: apt.conf.5.xml:709 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:744 + #: apt.conf.5.xml:716 msgid "<literal>Debug::aptcdrom</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:748 + #: apt.conf.5.xml:720 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:755 + #: apt.conf.5.xml:727 msgid "<literal>Debug::BuildDeps</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:758 + #: apt.conf.5.xml:730 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:765 + #: apt.conf.5.xml:737 msgid "<literal>Debug::Hashes</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:768 + #: apt.conf.5.xml:740 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:775 + #: apt.conf.5.xml:747 msgid "<literal>Debug::IdentCDROM</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:778 + #: apt.conf.5.xml:750 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 " @@@ -5461,93 -5404,93 +5461,93 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:786 + #: apt.conf.5.xml:758 msgid "<literal>Debug::NoLocking</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:789 + #: apt.conf.5.xml:761 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:797 + #: apt.conf.5.xml:769 msgid "<literal>Debug::pkgAcquire</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:801 + #: apt.conf.5.xml:773 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:808 + #: apt.conf.5.xml:780 msgid "<literal>Debug::pkgAcquire::Auth</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:811 + #: apt.conf.5.xml:783 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:818 + #: apt.conf.5.xml:790 msgid "<literal>Debug::pkgAcquire::Diffs</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:821 + #: apt.conf.5.xml:793 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:829 + #: apt.conf.5.xml:801 msgid "<literal>Debug::pkgAcquire::RRed</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:833 + #: apt.conf.5.xml:805 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:840 + #: apt.conf.5.xml:812 msgid "<literal>Debug::pkgAcquire::Worker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:844 + #: apt.conf.5.xml:816 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:851 + #: apt.conf.5.xml:823 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:855 + #: apt.conf.5.xml:827 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:862 + #: apt.conf.5.xml:834 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:865 + #: apt.conf.5.xml:837 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@@ -5557,12 -5500,12 +5557,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:876 + #: apt.conf.5.xml:848 msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:879 + #: apt.conf.5.xml:851 msgid "" "Generate debug messages describing which package is marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@@ -5579,91 -5522,91 +5579,91 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:898 + #: apt.conf.5.xml:870 msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:901 + #: apt.conf.5.xml:873 msgid "Dump the default configuration to standard error on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:908 + #: apt.conf.5.xml:880 msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:911 + #: apt.conf.5.xml:883 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:919 + #: apt.conf.5.xml:891 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:922 + #: apt.conf.5.xml:894 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:929 + #: apt.conf.5.xml:901 msgid "<literal>Debug::pkgOrderList</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:933 + #: apt.conf.5.xml:905 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:941 + #: apt.conf.5.xml:913 msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:945 + #: apt.conf.5.xml:917 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:952 + #: apt.conf.5.xml:924 msgid "<literal>Debug::pkgPolicy</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:956 + #: apt.conf.5.xml:928 msgid "Output the priority of each package list on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:962 + #: apt.conf.5.xml:934 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:966 + #: apt.conf.5.xml:938 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:974 + #: apt.conf.5.xml:946 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:977 + #: apt.conf.5.xml:949 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 " @@@ -5671,32 -5614,32 +5671,32 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:985 + #: apt.conf.5.xml:957 msgid "<literal>Debug::sourceList</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:989 + #: apt.conf.5.xml:961 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:1012 + #: apt.conf.5.xml:983 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." msgstr "" #. type: Content of: <refentry><refsect1><variablelist> - #: apt.conf.5.xml:1019 + #: apt.conf.5.xml:990 msgid "&file-aptconf;" msgstr "" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:1024 + #: apt.conf.5.xml:995 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "" diff --combined doc/po/pt_BR.po index ea410fc4d,de86f98bb..f24b9dfd5 --- a/doc/po/pt_BR.po +++ b/doc/po/pt_BR.po @@@ -9,7 -9,7 +9,7 @@@ msgid "" msgstr "" "Project-Id-Version: apt\n" - "POT-Creation-Date: 2009-11-27 00:05+0100\n" + "POT-Creation-Date: 2009-12-10 22:04+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" @@@ -1249,7 -1249,7 +1249,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:456 apt.conf.5.xml:478 +#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:484 apt.conf.5.xml:506 msgid "options" msgstr "" @@@ -1450,7 -1450,7 +1450,7 @@@ msgstr " #. 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.conf.5.xml:988 apt_preferences.5.xml:615 msgid "Files" msgstr "" @@@ -1463,7 -1463,7 +1463,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: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-sortpkgs.1.xml:69 apt.conf.5.xml:994 apt_preferences.5.xml:622 #: sources.list.5.xml:233 #, fuzzy msgid "See Also" @@@ -2749,7 -2749,7 +2749,7 @@@ msgid " msgstr "" #. 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:561 apt.conf.5.xml:982 apt_preferences.5.xml:462 #: sources.list.5.xml:193 #, fuzzy msgid "Examples" @@@ -4660,7 -4660,7 +4660,7 @@@ msgid " msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:264 apt.conf.5.xml:328 + #: apt.conf.5.xml:264 apt.conf.5.xml:321 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method, this applies to all things including connection timeout and data " @@@ -4689,31 -4689,21 +4689,31 @@@ msgid " "multiple servers at the same time.)" msgstr "" +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:280 +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 " +"clients only if the client uses a known identifier." +msgstr "" + #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> - #: apt.conf.5.xml:286 + #: apt.conf.5.xml:281 msgid "https" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:287 + #: apt.conf.5.xml:282 msgid "" -"HTTPS URIs. Cache-control and proxy options are the same as for " -"<literal>http</literal> method. <literal>Pipeline-Depth</literal> option is " +"HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy " +"options are the same as for <literal>http</literal> method and will also " +"default to the options from the <literal>http</literal> method if they are " +"not explicitly set for https. <literal>Pipeline-Depth</literal> option is " "not supported yet." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:293 + #: apt.conf.5.xml:286 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is " @@@ -4734,12 -4724,12 +4734,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> - #: apt.conf.5.xml:311 sources.list.5.xml:150 + #: apt.conf.5.xml:304 sources.list.5.xml:150 msgid "ftp" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:312 + #: apt.conf.5.xml:305 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 " @@@ -4758,7 -4748,7 +4758,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:331 + #: apt.conf.5.xml:324 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 " @@@ -4768,7 -4758,7 +4768,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:338 + #: apt.conf.5.xml:331 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 " @@@ -4777,7 -4767,7 +4777,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:343 + #: apt.conf.5.xml:336 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@@ -4787,18 -4777,18 +4787,18 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> - #: apt.conf.5.xml:350 sources.list.5.xml:132 + #: apt.conf.5.xml:343 sources.list.5.xml:132 msgid "cdrom" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> - #: apt.conf.5.xml:356 + #: apt.conf.5.xml:349 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:351 + #: apt.conf.5.xml:344 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 " @@@ -4811,12 -4801,12 +4811,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> - #: apt.conf.5.xml:361 + #: apt.conf.5.xml:354 msgid "gpgv" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:362 + #: apt.conf.5.xml:355 msgid "" "GPGV URIs; the only option for GPGV URIs is the option to pass additional " "parameters to gpgv. <literal>gpgv::Options</literal> Additional options " @@@ -4824,18 -4814,18 +4824,18 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> - #: apt.conf.5.xml:367 + #: apt.conf.5.xml:360 msgid "CompressionTypes" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> - #: apt.conf.5.xml:373 + #: apt.conf.5.xml:366 #, 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:368 + #: apt.conf.5.xml:361 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@@ -4847,19 -4837,19 +4847,19 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> - #: apt.conf.5.xml:378 + #: apt.conf.5.xml:371 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> - #: apt.conf.5.xml:381 + #: apt.conf.5.xml:374 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:374 + #: apt.conf.5.xml:367 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 " @@@ -4876,13 -4866,13 +4876,13 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> - #: apt.conf.5.xml:385 + #: apt.conf.5.xml:378 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:383 + #: apt.conf.5.xml:376 msgid "" "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" "replaceable></literal> will be checked: If this setting exists the method " @@@ -4897,7 -4887,7 +4897,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:390 + #: apt.conf.5.xml:383 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 " @@@ -4906,53 -4896,6 +4906,53 @@@ "prefer uncompressed files to support the usage of local mirrors." msgstr "" +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:396 +msgid "Languages" +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:397 +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." +msgstr "" + +#. 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 "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:403 +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" +"\"/>" +msgstr "" + #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:217 msgid "" @@@ -4961,12 -4904,12 +4961,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:420 + #: apt.conf.5.xml:392 msgid "Directories" msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:422 + #: apt.conf.5.xml:394 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@@ -4978,7 -4921,7 +4978,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:429 + #: apt.conf.5.xml:401 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@@ -4991,7 -4934,7 +4991,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:438 + #: apt.conf.5.xml:410 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@@ -5001,7 -4944,7 +5001,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:444 + #: apt.conf.5.xml:416 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 " @@@ -5009,7 -4952,7 +5009,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:448 + #: apt.conf.5.xml:420 msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" "Bin::Methods</literal> specifies the location of the method handlers and " @@@ -5020,7 -4963,7 +5020,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:456 + #: apt.conf.5.xml:428 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@@ -5033,12 -4976,12 +5033,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:469 + #: apt.conf.5.xml:441 msgid "APT in DSelect" msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:471 + #: apt.conf.5.xml:443 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behaviour. These are in the <literal>DSelect</literal> " @@@ -5046,12 -4989,12 +5046,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:475 + #: apt.conf.5.xml:447 msgid "Clean" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:476 + #: apt.conf.5.xml:448 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 " @@@ -5062,50 -5005,50 +5062,50 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:485 + #: apt.conf.5.xml:457 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:489 + #: apt.conf.5.xml:461 msgid "Updateoptions" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:490 + #: apt.conf.5.xml:462 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:494 + #: apt.conf.5.xml:466 msgid "PromptAfterUpdate" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:495 + #: apt.conf.5.xml:467 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:501 + #: apt.conf.5.xml:473 msgid "How APT calls dpkg" msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:502 + #: apt.conf.5.xml:474 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:507 + #: apt.conf.5.xml:479 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 " @@@ -5113,17 -5056,17 +5113,17 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:512 + #: apt.conf.5.xml:484 msgid "Pre-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:512 + #: apt.conf.5.xml:484 msgid "Post-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:513 + #: apt.conf.5.xml:485 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 " @@@ -5132,12 -5075,12 +5132,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:519 + #: apt.conf.5.xml:491 msgid "Pre-Install-Pkgs" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:520 + #: apt.conf.5.xml:492 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 " @@@ -5147,7 -5090,7 +5147,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:526 + #: apt.conf.5.xml:498 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@@ -5157,36 -5100,36 +5157,36 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:533 + #: apt.conf.5.xml:505 msgid "Run-Directory" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:534 + #: apt.conf.5.xml:506 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:538 + #: apt.conf.5.xml:510 msgid "Build-options" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:539 + #: apt.conf.5.xml:511 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:544 + #: apt.conf.5.xml:516 msgid "dpkg trigger usage (and related options)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> - #: apt.conf.5.xml:545 + #: apt.conf.5.xml:517 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 " @@@ -5201,7 -5144,7 +5201,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> - #: apt.conf.5.xml:560 + #: apt.conf.5.xml:532 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@@ -5211,7 -5154,7 +5211,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> - #: apt.conf.5.xml:554 + #: apt.conf.5.xml:526 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 " @@@ -5225,12 -5168,12 +5225,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> - #: apt.conf.5.xml:566 + #: apt.conf.5.xml:538 msgid "DPkg::NoTriggers" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:567 + #: apt.conf.5.xml:539 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 " @@@ -5242,12 -5185,12 +5242,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> - #: apt.conf.5.xml:574 + #: apt.conf.5.xml:546 msgid "PackageManager::Configure" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:575 + #: apt.conf.5.xml:547 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@@ -5263,12 -5206,12 +5263,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> - #: apt.conf.5.xml:585 + #: apt.conf.5.xml:557 msgid "DPkg::ConfigurePending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:586 + #: apt.conf.5.xml:558 msgid "" "If this option is set apt will call <command>dpkg --configure --pending</" "command> to let dpkg handle all required configurations and triggers. This " @@@ -5279,12 -5222,12 +5279,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> - #: apt.conf.5.xml:592 + #: apt.conf.5.xml:564 msgid "DPkg::TriggersPending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:593 + #: apt.conf.5.xml:565 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@@ -5294,12 -5237,12 +5294,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> - #: apt.conf.5.xml:598 + #: apt.conf.5.xml:570 msgid "PackageManager::UnpackAll" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:599 + #: apt.conf.5.xml:571 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-" @@@ -5311,12 -5254,12 +5311,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> - #: apt.conf.5.xml:606 + #: apt.conf.5.xml:578 msgid "OrderList::Score::Immediate" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> - #: apt.conf.5.xml:614 + #: apt.conf.5.xml:586 #, no-wrap msgid "" "OrderList::Score {\n" @@@ -5328,7 -5271,7 +5328,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:607 + #: apt.conf.5.xml:579 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 " @@@ -5342,12 -5285,12 +5342,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:627 + #: apt.conf.5.xml:599 msgid "Periodic and Archives options" msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:628 + #: apt.conf.5.xml:600 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@@ -5356,12 -5299,12 +5356,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:636 + #: apt.conf.5.xml:608 msgid "Debug options" msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:638 + #: apt.conf.5.xml:610 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@@ -5372,7 -5315,7 +5372,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> - #: apt.conf.5.xml:649 + #: apt.conf.5.xml:621 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@@ -5380,7 -5323,7 +5380,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> - #: apt.conf.5.xml:657 + #: apt.conf.5.xml:629 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@@ -5388,7 -5331,7 +5388,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> - #: apt.conf.5.xml:666 + #: apt.conf.5.xml:638 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@@ -5398,120 -5341,120 +5398,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:674 + #: apt.conf.5.xml:646 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:684 + #: apt.conf.5.xml:656 msgid "A full list of debugging options to apt follows." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:689 + #: apt.conf.5.xml:661 #, 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:693 + #: apt.conf.5.xml:665 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:700 + #: apt.conf.5.xml:672 #, 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:704 + #: apt.conf.5.xml:676 msgid "Print information related to downloading packages using FTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:711 + #: apt.conf.5.xml:683 #, 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:715 + #: apt.conf.5.xml:687 msgid "Print information related to downloading packages using HTTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:722 + #: apt.conf.5.xml:694 #, 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:726 + #: apt.conf.5.xml:698 msgid "Print information related to downloading packages using HTTPS." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:733 + #: apt.conf.5.xml:705 #, 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:737 + #: apt.conf.5.xml:709 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:744 + #: apt.conf.5.xml:716 #, 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:748 + #: apt.conf.5.xml:720 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:755 + #: apt.conf.5.xml:727 #, 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:758 + #: apt.conf.5.xml:730 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:765 + #: apt.conf.5.xml:737 #, 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:768 + #: apt.conf.5.xml:740 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:775 + #: apt.conf.5.xml:747 #, 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:778 + #: apt.conf.5.xml:750 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 " @@@ -5519,99 -5462,99 +5519,99 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:786 + #: apt.conf.5.xml:758 #, 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:789 + #: apt.conf.5.xml:761 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:797 + #: apt.conf.5.xml:769 #, 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:801 + #: apt.conf.5.xml:773 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:808 + #: apt.conf.5.xml:780 #, 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:811 + #: apt.conf.5.xml:783 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:818 + #: apt.conf.5.xml:790 #, 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:821 + #: apt.conf.5.xml:793 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:829 + #: apt.conf.5.xml:801 #, 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:833 + #: apt.conf.5.xml:805 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:840 + #: apt.conf.5.xml:812 #, 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:844 + #: apt.conf.5.xml:816 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:851 + #: apt.conf.5.xml:823 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:855 + #: apt.conf.5.xml:827 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:862 + #: apt.conf.5.xml:834 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:865 + #: apt.conf.5.xml:837 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@@ -5621,12 -5564,12 +5621,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:876 + #: apt.conf.5.xml:848 msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:879 + #: apt.conf.5.xml:851 msgid "" "Generate debug messages describing which package is marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@@ -5643,96 -5586,96 +5643,96 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:898 + #: apt.conf.5.xml:870 #, 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:901 + #: apt.conf.5.xml:873 msgid "Dump the default configuration to standard error on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:908 + #: apt.conf.5.xml:880 #, 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:911 + #: apt.conf.5.xml:883 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:919 + #: apt.conf.5.xml:891 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:922 + #: apt.conf.5.xml:894 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:929 + #: apt.conf.5.xml:901 #, 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:933 + #: apt.conf.5.xml:905 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:941 + #: apt.conf.5.xml:913 #, 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:945 + #: apt.conf.5.xml:917 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:952 + #: apt.conf.5.xml:924 #, 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:956 + #: apt.conf.5.xml:928 msgid "Output the priority of each package list on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:962 + #: apt.conf.5.xml:934 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:966 + #: apt.conf.5.xml:938 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:974 + #: apt.conf.5.xml:946 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:977 + #: apt.conf.5.xml:949 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 " @@@ -5740,33 -5683,33 +5740,33 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> - #: apt.conf.5.xml:985 + #: apt.conf.5.xml:957 #, 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:989 + #: apt.conf.5.xml:961 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:1012 + #: apt.conf.5.xml:983 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." msgstr "" #. type: Content of: <refentry><refsect1><variablelist> - #: apt.conf.5.xml:1019 + #: apt.conf.5.xml:990 msgid "&file-aptconf;" msgstr "" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:1024 + #: apt.conf.5.xml:995 #, fuzzy msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;" diff --combined methods/http.cc index 8fcff0b5d,3b210f6b6..2dae87a02 --- a/methods/http.cc +++ b/methods/http.cc @@@ -29,6 -29,7 +29,7 @@@ #include <apt-pkg/acquire-method.h> #include <apt-pkg/error.h> #include <apt-pkg/hashes.h> + #include <apt-pkg/netrc.h> #include <sys/stat.h> #include <sys/time.h> @@@ -42,6 -43,7 +43,7 @@@ #include <map> #include <apti18n.h> + // Internet stuff #include <netdb.h> @@@ -49,7 -51,6 +51,6 @@@ #include "connect.h" #include "rfc2553emu.h" #include "http.h" - /*}}}*/ using namespace std; @@@ -724,12 -725,13 +725,14 @@@ void HttpMethod::SendReq(FetchItem *Itm Req += string("Proxy-Authorization: Basic ") + Base64Encode(Proxy.User + ":" + Proxy.Password) + "\r\n"; + maybe_add_auth (Uri, _config->FindFile("Dir::Etc::netrc")); if (Uri.User.empty() == false || Uri.Password.empty() == false) + { 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 --combined methods/https.cc index 4daa04e32,86d7f3a6b..726f53c44 --- a/methods/https.cc +++ b/methods/https.cc @@@ -1,4 -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 $ /* ###################################################################### @@@ -14,6 -14,7 +14,7 @@@ #include <apt-pkg/acquire-method.h> #include <apt-pkg/error.h> #include <apt-pkg/hashes.h> + #include <apt-pkg/netrc.h> #include <sys/stat.h> #include <sys/time.h> @@@ -56,38 -57,54 +57,38 @@@ HttpsMethod::progress_callback(void *cl 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 @@@ -110,8 -127,10 +111,10 @@@ bool HttpsMethod::Fetch(FetchItem *Itm curl_easy_reset(curl); SetupProxy(); + maybe_add_auth (Uri, _config->FindFile("Dir::Etc::netrc")); + // callbacks - curl_easy_setopt(curl, CURLOPT_URL, Itm->Uri.c_str()); + curl_easy_setopt(curl, CURLOPT_URL, static_cast<string>(Uri).c_str()); curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_data); curl_easy_setopt(curl, CURLOPT_WRITEDATA, this); curl_easy_setopt(curl, CURLOPT_PROGRESSFUNCTION, progress_callback); @@@ -119,7 -138,6 +122,6 @@@ curl_easy_setopt(curl, CURLOPT_NOPROGRESS, false); curl_easy_setopt(curl, CURLOPT_FAILONERROR, true); curl_easy_setopt(curl, CURLOPT_FILETIME, true); - curl_easy_setopt(curl, CURLOPT_NETRC, CURL_NETRC_OPTIONAL); // SSL parameters are set by default to the common (non mirror-specific) value // if available (or a default one) and gets overload by mirror-specific ones. @@@ -173,15 -191,12 +175,15 @@@ 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 @@@ -191,26 -206,22 +193,29 @@@ 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); // 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")")).c_str()); // 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 really low lowspeed timeout (see #497983) + curl_easy_setopt(curl, CURLOPT_LOW_SPEED_LIMIT, DL_MIN_SPEED); + curl_easy_setopt(curl, CURLOPT_LOW_SPEED_TIME, 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); diff --combined po/apt-all.pot index b6610a191,ac231dff9..4ccf7413d --- a/po/apt-all.pot +++ b/po/apt-all.pot @@@ -7,7 -7,7 +7,7 @@@ msgid " msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2009-11-28 02:10+0100\n" -"POT-Creation-Date: 2009-12-10 22:06+0100\n" ++"POT-Creation-Date: 2009-12-10 23:01+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" @@@ -151,7 -151,7 +151,7 @@@ 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:2653 cmdline/apt-sortpkgs.cc:144 + #: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "" @@@ -342,7 -342,7 +342,7 @@@ msgstr " #: ftparchive/cachedb.cc:72 msgid "" --"DB format is invalid. If you upgraded from a older version of apt, please " ++"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" @@@ -357,11 -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 +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 "" @@@ -549,7 -549,7 +549,7 @@@ msgstr " msgid "Y" msgstr "" - #: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718 + #: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 #, c-format msgid "Regex compilation error - %s" msgstr "" @@@ -708,11 -708,11 +708,11 @@@ msgstr " msgid "Internal error, Ordering didn't finish" msgstr "" - #: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093 + #: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105 msgid "Unable to lock the download directory" msgstr "" - #: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394 + #: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "" @@@ -741,8 -741,8 +741,8 @@@ msgstr " msgid "After this operation, %sB disk space will be freed.\n" msgstr "" - #: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237 - #: cmdline/apt-get.cc:2240 + #: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 + #: cmdline/apt-get.cc:2252 #, c-format msgid "Couldn't determine free space in %s" msgstr "" @@@ -776,7 -776,7 +776,7 @@@ msgstr " msgid "Do you want to continue [Y/n]? " msgstr "" - #: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389 + #: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" @@@ -785,7 -785,7 +785,7 @@@ msgid "Some files failed to download" msgstr "" - #: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300 + #: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 msgid "Download complete and in download only mode" msgstr "" @@@ -878,49 -878,49 +878,49 @@@ msgid "Selected version %s (%s) for %s\ msgstr "" #. if (VerTag.empty() == false && Last == 0) - #: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367 + #: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "" - #: cmdline/apt-get.cc:1307 + #: cmdline/apt-get.cc:1313 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" - #: cmdline/apt-get.cc:1332 + #: cmdline/apt-get.cc:1342 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "" - #: cmdline/apt-get.cc:1383 + #: cmdline/apt-get.cc:1395 msgid "The update command takes no arguments" msgstr "" - #: cmdline/apt-get.cc:1396 + #: cmdline/apt-get.cc:1408 msgid "Unable to lock the list directory" msgstr "" - #: cmdline/apt-get.cc:1452 + #: cmdline/apt-get.cc:1464 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" - #: cmdline/apt-get.cc:1501 + #: cmdline/apt-get.cc:1513 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "" - #: cmdline/apt-get.cc:1503 + #: cmdline/apt-get.cc:1515 #, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "" - #: cmdline/apt-get.cc:1504 + #: cmdline/apt-get.cc:1516 msgid "Use 'apt-get autoremove' to remove them." msgstr "" - #: cmdline/apt-get.cc:1509 + #: cmdline/apt-get.cc:1521 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@@ -936,49 -936,49 +936,49 @@@ msgstr " #. "that package should be filed.") << endl; #. } #. - #: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802 + #: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 msgid "The following information may help to resolve the situation:" msgstr "" - #: cmdline/apt-get.cc:1516 + #: cmdline/apt-get.cc:1528 msgid "Internal Error, AutoRemover broke stuff" msgstr "" - #: cmdline/apt-get.cc:1535 + #: cmdline/apt-get.cc:1547 msgid "Internal error, AllUpgrade broke stuff" msgstr "" - #: cmdline/apt-get.cc:1590 + #: cmdline/apt-get.cc:1602 #, c-format msgid "Couldn't find task %s" msgstr "" - #: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741 + #: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 #, c-format msgid "Couldn't find package %s" msgstr "" - #: cmdline/apt-get.cc:1728 + #: cmdline/apt-get.cc:1740 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" - #: cmdline/apt-get.cc:1759 + #: cmdline/apt-get.cc:1771 #, c-format msgid "%s set to manually installed.\n" msgstr "" - #: cmdline/apt-get.cc:1772 + #: cmdline/apt-get.cc:1784 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" - #: cmdline/apt-get.cc:1775 + #: cmdline/apt-get.cc:1787 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" - #: cmdline/apt-get.cc:1787 + #: cmdline/apt-get.cc:1799 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@@ -986,152 -986,152 +986,152 @@@ "or been moved out of Incoming." msgstr "" - #: cmdline/apt-get.cc:1805 + #: cmdline/apt-get.cc:1817 msgid "Broken packages" msgstr "" - #: cmdline/apt-get.cc:1834 + #: cmdline/apt-get.cc:1846 msgid "The following extra packages will be installed:" msgstr "" - #: cmdline/apt-get.cc:1923 + #: cmdline/apt-get.cc:1935 msgid "Suggested packages:" msgstr "" - #: cmdline/apt-get.cc:1924 + #: cmdline/apt-get.cc:1936 msgid "Recommended packages:" msgstr "" - #: cmdline/apt-get.cc:1953 + #: cmdline/apt-get.cc:1965 msgid "Calculating upgrade... " msgstr "" - #: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112 + #: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "" - #: cmdline/apt-get.cc:1961 + #: cmdline/apt-get.cc:1973 msgid "Done" msgstr "" - #: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036 + #: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 msgid "Internal error, problem resolver broke stuff" msgstr "" - #: cmdline/apt-get.cc:2136 + #: cmdline/apt-get.cc:2148 msgid "Must specify at least one package to fetch source for" msgstr "" - #: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412 + #: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424 #, c-format msgid "Unable to find a source package for %s" msgstr "" - #: cmdline/apt-get.cc:2215 + #: cmdline/apt-get.cc:2227 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" - #: cmdline/apt-get.cc:2250 + #: cmdline/apt-get.cc:2262 #, c-format msgid "You don't have enough free space in %s" msgstr "" - #: cmdline/apt-get.cc:2256 + #: cmdline/apt-get.cc:2268 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" - #: cmdline/apt-get.cc:2259 + #: cmdline/apt-get.cc:2271 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" - #: cmdline/apt-get.cc:2265 + #: cmdline/apt-get.cc:2277 #, c-format msgid "Fetch source %s\n" msgstr "" - #: cmdline/apt-get.cc:2296 + #: cmdline/apt-get.cc:2308 msgid "Failed to fetch some archives." msgstr "" - #: cmdline/apt-get.cc:2324 + #: cmdline/apt-get.cc:2336 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" - #: cmdline/apt-get.cc:2336 + #: cmdline/apt-get.cc:2348 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" - #: cmdline/apt-get.cc:2337 + #: cmdline/apt-get.cc:2349 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" - #: cmdline/apt-get.cc:2354 + #: cmdline/apt-get.cc:2366 #, c-format msgid "Build command '%s' failed.\n" msgstr "" - #: cmdline/apt-get.cc:2373 + #: cmdline/apt-get.cc:2385 msgid "Child process failed" msgstr "" - #: cmdline/apt-get.cc:2389 + #: cmdline/apt-get.cc:2401 msgid "Must specify at least one package to check builddeps for" msgstr "" - #: cmdline/apt-get.cc:2417 + #: cmdline/apt-get.cc:2429 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" - #: cmdline/apt-get.cc:2437 + #: cmdline/apt-get.cc:2449 #, c-format msgid "%s has no build depends.\n" msgstr "" - #: cmdline/apt-get.cc:2489 + #: cmdline/apt-get.cc:2501 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" - #: cmdline/apt-get.cc:2542 + #: cmdline/apt-get.cc:2554 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" - #: cmdline/apt-get.cc:2578 + #: cmdline/apt-get.cc:2590 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" - #: cmdline/apt-get.cc:2605 + #: cmdline/apt-get.cc:2617 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" - #: cmdline/apt-get.cc:2621 + #: cmdline/apt-get.cc:2633 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" - #: cmdline/apt-get.cc:2626 + #: cmdline/apt-get.cc:2638 msgid "Failed to process build dependencies" msgstr "" - #: cmdline/apt-get.cc:2658 + #: cmdline/apt-get.cc:2670 msgid "Supported modules:" msgstr "" - #: cmdline/apt-get.cc:2699 + #: cmdline/apt-get.cc:2711 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -1175,7 -1175,7 +1175,7 @@@ " This APT has Super Cow Powers.\n" msgstr "" - #: cmdline/apt-get.cc:2867 + #: cmdline/apt-get.cc:2879 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@@ -1408,7 -1408,7 +1408,7 @@@ msgstr " #: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843 #: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166 #: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419 - #: apt-pkg/init.cc:89 apt-pkg/init.cc:97 apt-pkg/clean.cc:33 + #: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 #: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 #, c-format msgid "Unable to read %s" @@@ -1570,11 -1570,11 +1570,11 @@@ msgid "File not found msgstr "" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "" @@@ -1583,147 -1583,147 +1583,147 @@@ msgid "Invalid URI, local URIS must no msgstr "" #. Login must be before getpeername otherwise dante won't work. - #: methods/ftp.cc:167 + #: methods/ftp.cc:168 msgid "Logging in" msgstr "" - #: methods/ftp.cc:173 + #: methods/ftp.cc:174 msgid "Unable to determine the peer name" msgstr "" - #: methods/ftp.cc:178 + #: methods/ftp.cc:179 msgid "Unable to determine the local name" msgstr "" - #: methods/ftp.cc:209 methods/ftp.cc:237 + #: methods/ftp.cc:210 methods/ftp.cc:238 #, c-format msgid "The server refused the connection and said: %s" msgstr "" - #: methods/ftp.cc:215 + #: methods/ftp.cc:216 #, c-format msgid "USER failed, server said: %s" msgstr "" - #: methods/ftp.cc:222 + #: methods/ftp.cc:223 #, c-format msgid "PASS failed, server said: %s" msgstr "" - #: methods/ftp.cc:242 + #: methods/ftp.cc:243 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." msgstr "" - #: methods/ftp.cc:270 + #: methods/ftp.cc:271 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "" - #: methods/ftp.cc:296 + #: methods/ftp.cc:297 #, c-format msgid "TYPE failed, server said: %s" msgstr "" - #: methods/ftp.cc:334 methods/ftp.cc:445 methods/rsh.cc:183 methods/rsh.cc:226 + #: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226 msgid "Connection timeout" msgstr "" - #: methods/ftp.cc:340 + #: methods/ftp.cc:341 msgid "Server closed the connection" msgstr "" - #: methods/ftp.cc:343 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 + #: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 msgid "Read error" msgstr "" - #: methods/ftp.cc:350 methods/rsh.cc:197 + #: methods/ftp.cc:351 methods/rsh.cc:197 msgid "A response overflowed the buffer." msgstr "" - #: methods/ftp.cc:367 methods/ftp.cc:379 + #: methods/ftp.cc:368 methods/ftp.cc:380 msgid "Protocol corruption" msgstr "" - #: methods/ftp.cc:451 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 + #: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 msgid "Write error" msgstr "" - #: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734 + #: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735 msgid "Could not create a socket" msgstr "" - #: methods/ftp.cc:703 + #: methods/ftp.cc:704 msgid "Could not connect data socket, connection timed out" msgstr "" - #: methods/ftp.cc:709 + #: methods/ftp.cc:710 msgid "Could not connect passive socket." msgstr "" - #: methods/ftp.cc:727 + #: methods/ftp.cc:728 msgid "getaddrinfo was unable to get a listening socket" msgstr "" - #: methods/ftp.cc:741 + #: methods/ftp.cc:742 msgid "Could not bind a socket" msgstr "" - #: methods/ftp.cc:745 + #: methods/ftp.cc:746 msgid "Could not listen on the socket" msgstr "" - #: methods/ftp.cc:752 + #: methods/ftp.cc:753 msgid "Could not determine the socket's name" msgstr "" - #: methods/ftp.cc:784 + #: methods/ftp.cc:785 msgid "Unable to send PORT command" msgstr "" - #: methods/ftp.cc:794 + #: methods/ftp.cc:795 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "" - #: methods/ftp.cc:803 + #: methods/ftp.cc:804 #, c-format msgid "EPRT failed, server said: %s" msgstr "" - #: methods/ftp.cc:823 + #: methods/ftp.cc:824 msgid "Data socket connect timed out" msgstr "" - #: methods/ftp.cc:830 + #: methods/ftp.cc:831 msgid "Unable to accept connection" msgstr "" - #: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303 -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 ++#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" - #: methods/ftp.cc:882 + #: methods/ftp.cc:883 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "" - #: methods/ftp.cc:897 methods/rsh.cc:322 + #: methods/ftp.cc:898 methods/rsh.cc:322 msgid "Data socket timed out" msgstr "" - #: methods/ftp.cc:927 + #: methods/ftp.cc:928 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "" #. Get the files information - #: methods/ftp.cc:1002 + #: methods/ftp.cc:1005 msgid "Query" msgstr "" - #: methods/ftp.cc:1114 + #: methods/ftp.cc:1117 msgid "Unable to invoke " msgstr "" @@@ -1764,22 -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 "" @@@ -1831,80 -1831,80 +1831,80 @@@ msgstr " msgid "Read error from %s process" msgstr "" - #: methods/http.cc:384 + #: methods/http.cc:385 msgid "Waiting for headers" msgstr "" - #: methods/http.cc:530 + #: methods/http.cc:531 #, c-format msgid "Got a single header line over %u chars" msgstr "" - #: methods/http.cc:538 + #: methods/http.cc:539 msgid "Bad header line" msgstr "" - #: methods/http.cc:557 methods/http.cc:564 + #: methods/http.cc:558 methods/http.cc:565 msgid "The HTTP server sent an invalid reply header" msgstr "" - #: methods/http.cc:593 + #: methods/http.cc:594 msgid "The HTTP server sent an invalid Content-Length header" msgstr "" - #: methods/http.cc:608 + #: methods/http.cc:609 msgid "The HTTP server sent an invalid Content-Range header" msgstr "" - #: methods/http.cc:610 + #: methods/http.cc:611 msgid "This HTTP server has broken range support" msgstr "" - #: methods/http.cc:634 + #: methods/http.cc:635 msgid "Unknown date format" msgstr "" - #: methods/http.cc:788 -#: methods/http.cc:790 ++#: methods/http.cc:791 msgid "Select failed" msgstr "" - #: methods/http.cc:793 -#: methods/http.cc:795 ++#: methods/http.cc:796 msgid "Connection timed out" msgstr "" - #: methods/http.cc:816 -#: methods/http.cc:818 ++#: methods/http.cc:819 msgid "Error writing to output file" msgstr "" - #: methods/http.cc:847 -#: methods/http.cc:849 ++#: methods/http.cc:850 msgid "Error writing to file" msgstr "" - #: methods/http.cc:875 -#: methods/http.cc:877 ++#: methods/http.cc:878 msgid "Error writing to the file" msgstr "" - #: methods/http.cc:889 -#: methods/http.cc:891 ++#: methods/http.cc:892 msgid "Error reading from server. Remote end closed connection" msgstr "" - #: methods/http.cc:891 -#: methods/http.cc:893 ++#: methods/http.cc:894 msgid "Error reading from server" msgstr "" - #: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233 -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 ++#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 msgid "Failed to truncate file" msgstr "" - #: methods/http.cc:1147 -#: methods/http.cc:1149 ++#: methods/http.cc:1150 msgid "Bad header data" msgstr "" - #: methods/http.cc:1164 methods/http.cc:1219 -#: methods/http.cc:1166 methods/http.cc:1221 ++#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "" - #: methods/http.cc:1311 -#: methods/http.cc:1313 ++#: methods/http.cc:1314 msgid "Internal error" msgstr "" @@@ -1912,25 -1912,18 +1912,25 @@@ msgid "Can't mmap an empty file" msgstr "" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@@ -2316,14 -2309,14 +2316,14 @@@ msgstr " msgid "Malformed line %u in source list %s (vendor id)" msgstr "" - #: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576 + #: apt-pkg/packagemanager.cc:324 apt-pkg/packagemanager.cc:586 #, c-format msgid "" "Could not perform immediate configuration on '%s'.Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" - #: apt-pkg/packagemanager.cc:437 + #: apt-pkg/packagemanager.cc:440 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@@ -2331,7 -2324,7 +2331,7 @@@ "you really want to do it, activate the APT::Force-LoopBreak option." msgstr "" - #: apt-pkg/packagemanager.cc:475 + #: apt-pkg/packagemanager.cc:478 #, c-format msgid "" "Could not perform immediate configuration on already unpacked '%s'.Please " @@@ -2402,12 -2395,12 +2402,12 @@@ msgstr " msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" - #: apt-pkg/init.cc:132 + #: apt-pkg/init.cc:133 #, c-format msgid "Packaging system '%s' is not supported" msgstr "" - #: apt-pkg/init.cc:148 + #: apt-pkg/init.cc:149 msgid "Unable to determine a suitable packaging system type" msgstr "" @@@ -2540,39 -2533,39 +2540,39 @@@ msgstr " msgid "rename failed, %s (%s -> %s)." msgstr "" -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:396 msgid "MD5Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419 msgid "Hash Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1114 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1224 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1283 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1324 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1411 msgid "Size mismatch" msgstr "" @@@ -2699,76 -2692,96 +2699,96 @@@ msgstr " msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" + #: apt-pkg/indexcopy.cc:530 + #, c-format + msgid "Skipping nonexistent file %s" + msgstr "" + + #: apt-pkg/indexcopy.cc:536 + #, c-format + msgid "Can't find authentication record for: %s" + msgstr "" + + #: apt-pkg/indexcopy.cc:542 + #, c-format + msgid "Hash mismatch for: %s" + msgstr "" + #: apt-pkg/deb/dpkgpm.cc:49 #, c-format msgid "Installing %s" msgstr "" - #: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:660 + #: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:661 #, c-format msgid "Configuring %s" msgstr "" - #: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:667 + #: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:668 #, c-format msgid "Removing %s" msgstr "" #: apt-pkg/deb/dpkgpm.cc:52 #, c-format + msgid "Completely removing %s" + msgstr "" + + #: apt-pkg/deb/dpkgpm.cc:53 + #, c-format msgid "Running post-installation trigger %s" msgstr "" - #: apt-pkg/deb/dpkgpm.cc:557 + #: apt-pkg/deb/dpkgpm.cc:558 #, c-format msgid "Directory '%s' missing" msgstr "" - #: apt-pkg/deb/dpkgpm.cc:653 + #: apt-pkg/deb/dpkgpm.cc:654 #, c-format msgid "Preparing %s" msgstr "" - #: apt-pkg/deb/dpkgpm.cc:654 + #: apt-pkg/deb/dpkgpm.cc:655 #, c-format msgid "Unpacking %s" msgstr "" - #: apt-pkg/deb/dpkgpm.cc:659 + #: apt-pkg/deb/dpkgpm.cc:660 #, c-format msgid "Preparing to configure %s" msgstr "" - #: apt-pkg/deb/dpkgpm.cc:661 + #: apt-pkg/deb/dpkgpm.cc:662 #, c-format msgid "Installed %s" msgstr "" - #: apt-pkg/deb/dpkgpm.cc:666 + #: apt-pkg/deb/dpkgpm.cc:667 #, c-format msgid "Preparing for removal of %s" msgstr "" - #: apt-pkg/deb/dpkgpm.cc:668 + #: apt-pkg/deb/dpkgpm.cc:669 #, c-format msgid "Removed %s" msgstr "" - #: apt-pkg/deb/dpkgpm.cc:673 + #: apt-pkg/deb/dpkgpm.cc:674 #, c-format msgid "Preparing to completely remove %s" msgstr "" - #: apt-pkg/deb/dpkgpm.cc:674 + #: apt-pkg/deb/dpkgpm.cc:675 #, c-format msgid "Completely removed %s" msgstr "" - #: apt-pkg/deb/dpkgpm.cc:878 + #: apt-pkg/deb/dpkgpm.cc:879 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" - #: apt-pkg/deb/dpkgpm.cc:907 + #: apt-pkg/deb/dpkgpm.cc:908 msgid "Running dpkg" msgstr "" @@@ -2794,18 -2807,8 +2814,18 @@@ msgstr " msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -msgid "Could not patch file" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." msgstr "" #: methods/rsh.cc:330