From bf5c3fe84c2c9b747ea818706688506bd0e1dfab Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 10 Dec 2009 22:29:48 +0100 Subject: merged -r 1898..1899 from lp:~donkult/apt/sid --- doc/de/addendum/debiandoc_de.add | 6 + doc/po/apt-doc.pot | 341 ++++++++++++++----------- doc/po/de.po | 378 ++++++++++++++++----------- doc/po/es.po | 341 ++++++++++++++----------- doc/po/fr.po | 469 +++++++++++++++++++++++----------- doc/po/it.po | 341 ++++++++++++++----------- doc/po/ja.po | 539 ++++++++++++++++++++++++++++----------- doc/po/pl.po | 341 ++++++++++++++----------- doc/po/pt_BR.po | 341 ++++++++++++++----------- 9 files changed, 1952 insertions(+), 1145 deletions(-) create mode 100644 doc/de/addendum/debiandoc_de.add diff --git a/doc/de/addendum/debiandoc_de.add b/doc/de/addendum/debiandoc_de.add new file mode 100644 index 000000000..2332878a6 --- /dev/null +++ b/doc/de/addendum/debiandoc_de.add @@ -0,0 +1,6 @@ +PO4A-HEADER:mode=after;position=manbugs;beginboundary=^ + Übersetzung + Die deutsche Übersetzung wurde 2009 von Chris Leick c.leick@vollbio.de angefertigt + in Zusammenarbeit mit dem Debian German-l10n-Team debian-l10n-german@lists.debian.org. + + diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index f833cec6c..46febf8ca 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2009-12-10 22:04+0100\n" +"POT-Creation-Date: 2009-11-27 00:18+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 @@ 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 "" @@ -1416,7 +1416,7 @@ 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:988 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:1017 apt_preferences.5.xml:615 msgid "Files" msgstr "" @@ -1426,7 +1426,7 @@ msgid "&file-sourceslist; &file-statelists;" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml: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 +#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:572 apt-get.8.xml:569 apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181 apt-sortpkgs.1.xml:69 apt.conf.5.xml:1023 apt_preferences.5.xml:622 sources.list.5.xml:233 msgid "See Also" msgstr "" @@ -2704,7 +2704,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:561 apt.conf.5.xml:982 apt_preferences.5.xml:462 sources.list.5.xml:193 +#: apt-ftparchive.1.xml:561 apt.conf.5.xml:1011 apt_preferences.5.xml:462 sources.list.5.xml:193 msgid "Examples" msgstr "" @@ -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:321 +#: apt.conf.5.xml:264 apt.conf.5.xml:328 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method, this applies to all things including connection timeout and data " @@ -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:281 +#: apt.conf.5.xml:286 msgid "https" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:282 +#: apt.conf.5.xml:287 msgid "" -"HTTPS URIs. Cache-control and proxy options are the same as for " -"<literal>http</literal> method. <literal>Pipeline-Depth</literal> option is " +"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:286 +#: apt.conf.5.xml:293 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is " @@ -4688,12 +4698,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:304 sources.list.5.xml:150 +#: apt.conf.5.xml:311 sources.list.5.xml:150 msgid "ftp" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:305 +#: apt.conf.5.xml:312 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 " @@ -4713,7 +4723,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:324 +#: apt.conf.5.xml:331 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 " @@ -4723,7 +4733,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:331 +#: apt.conf.5.xml:338 msgid "" "It is possible to proxy FTP over HTTP by setting the " "<envar>ftp_proxy</envar> environment variable to a http url - see the " @@ -4733,7 +4743,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:336 +#: apt.conf.5.xml:343 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@ -4743,18 +4753,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:343 sources.list.5.xml:132 +#: apt.conf.5.xml:350 sources.list.5.xml:132 msgid "cdrom" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:349 +#: apt.conf.5.xml:356 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:344 +#: apt.conf.5.xml:351 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 " @@ -4767,12 +4777,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:354 +#: apt.conf.5.xml:361 msgid "gpgv" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:355 +#: apt.conf.5.xml:362 msgid "" "GPGV URIs; the only option for GPGV URIs is the option to pass additional " "parameters to gpgv. <literal>gpgv::Options</literal> Additional options " @@ -4780,12 +4790,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:360 +#: apt.conf.5.xml:367 msgid "CompressionTypes" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:366 +#: apt.conf.5.xml:373 #, no-wrap msgid "" "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> " @@ -4793,7 +4803,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:361 +#: apt.conf.5.xml:368 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@ -4805,19 +4815,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:371 +#: apt.conf.5.xml:378 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:374 +#: apt.conf.5.xml:381 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:367 +#: apt.conf.5.xml:374 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 " @@ -4834,13 +4844,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:378 +#: apt.conf.5.xml:385 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:376 +#: apt.conf.5.xml:383 msgid "" "Note that at run time the " "<literal>Dir::Bin::<replaceable>Methodname</replaceable></literal> will be " @@ -4855,7 +4865,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:383 +#: apt.conf.5.xml:390 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 " @@ -4864,6 +4874,53 @@ msgid "" "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 "" @@ -4873,12 +4930,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:392 +#: apt.conf.5.xml:420 msgid "Directories" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:394 +#: apt.conf.5.xml:422 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@ -4890,7 +4947,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:401 +#: apt.conf.5.xml:429 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@ -4903,7 +4960,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:410 +#: apt.conf.5.xml:438 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@ -4913,7 +4970,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:416 +#: apt.conf.5.xml:444 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 " @@ -4921,7 +4978,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:420 +#: apt.conf.5.xml:448 msgid "" "Binary programs are pointed to by " "<literal>Dir::Bin</literal>. <literal>Dir::Bin::Methods</literal> specifies " @@ -4933,7 +4990,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:428 +#: apt.conf.5.xml:456 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@ -4946,12 +5003,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:441 +#: apt.conf.5.xml:469 msgid "APT in DSelect" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:443 +#: apt.conf.5.xml:471 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behaviour. These are in the <literal>DSelect</literal> " @@ -4959,12 +5016,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:447 +#: apt.conf.5.xml:475 msgid "Clean" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:448 +#: apt.conf.5.xml:476 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 " @@ -4975,50 +5032,50 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:457 +#: apt.conf.5.xml:485 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:461 +#: apt.conf.5.xml:489 msgid "Updateoptions" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:462 +#: apt.conf.5.xml:490 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:466 +#: apt.conf.5.xml:494 msgid "PromptAfterUpdate" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:467 +#: apt.conf.5.xml:495 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:473 +#: apt.conf.5.xml:501 msgid "How APT calls dpkg" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:474 +#: apt.conf.5.xml:502 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:479 +#: apt.conf.5.xml:507 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 " @@ -5026,17 +5083,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:484 +#: apt.conf.5.xml:512 msgid "Pre-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:484 +#: apt.conf.5.xml:512 msgid "Post-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:485 +#: apt.conf.5.xml:513 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 " @@ -5045,12 +5102,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:491 +#: apt.conf.5.xml:519 msgid "Pre-Install-Pkgs" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:492 +#: apt.conf.5.xml:520 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 " @@ -5060,7 +5117,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:498 +#: apt.conf.5.xml:526 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@ -5071,36 +5128,36 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:505 +#: apt.conf.5.xml:533 msgid "Run-Directory" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:506 +#: apt.conf.5.xml:534 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:510 +#: apt.conf.5.xml:538 msgid "Build-options" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:511 +#: apt.conf.5.xml:539 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:516 +#: apt.conf.5.xml:544 msgid "dpkg trigger usage (and related options)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:517 +#: apt.conf.5.xml:545 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 " @@ -5115,7 +5172,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:532 +#: apt.conf.5.xml:560 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@ -5125,7 +5182,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:526 +#: apt.conf.5.xml:554 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 " @@ -5139,12 +5196,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:538 +#: apt.conf.5.xml:566 msgid "DPkg::NoTriggers" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:539 +#: apt.conf.5.xml:567 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 " @@ -5156,12 +5213,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:546 +#: apt.conf.5.xml:574 msgid "PackageManager::Configure" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:547 +#: apt.conf.5.xml:575 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@ -5178,12 +5235,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:557 +#: apt.conf.5.xml:585 msgid "DPkg::ConfigurePending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:558 +#: apt.conf.5.xml:586 msgid "" "If this option is set apt will call <command>dpkg --configure " "--pending</command> to let dpkg handle all required configurations and " @@ -5195,12 +5252,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:564 +#: apt.conf.5.xml:592 msgid "DPkg::TriggersPending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:565 +#: apt.conf.5.xml:593 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@ -5210,12 +5267,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:570 +#: apt.conf.5.xml:598 msgid "PackageManager::UnpackAll" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:571 +#: apt.conf.5.xml:599 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 " @@ -5227,12 +5284,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:578 +#: apt.conf.5.xml:606 msgid "OrderList::Score::Immediate" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:586 +#: apt.conf.5.xml:614 #, no-wrap msgid "" "OrderList::Score {\n" @@ -5244,7 +5301,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:579 +#: apt.conf.5.xml:607 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 " @@ -5258,12 +5315,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:599 +#: apt.conf.5.xml:627 msgid "Periodic and Archives options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:600 +#: apt.conf.5.xml:628 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@ -5272,12 +5329,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:608 +#: apt.conf.5.xml:636 msgid "Debug options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:610 +#: apt.conf.5.xml:638 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -5288,7 +5345,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:621 +#: apt.conf.5.xml:649 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, " @@ -5296,7 +5353,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:629 +#: apt.conf.5.xml:657 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s " @@ -5304,7 +5361,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:638 +#: apt.conf.5.xml:666 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -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:646 +#: apt.conf.5.xml:674 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:656 +#: apt.conf.5.xml:684 msgid "A full list of debugging options to apt follows." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:661 +#: apt.conf.5.xml:689 msgid "<literal>Debug::Acquire::cdrom</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:665 +#: apt.conf.5.xml:693 msgid "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:672 +#: apt.conf.5.xml:700 msgid "<literal>Debug::Acquire::ftp</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:676 +#: apt.conf.5.xml:704 msgid "Print information related to downloading packages using FTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:683 +#: apt.conf.5.xml:711 msgid "<literal>Debug::Acquire::http</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:687 +#: apt.conf.5.xml:715 msgid "Print information related to downloading packages using HTTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:694 +#: apt.conf.5.xml:722 msgid "<literal>Debug::Acquire::https</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:698 +#: apt.conf.5.xml:726 msgid "Print information related to downloading packages using HTTPS." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:705 +#: apt.conf.5.xml:733 msgid "<literal>Debug::Acquire::gpgv</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:709 +#: apt.conf.5.xml:737 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:716 +#: apt.conf.5.xml:744 msgid "<literal>Debug::aptcdrom</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:720 +#: apt.conf.5.xml:748 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:727 +#: apt.conf.5.xml:755 msgid "<literal>Debug::BuildDeps</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:730 +#: apt.conf.5.xml:758 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:737 +#: apt.conf.5.xml:765 msgid "<literal>Debug::Hashes</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:740 +#: apt.conf.5.xml:768 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:747 +#: apt.conf.5.xml:775 msgid "<literal>Debug::IdentCDROM</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:750 +#: apt.conf.5.xml:778 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 " @@ -5425,92 +5482,92 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:758 +#: apt.conf.5.xml:786 msgid "<literal>Debug::NoLocking</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:761 +#: apt.conf.5.xml:789 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:769 +#: apt.conf.5.xml:797 msgid "<literal>Debug::pkgAcquire</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:773 +#: apt.conf.5.xml:801 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:780 +#: apt.conf.5.xml:808 msgid "<literal>Debug::pkgAcquire::Auth</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:783 +#: apt.conf.5.xml:811 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:790 +#: apt.conf.5.xml:818 msgid "<literal>Debug::pkgAcquire::Diffs</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:793 +#: apt.conf.5.xml:821 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:801 +#: apt.conf.5.xml:829 msgid "<literal>Debug::pkgAcquire::RRed</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:805 +#: apt.conf.5.xml:833 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:812 +#: apt.conf.5.xml:840 msgid "<literal>Debug::pkgAcquire::Worker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:816 +#: apt.conf.5.xml:844 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:823 +#: apt.conf.5.xml:851 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:827 +#: apt.conf.5.xml:855 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:834 +#: apt.conf.5.xml:862 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:837 +#: apt.conf.5.xml:865 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial " @@ -5520,12 +5577,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:848 +#: apt.conf.5.xml:876 msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:851 +#: apt.conf.5.xml:879 msgid "" "Generate debug messages describing which package is marked as " "keep/install/remove while the ProblemResolver does his work. Each addition " @@ -5543,90 +5600,90 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:870 +#: apt.conf.5.xml:898 msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:873 +#: apt.conf.5.xml:901 msgid "Dump the default configuration to standard error on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:880 +#: apt.conf.5.xml:908 msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:883 +#: apt.conf.5.xml:911 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:891 +#: apt.conf.5.xml:919 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:894 +#: apt.conf.5.xml:922 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:901 +#: apt.conf.5.xml:929 msgid "<literal>Debug::pkgOrderList</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:905 +#: apt.conf.5.xml:933 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:913 +#: apt.conf.5.xml:941 msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:917 +#: apt.conf.5.xml:945 msgid "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:924 +#: apt.conf.5.xml:952 msgid "<literal>Debug::pkgPolicy</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:928 +#: apt.conf.5.xml:956 msgid "Output the priority of each package list on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:934 +#: apt.conf.5.xml:962 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:938 +#: apt.conf.5.xml:966 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:946 +#: apt.conf.5.xml:974 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:949 +#: apt.conf.5.xml:977 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 " @@ -5634,32 +5691,32 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:957 +#: apt.conf.5.xml:985 msgid "<literal>Debug::sourceList</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:961 +#: apt.conf.5.xml:989 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:983 +#: apt.conf.5.xml:1012 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt.conf.5.xml:990 +#: apt.conf.5.xml:1019 msgid "&file-aptconf;" msgstr "" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:995 +#: apt.conf.5.xml:1024 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "" diff --git a/doc/po/de.po b/doc/po/de.po index b6cbeef6a..3ec7c4a5b 100644 --- a/doc/po/de.po +++ b/doc/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 0.7.24\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2009-12-10 22:04+0100\n" +"POT-Creation-Date: 2009-11-27 00:05+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,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 " @@ -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" @@ -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:988 apt_preferences.5.xml:615 +#: apt.conf.5.xml:1017 apt_preferences.5.xml:615 msgid "Files" msgstr "Dateien" @@ -1958,7 +1962,7 @@ msgstr "&file-sourceslist; &file-statelists;" #: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 #: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml: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 +#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1023 apt_preferences.5.xml:622 #: sources.list.5.xml:233 msgid "See Also" msgstr "Siehe auch" @@ -3590,7 +3594,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:561 apt.conf.5.xml:982 apt_preferences.5.xml:462 +#: apt-ftparchive.1.xml:561 apt.conf.5.xml:1011 apt_preferences.5.xml:462 #: sources.list.5.xml:193 msgid "Examples" msgstr "Beispiele" @@ -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 " @@ -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 " @@ -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</" @@ -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:321 +#: apt.conf.5.xml:264 apt.conf.5.xml:328 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method, this applies to all things including connection timeout and data " @@ -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:281 +#: apt.conf.5.xml:286 msgid "https" msgstr "https" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: 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 " +#: apt.conf.5.xml:287 +#, fuzzy +#| msgid "" +#| "HTTPS URIs. Cache-control and proxy options are the same as for " +#| "<literal>http</literal> method. <literal>Pipeline-Depth</literal> option " +#| "is not supported yet." +msgid "" +"HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy " +"options are the same as for <literal>http</literal> method and will also " +"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 " @@ -6279,7 +6321,7 @@ msgstr "" "literal> wird noch nicht unterstützt." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:286 +#: apt.conf.5.xml:293 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is " @@ -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:304 sources.list.5.xml:150 +#: apt.conf.5.xml:311 sources.list.5.xml:150 msgid "ftp" msgstr "ftp" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:305 +#: apt.conf.5.xml:312 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 " @@ -6358,7 +6400,7 @@ msgstr "" "entsprechenden URI-Bestandteil genommen." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:324 +#: apt.conf.5.xml:331 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 " @@ -6375,7 +6417,7 @@ msgstr "" "Beispielskonfiguration, um Beispiele zu erhalten)." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:331 +#: apt.conf.5.xml:338 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 " @@ -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:336 +#: apt.conf.5.xml:343 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@ -6405,18 +6447,19 @@ msgstr "" "Server RFC2428 unterstützen." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:343 sources.list.5.xml:132 +#: apt.conf.5.xml:350 sources.list.5.xml:132 msgid "cdrom" msgstr "cdrom" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:349 +#: apt.conf.5.xml:356 #, 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:344 +#: apt.conf.5.xml:351 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 " @@ -6438,12 +6481,12 @@ msgstr "" "können per UMount angegeben werden." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:354 +#: apt.conf.5.xml:361 msgid "gpgv" msgstr "gpgv" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:355 +#: apt.conf.5.xml:362 msgid "" "GPGV URIs; the only option for GPGV URIs is the option to pass additional " "parameters to gpgv. <literal>gpgv::Options</literal> Additional options " @@ -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:360 +#: apt.conf.5.xml:367 msgid "CompressionTypes" msgstr "CompressionTypes" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:366 +#: apt.conf.5.xml:373 #, 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:361 +#: apt.conf.5.xml:368 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@ -6485,19 +6528,19 @@ msgstr "" "\"synopsis\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:371 +#: apt.conf.5.xml:378 #, 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:374 +#: apt.conf.5.xml:381 #, 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:367 +#: apt.conf.5.xml:374 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 " @@ -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 " @@ -6528,13 +6571,13 @@ msgstr "" "explizit zur Liste hinzuzufügen, da es automatisch hinzufügt wird." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:378 +#: apt.conf.5.xml:385 #, 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:376 +#: apt.conf.5.xml:383 msgid "" "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" "replaceable></literal> will be checked: If this setting exists the method " @@ -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:383 +#: apt.conf.5.xml:390 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 " @@ -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 "" @@ -6587,12 +6677,12 @@ msgstr "" "id=\"0\"/>" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:392 +#: apt.conf.5.xml:420 msgid "Directories" msgstr "Verzeichnisse" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:394 +#: apt.conf.5.xml:422 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@ -6612,7 +6702,7 @@ msgstr "" "filename> oder <filename>./</filename> beginnen." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:401 +#: apt.conf.5.xml:429 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@ -6635,7 +6725,7 @@ msgstr "" "<literal>Dir::Cache</literal> enthalten." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:410 +#: apt.conf.5.xml:438 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@ -6650,7 +6740,7 @@ msgstr "" "Konfigurationsdatei erfolgt)." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:416 +#: apt.conf.5.xml:444 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 " @@ -6662,7 +6752,7 @@ msgstr "" "geladen." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:420 +#: apt.conf.5.xml:448 msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" "Bin::Methods</literal> specifies the location of the method handlers and " @@ -6680,7 +6770,7 @@ msgstr "" "Programms an." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:428 +#: apt.conf.5.xml:456 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@ -6700,12 +6790,12 @@ msgstr "" "<filename>/tmp/staging/var/lib/dpkg/status</filename> nachgesehen." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:441 +#: apt.conf.5.xml:469 msgid "APT in DSelect" msgstr "APT in DSelect" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:443 +#: apt.conf.5.xml:471 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behaviour. These are in the <literal>DSelect</literal> " @@ -6716,12 +6806,12 @@ msgstr "" "<literal>DSelect</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:447 +#: apt.conf.5.xml:475 msgid "Clean" msgstr "Clean" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:448 +#: apt.conf.5.xml:476 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 " @@ -6739,7 +6829,7 @@ msgstr "" "Herunterladen neuer Pakete durch." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:457 +#: apt.conf.5.xml:485 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the install phase." @@ -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:461 +#: apt.conf.5.xml:489 msgid "Updateoptions" msgstr "Updateoptions" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:462 +#: apt.conf.5.xml:490 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the update phase." @@ -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:466 +#: apt.conf.5.xml:494 msgid "PromptAfterUpdate" msgstr "PromptAfterUpdate" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:467 +#: apt.conf.5.xml:495 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." @@ -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:473 +#: apt.conf.5.xml:501 msgid "How APT calls dpkg" msgstr "Wie APT Dpkg aufruft" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:474 +#: apt.conf.5.xml:502 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." @@ -6790,7 +6880,7 @@ msgstr "" "stehen im Abschnitt <literal>DPkg</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:479 +#: apt.conf.5.xml:507 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 " @@ -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:484 +#: apt.conf.5.xml:512 msgid "Pre-Invoke" msgstr "Pre-Invoke" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:484 +#: apt.conf.5.xml:512 msgid "Post-Invoke" msgstr "Post-Invoke" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:485 +#: apt.conf.5.xml:513 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 " @@ -6825,12 +6915,12 @@ msgstr "" "APT abgebrochen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:491 +#: apt.conf.5.xml:519 msgid "Pre-Install-Pkgs" msgstr "Pre-Install-Pkgs" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:492 +#: apt.conf.5.xml:520 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 " @@ -6847,7 +6937,7 @@ msgstr "" "pro Zeile." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:498 +#: apt.conf.5.xml:526 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@ -6863,12 +6953,12 @@ msgstr "" "literal> gegeben wird." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:505 +#: apt.conf.5.xml:533 msgid "Run-Directory" msgstr "Run-Directory" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:506 +#: apt.conf.5.xml:534 msgid "" "APT chdirs to this directory before invoking dpkg, the default is <filename>/" "</filename>." @@ -6877,12 +6967,12 @@ msgstr "" "die Vorgabe ist <filename>/</filename>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:510 +#: apt.conf.5.xml:538 msgid "Build-options" msgstr "Build-options" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:511 +#: apt.conf.5.xml:539 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages, the " "default is to disable signing and produce all binaries." @@ -6892,12 +6982,12 @@ msgstr "" "Programme werden erstellt." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt.conf.5.xml:516 +#: apt.conf.5.xml:544 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:517 +#: apt.conf.5.xml:545 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 " @@ -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:532 +#: apt.conf.5.xml:560 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@ -6937,7 +7027,7 @@ msgstr "" "DPkg::TriggersPending \"true\";" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:526 +#: apt.conf.5.xml:554 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 " @@ -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:538 +#: apt.conf.5.xml:566 msgid "DPkg::NoTriggers" msgstr "DPkg::NoTriggers" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:539 +#: apt.conf.5.xml:567 #, fuzzy #| msgid "" #| "Add the no triggers flag to all dpkg calls (expect the ConfigurePending " @@ -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:546 +#: apt.conf.5.xml:574 msgid "PackageManager::Configure" msgstr "PackageManager::Configure" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:547 +#: apt.conf.5.xml:575 #, fuzzy #| msgid "" #| "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " @@ -7046,12 +7136,12 @@ msgstr "" "mehr startbar sein könnte." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:557 +#: apt.conf.5.xml:585 msgid "DPkg::ConfigurePending" msgstr "DPkg::ConfigurePending" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:558 +#: apt.conf.5.xml:586 #, fuzzy #| msgid "" #| "If this option is set apt will call <command>dpkg --configure --pending</" @@ -7078,12 +7168,12 @@ msgstr "" "deaktivieren." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:564 +#: apt.conf.5.xml:592 msgid "DPkg::TriggersPending" msgstr "DPkg::TriggersPending" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:565 +#: apt.conf.5.xml:593 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@ -7099,12 +7189,12 @@ msgstr "" "benötigt werden." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:570 +#: apt.conf.5.xml:598 msgid "PackageManager::UnpackAll" msgstr "PackageManager::UnpackAll" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:571 +#: apt.conf.5.xml:599 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-" @@ -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:578 +#: apt.conf.5.xml:606 msgid "OrderList::Score::Immediate" msgstr "OrderList::Score::Immediate" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:586 +#: apt.conf.5.xml:614 #, no-wrap msgid "" "OrderList::Score {\n" @@ -7146,7 +7236,7 @@ msgstr "" "};" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:579 +#: apt.conf.5.xml:607 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 " @@ -7170,12 +7260,12 @@ msgstr "" "mit ihren Vorgabewerten. <placeholder type=\"literallayout\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:599 +#: apt.conf.5.xml:627 msgid "Periodic and Archives options" msgstr "Periodische- und Archivoptionen" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:600 +#: apt.conf.5.xml:628 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@ -7189,12 +7279,12 @@ msgstr "" "Dokumentation dieser Optionen zu erhalten." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:608 +#: apt.conf.5.xml:636 msgid "Debug options" msgstr "Fehlersuchoptionen" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:610 +#: apt.conf.5.xml:638 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -7212,7 +7302,7 @@ msgstr "" "könnten es sein:" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:621 +#: apt.conf.5.xml:649 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@ -7223,7 +7313,7 @@ msgstr "" "getroffenen Entscheidungen ein." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:629 +#: apt.conf.5.xml:657 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@ -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:638 +#: apt.conf.5.xml:666 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -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:646 +#: apt.conf.5.xml:674 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CDROM IDs." @@ -7255,17 +7345,17 @@ msgstr "" "Daten in CDROM-IDs aus." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:656 +#: apt.conf.5.xml:684 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:661 +#: apt.conf.5.xml:689 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:665 +#: apt.conf.5.xml:693 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" @@ -7273,48 +7363,48 @@ msgstr "" "literal>-Quellen beziehen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:672 +#: apt.conf.5.xml:700 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:676 +#: apt.conf.5.xml:704 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:683 +#: apt.conf.5.xml:711 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:687 +#: apt.conf.5.xml:715 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:694 +#: apt.conf.5.xml:722 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:698 +#: apt.conf.5.xml:726 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:705 +#: apt.conf.5.xml:733 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:709 +#: apt.conf.5.xml:737 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." @@ -7323,12 +7413,12 @@ msgstr "" "mittels <literal>gpg</literal> beziehen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:716 +#: apt.conf.5.xml:744 msgid "<literal>Debug::aptcdrom</literal>" msgstr "<literal>Debug::aptcdrom</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:720 +#: apt.conf.5.xml:748 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." @@ -7337,23 +7427,23 @@ msgstr "" "CD-ROMs gespeichert sind." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:727 +#: apt.conf.5.xml:755 msgid "<literal>Debug::BuildDeps</literal>" msgstr "<literal>Debug::BuildDeps</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:730 +#: apt.conf.5.xml:758 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:737 +#: apt.conf.5.xml:765 msgid "<literal>Debug::Hashes</literal>" msgstr "<literal>Debug::Hashes</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:740 +#: apt.conf.5.xml:768 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." @@ -7362,12 +7452,12 @@ msgstr "" "Bibliotheken generiert wurde." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:747 +#: apt.conf.5.xml:775 msgid "<literal>Debug::IdentCDROM</literal>" msgstr "<literal>Debug::IdentCDROM</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:750 +#: apt.conf.5.xml:778 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 " @@ -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:758 +#: apt.conf.5.xml:786 msgid "<literal>Debug::NoLocking</literal>" msgstr "<literal>Debug::NoLocking</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:761 +#: apt.conf.5.xml:789 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." @@ -7393,24 +7483,24 @@ msgstr "" "gleichen Zeit laufen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:769 +#: apt.conf.5.xml:797 msgid "<literal>Debug::pkgAcquire</literal>" msgstr "<literal>Debug::pkgAcquire</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:773 +#: apt.conf.5.xml:801 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:780 +#: apt.conf.5.xml:808 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:783 +#: apt.conf.5.xml:811 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." @@ -7419,12 +7509,12 @@ msgstr "" "und kryptografischen Signaturen von heruntergeladenen Dateien beziehen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:790 +#: apt.conf.5.xml:818 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:793 +#: apt.conf.5.xml:821 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." @@ -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:801 +#: apt.conf.5.xml:829 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:805 +#: apt.conf.5.xml:833 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." @@ -7448,12 +7538,12 @@ msgstr "" "werden." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:812 +#: apt.conf.5.xml:840 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:816 +#: apt.conf.5.xml:844 msgid "" "Log all interactions with the sub-processes that actually perform downloads." msgstr "" @@ -7461,12 +7551,12 @@ msgstr "" "durchführen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:823 +#: apt.conf.5.xml:851 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "<literal>Debug::pkgAutoRemove</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:827 +#: apt.conf.5.xml:855 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." @@ -7476,12 +7566,12 @@ msgstr "" "beziehen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:834 +#: apt.conf.5.xml:862 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:837 +#: apt.conf.5.xml:865 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@ -7497,12 +7587,12 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:848 +#: apt.conf.5.xml:876 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:851 +#: apt.conf.5.xml:879 msgid "" "Generate debug messages describing which package is marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@ -7534,23 +7624,23 @@ msgstr "" "erscheint." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:870 +#: apt.conf.5.xml:898 msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "<literal>Debug::pkgInitConfig</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:873 +#: apt.conf.5.xml:901 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:880 +#: apt.conf.5.xml:908 msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "<literal>Debug::pkgDPkgPM</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:883 +#: apt.conf.5.xml:911 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." @@ -7560,12 +7650,12 @@ msgstr "" "sind." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:891 +#: apt.conf.5.xml:919 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:894 +#: apt.conf.5.xml:922 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." @@ -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:901 +#: apt.conf.5.xml:929 msgid "<literal>Debug::pkgOrderList</literal>" msgstr "<literal>Debug::pkgOrderList</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:905 +#: apt.conf.5.xml:933 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." @@ -7589,12 +7679,12 @@ msgstr "" "soll." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:913 +#: apt.conf.5.xml:941 msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "<literal>Debug::pkgPackageManager</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:917 +#: apt.conf.5.xml:945 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" @@ -7602,22 +7692,22 @@ msgstr "" "von &dpkg; ausgeführt werden." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:924 +#: apt.conf.5.xml:952 msgid "<literal>Debug::pkgPolicy</literal>" msgstr "<literal>Debug::pkgPolicy</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:928 +#: apt.conf.5.xml:956 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:934 +#: apt.conf.5.xml:962 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "<literal>Debug::pkgProblemResolver</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:938 +#: apt.conf.5.xml:966 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." @@ -7627,12 +7717,12 @@ msgstr "" "aufgetreten ist)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:946 +#: apt.conf.5.xml:974 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:949 +#: apt.conf.5.xml:977 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 " @@ -7644,12 +7734,12 @@ msgstr "" "beschrieben." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:957 +#: apt.conf.5.xml:985 msgid "<literal>Debug::sourceList</literal>" msgstr "<literal>Debug::sourceList</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:961 +#: apt.conf.5.xml:989 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." @@ -7658,7 +7748,7 @@ msgstr "" "gelesenen Anbieter ausgeben." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:983 +#: apt.conf.5.xml:1012 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." @@ -7667,13 +7757,13 @@ msgstr "" "möglichen Optionen zeigen." #. type: Content of: <refentry><refsect1><variablelist> -#: apt.conf.5.xml:990 +#: apt.conf.5.xml:1019 msgid "&file-aptconf;" msgstr "&file-aptconf;" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:995 +#: apt.conf.5.xml:1024 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-cache;, &apt-config;, &apt-preferences;." diff --git a/doc/po/es.po b/doc/po/es.po index d80f57e65..ed7ca3d8f 100644 --- a/doc/po/es.po +++ b/doc/po/es.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" -"POT-Creation-Date: 2009-12-10 22:04+0100\n" +"POT-Creation-Date: 2009-11-27 00:18+0100\n" "PO-Revision-Date: 2004-09-20 17:05+0000\n" "Last-Translator: Rubén Porras Campo <nahoo@inicia.es>\n" "Language-Team: <debian-l10n-spanish@lists.debian.org>\n" @@ -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 @@ 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:988 apt_preferences.5.xml:615 +#: apt.conf.5.xml:1017 apt_preferences.5.xml:615 #, fuzzy msgid "Files" msgstr "Ficheros" @@ -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:994 apt_preferences.5.xml:622 +#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1023 apt_preferences.5.xml:622 #: sources.list.5.xml:233 #, fuzzy msgid "See Also" @@ -3284,7 +3284,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:561 apt.conf.5.xml:982 apt_preferences.5.xml:462 +#: apt-ftparchive.1.xml:561 apt.conf.5.xml:1011 apt_preferences.5.xml:462 #: sources.list.5.xml:193 #, fuzzy msgid "Examples" @@ -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:321 +#: apt.conf.5.xml:264 apt.conf.5.xml:328 #, fuzzy msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " @@ -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:281 +#: apt.conf.5.xml:286 #, fuzzy msgid "https" msgstr "http" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:282 +#: apt.conf.5.xml:287 msgid "" -"HTTPS URIs. Cache-control and proxy options are the same as for " -"<literal>http</literal> method. <literal>Pipeline-Depth</literal> option is " +"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:286 +#: apt.conf.5.xml:293 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is " @@ -5805,13 +5815,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:304 sources.list.5.xml:150 +#: apt.conf.5.xml:311 sources.list.5.xml:150 #, fuzzy msgid "ftp" msgstr "ftp" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:305 +#: apt.conf.5.xml:312 #, fuzzy msgid "" "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard " @@ -5843,7 +5853,7 @@ msgstr "" "de la URI correspondiente." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:324 +#: apt.conf.5.xml:331 #, fuzzy msgid "" "Several settings are provided to control passive mode. Generally it is safe " @@ -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:331 +#: apt.conf.5.xml:338 #, fuzzy msgid "" "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</" @@ -5875,7 +5885,7 @@ msgstr "" "eficiencia." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:336 +#: apt.conf.5.xml:343 #, fuzzy msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " @@ -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:343 sources.list.5.xml:132 +#: apt.conf.5.xml:350 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:349 +#: apt.conf.5.xml:356 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:344 +#: apt.conf.5.xml:351 #, fuzzy msgid "" "CDROM URIs; the only setting for CDROM URIs is the mount point, " @@ -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:354 +#: apt.conf.5.xml:361 msgid "gpgv" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:355 +#: apt.conf.5.xml:362 msgid "" "GPGV URIs; the only option for GPGV URIs is the option to pass additional " "parameters to gpgv. <literal>gpgv::Options</literal> Additional options " @@ -5936,18 +5946,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:360 +#: apt.conf.5.xml:367 msgid "CompressionTypes" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:366 +#: apt.conf.5.xml:373 #, 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:361 +#: apt.conf.5.xml:368 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@ -5959,19 +5969,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:371 +#: apt.conf.5.xml:378 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:374 +#: apt.conf.5.xml:381 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:367 +#: apt.conf.5.xml:374 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 " @@ -5988,13 +5998,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:378 +#: apt.conf.5.xml:385 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:376 +#: apt.conf.5.xml:383 msgid "" "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" "replaceable></literal> will be checked: If this setting exists the method " @@ -6009,7 +6019,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:383 +#: apt.conf.5.xml:390 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 " @@ -6018,6 +6028,53 @@ msgid "" "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 @@ -6029,13 +6086,13 @@ msgstr "" "paquetes y los manejadores de URI." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:392 +#: apt.conf.5.xml:420 #, fuzzy msgid "Directories" msgstr "Directorios" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:394 +#: apt.conf.5.xml:422 #, fuzzy msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " @@ -6056,7 +6113,7 @@ msgstr "" "filename> o <filename>./</filename>." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:401 +#: apt.conf.5.xml:429 #, fuzzy msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " @@ -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:410 +#: apt.conf.5.xml:438 #, fuzzy msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " @@ -6095,7 +6152,7 @@ msgstr "" "envar>)." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:416 +#: apt.conf.5.xml:444 #, fuzzy msgid "" "The <literal>Dir::Parts</literal> setting reads in all the config fragments " @@ -6107,7 +6164,7 @@ msgstr "" "esto se carga el fichero principal de configuración." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:420 +#: apt.conf.5.xml:448 #, fuzzy msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" @@ -6125,7 +6182,7 @@ msgstr "" "respectivos programas." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:428 +#: apt.conf.5.xml:456 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@ -6138,13 +6195,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:441 +#: apt.conf.5.xml:469 #, fuzzy msgid "APT in DSelect" msgstr "APT con DSelect" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:443 +#: apt.conf.5.xml:471 #, fuzzy msgid "" "When APT is used as a &dselect; method several configuration directives " @@ -6156,13 +6213,13 @@ msgstr "" "la sección <literal>DSelect</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:447 +#: apt.conf.5.xml:475 #, fuzzy msgid "Clean" msgstr "clean" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:448 +#: apt.conf.5.xml:476 #, fuzzy msgid "" "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto " @@ -6180,7 +6237,7 @@ msgstr "" "descargar los paquetes nuevos." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:457 +#: apt.conf.5.xml:485 #, fuzzy msgid "" "The contents of this variable is passed to &apt-get; as command line options " @@ -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:461 +#: apt.conf.5.xml:489 #, fuzzy msgid "Updateoptions" msgstr "Opciones" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:462 +#: apt.conf.5.xml:490 #, fuzzy msgid "" "The contents of this variable is passed to &apt-get; as command line options " @@ -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:466 +#: apt.conf.5.xml:494 #, fuzzy msgid "PromptAfterUpdate" msgstr "PromptAfterUpdate" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:467 +#: apt.conf.5.xml:495 #, fuzzy msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " @@ -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:473 +#: apt.conf.5.xml:501 #, fuzzy msgid "How APT calls dpkg" msgstr "Como APT llama a dpkg" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:474 +#: apt.conf.5.xml:502 #, fuzzy msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " @@ -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:479 +#: apt.conf.5.xml:507 #, fuzzy msgid "" "This is a list of options to pass to dpkg. The options must be specified " @@ -6250,19 +6307,19 @@ msgstr "" "como un sólo argumento." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:484 +#: apt.conf.5.xml:512 #, fuzzy msgid "Pre-Invoke" msgstr "Pre-Invoke" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:484 +#: apt.conf.5.xml:512 #, fuzzy msgid "Post-Invoke" msgstr "Post-Invoke" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:485 +#: apt.conf.5.xml:513 #, fuzzy msgid "" "This is a list of shell commands to run before/after invoking &dpkg;. Like " @@ -6276,13 +6333,13 @@ msgstr "" "si alguna falla APT abortará." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:491 +#: apt.conf.5.xml:519 #, fuzzy msgid "Pre-Install-Pkgs" msgstr "Pre-Install-Pkgs" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:492 +#: apt.conf.5.xml:520 #, fuzzy msgid "" "This is a list of shell commands to run before invoking dpkg. Like " @@ -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:498 +#: apt.conf.5.xml:526 #, fuzzy msgid "" "Version 2 of this protocol dumps more information, including the protocol " @@ -6314,13 +6371,13 @@ msgstr "" "dada a <literal>Pre-Install-Pkgs</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:505 +#: apt.conf.5.xml:533 #, fuzzy msgid "Run-Directory" msgstr "Run-Directory" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:506 +#: apt.conf.5.xml:534 #, fuzzy msgid "" "APT chdirs to this directory before invoking dpkg, the default is <filename>/" @@ -6330,13 +6387,13 @@ msgstr "" "omisión es <filename>/</filename>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:510 +#: apt.conf.5.xml:538 #, fuzzy msgid "Build-options" msgstr "Opciones" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:511 +#: apt.conf.5.xml:539 #, fuzzy msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages, the " @@ -6347,12 +6404,12 @@ msgstr "" "binarios." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt.conf.5.xml:516 +#: apt.conf.5.xml:544 msgid "dpkg trigger usage (and related options)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:517 +#: apt.conf.5.xml:545 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 " @@ -6367,7 +6424,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:532 +#: apt.conf.5.xml:560 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@ -6377,7 +6434,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:526 +#: apt.conf.5.xml:554 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 " @@ -6391,12 +6448,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:538 +#: apt.conf.5.xml:566 msgid "DPkg::NoTriggers" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:539 +#: apt.conf.5.xml:567 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 " @@ -6408,12 +6465,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:546 +#: apt.conf.5.xml:574 msgid "PackageManager::Configure" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:547 +#: apt.conf.5.xml:575 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@ -6429,12 +6486,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:557 +#: apt.conf.5.xml:585 msgid "DPkg::ConfigurePending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:558 +#: apt.conf.5.xml:586 msgid "" "If this option is set apt will call <command>dpkg --configure --pending</" "command> to let dpkg handle all required configurations and triggers. This " @@ -6445,12 +6502,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:564 +#: apt.conf.5.xml:592 msgid "DPkg::TriggersPending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:565 +#: apt.conf.5.xml:593 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@ -6460,12 +6517,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:570 +#: apt.conf.5.xml:598 msgid "PackageManager::UnpackAll" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:571 +#: apt.conf.5.xml:599 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-" @@ -6477,12 +6534,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:578 +#: apt.conf.5.xml:606 msgid "OrderList::Score::Immediate" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:586 +#: apt.conf.5.xml:614 #, no-wrap msgid "" "OrderList::Score {\n" @@ -6494,7 +6551,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:579 +#: apt.conf.5.xml:607 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 " @@ -6508,12 +6565,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:599 +#: apt.conf.5.xml:627 msgid "Periodic and Archives options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:600 +#: apt.conf.5.xml:628 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@ -6522,13 +6579,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:608 +#: apt.conf.5.xml:636 #, fuzzy msgid "Debug options" msgstr "Opciones" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:610 +#: apt.conf.5.xml:638 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -6539,7 +6596,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:621 +#: apt.conf.5.xml:649 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@ -6547,7 +6604,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:629 +#: apt.conf.5.xml:657 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@ -6555,7 +6612,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:638 +#: apt.conf.5.xml:666 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -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:646 +#: apt.conf.5.xml:674 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:656 +#: apt.conf.5.xml:684 msgid "A full list of debugging options to apt follows." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:661 +#: apt.conf.5.xml:689 #, 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:665 +#: apt.conf.5.xml:693 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:672 +#: apt.conf.5.xml:700 #, 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:676 +#: apt.conf.5.xml:704 msgid "Print information related to downloading packages using FTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:683 +#: apt.conf.5.xml:711 #, 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:687 +#: apt.conf.5.xml:715 msgid "Print information related to downloading packages using HTTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:694 +#: apt.conf.5.xml:722 #, 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:698 +#: apt.conf.5.xml:726 msgid "Print information related to downloading packages using HTTPS." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:705 +#: apt.conf.5.xml:733 #, 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:709 +#: apt.conf.5.xml:737 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:716 +#: apt.conf.5.xml:744 #, 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:720 +#: apt.conf.5.xml:748 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:727 +#: apt.conf.5.xml:755 #, 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:730 +#: apt.conf.5.xml:758 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:737 +#: apt.conf.5.xml:765 #, 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:740 +#: apt.conf.5.xml:768 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:747 +#: apt.conf.5.xml:775 #, 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:750 +#: apt.conf.5.xml:778 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 " @@ -6686,99 +6743,99 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:758 +#: apt.conf.5.xml:786 #, 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:761 +#: apt.conf.5.xml:789 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:769 +#: apt.conf.5.xml:797 #, 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:773 +#: apt.conf.5.xml:801 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:780 +#: apt.conf.5.xml:808 #, 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:783 +#: apt.conf.5.xml:811 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:790 +#: apt.conf.5.xml:818 #, 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:793 +#: apt.conf.5.xml:821 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:801 +#: apt.conf.5.xml:829 #, 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:805 +#: apt.conf.5.xml:833 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:812 +#: apt.conf.5.xml:840 #, 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:816 +#: apt.conf.5.xml:844 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:823 +#: apt.conf.5.xml:851 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:827 +#: apt.conf.5.xml:855 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:834 +#: apt.conf.5.xml:862 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:837 +#: apt.conf.5.xml:865 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@ -6788,12 +6845,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:848 +#: apt.conf.5.xml:876 msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:851 +#: apt.conf.5.xml:879 msgid "" "Generate debug messages describing which package is marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@ -6810,96 +6867,96 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:870 +#: apt.conf.5.xml:898 #, 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:873 +#: apt.conf.5.xml:901 msgid "Dump the default configuration to standard error on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:880 +#: apt.conf.5.xml:908 #, 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:883 +#: apt.conf.5.xml:911 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:891 +#: apt.conf.5.xml:919 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:894 +#: apt.conf.5.xml:922 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:901 +#: apt.conf.5.xml:929 #, 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:905 +#: apt.conf.5.xml:933 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:913 +#: apt.conf.5.xml:941 #, 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:917 +#: apt.conf.5.xml:945 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:924 +#: apt.conf.5.xml:952 #, 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:928 +#: apt.conf.5.xml:956 msgid "Output the priority of each package list on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:934 +#: apt.conf.5.xml:962 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:938 +#: apt.conf.5.xml:966 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:946 +#: apt.conf.5.xml:974 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:949 +#: apt.conf.5.xml:977 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 " @@ -6907,20 +6964,20 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:957 +#: apt.conf.5.xml:985 #, 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:961 +#: apt.conf.5.xml:989 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:983 +#: apt.conf.5.xml:1012 #, fuzzy msgid "" "&configureindex; is a configuration file showing example values for all " @@ -6930,14 +6987,14 @@ msgstr "" "los valores predeterminados para todas las opciones posibles." #. type: Content of: <refentry><refsect1><variablelist> -#: apt.conf.5.xml:990 +#: apt.conf.5.xml:1019 #, fuzzy msgid "&file-aptconf;" msgstr "apt-cdrom" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:995 +#: apt.conf.5.xml:1024 #, fuzzy msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-cache; &apt-conf;" diff --git a/doc/po/fr.po b/doc/po/fr.po index fbdf0b2db..49dc38f7f 100644 --- a/doc/po/fr.po +++ b/doc/po/fr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2009-12-10 22:04+0100\n" +"POT-Creation-Date: 2009-11-27 00:05+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,6 +696,7 @@ msgstr "" "<!ENTITY apt-author.team \"\n" " <author>\n" " <othername>Équipe de développement d'APT</othername>\n" +" <contrib></contrib>\n" " </author>\n" "\">\n" @@ -1585,6 +1586,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 " @@ -1704,7 +1709,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" @@ -1950,7 +1955,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:988 apt_preferences.5.xml:615 +#: apt.conf.5.xml:1017 apt_preferences.5.xml:615 msgid "Files" msgstr "Fichiers" @@ -1963,7 +1968,7 @@ msgstr "&file-sourceslist; &file-statelists;" #: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 #: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml: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 +#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1023 apt_preferences.5.xml:622 #: sources.list.5.xml:233 msgid "See Also" msgstr "Voir aussi" @@ -2472,6 +2477,9 @@ 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>" @@ -3589,7 +3597,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:561 apt.conf.5.xml:982 apt_preferences.5.xml:462 +#: apt-ftparchive.1.xml:561 apt.conf.5.xml:1011 apt_preferences.5.xml:462 #: sources.list.5.xml:193 msgid "Examples" msgstr "Exemples" @@ -3985,6 +3993,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 " @@ -4299,6 +4315,14 @@ 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 " @@ -4975,6 +4999,9 @@ 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>" @@ -4995,6 +5022,11 @@ msgstr "marquer/démarquer un paquet comme ayant été installé automatiquement #. 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" @@ -5020,6 +5052,12 @@ 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 " @@ -5072,6 +5110,10 @@ 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." @@ -5083,6 +5125,7 @@ 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>" @@ -5090,6 +5133,7 @@ msgstr "<option>-f=<filename>FICHIER</filename></option>" #. 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>" @@ -5098,6 +5142,11 @@ msgstr "<option>--file=<filename>FICHIER</filename></option>" #. 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 " @@ -5142,6 +5191,7 @@ msgstr "Afficher la version du programme." #. 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>" @@ -5156,6 +5206,7 @@ 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;" @@ -5335,11 +5386,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 « 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)." +"<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)." #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para> #: apt-secure.8.xml:122 @@ -5579,6 +5630,11 @@ 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 " @@ -5655,6 +5711,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 " @@ -5746,6 +5810,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 descendents are " +#| "erased." msgid "" "Two specials are allowed, <literal>#include</literal> (which is deprecated " "and not supported by alternative implementations) and <literal>#clear</" @@ -5775,6 +5846,12 @@ 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 " @@ -6101,6 +6178,13 @@ 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 " @@ -6144,7 +6228,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:321 +#: apt.conf.5.xml:264 apt.conf.5.xml:328 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method, this applies to all things including connection timeout and data " @@ -6192,16 +6276,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:281 +#: apt.conf.5.xml:286 msgid "https" msgstr "https" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: 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 " +#: apt.conf.5.xml:287 +#, fuzzy +#| msgid "" +#| "HTTPS URIs. Cache-control and proxy options are the same as for " +#| "<literal>http</literal> method. <literal>Pipeline-Depth</literal> option " +#| "is not supported yet." +msgid "" +"HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy " +"options are the same as for <literal>http</literal> method and will also " +"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 " @@ -6209,7 +6308,7 @@ msgstr "" "<literal>Pipeline-Depth</literal> n'est pas encore supportée." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:286 +#: apt.conf.5.xml:293 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is " @@ -6241,13 +6340,25 @@ msgstr "" "ou 'SSLv3'." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:304 sources.list.5.xml:150 +#: apt.conf.5.xml:311 sources.list.5.xml:150 msgid "ftp" msgstr "ftp" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:305 +#: apt.conf.5.xml:312 #, 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 " @@ -6282,7 +6393,7 @@ msgstr "" "respectif de l'URI." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:324 +#: apt.conf.5.xml:331 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 " @@ -6299,7 +6410,7 @@ msgstr "" "modèle de fichier de configuration)." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:331 +#: apt.conf.5.xml:338 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 " @@ -6314,7 +6425,7 @@ msgstr "" "de cette méthode." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:336 +#: apt.conf.5.xml:343 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@ -6330,18 +6441,19 @@ msgstr "" "des serveurs FTP ne suivent pas la RFC 2428." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:343 sources.list.5.xml:132 +#: apt.conf.5.xml:350 sources.list.5.xml:132 msgid "cdrom" msgstr "cdrom" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:349 +#: apt.conf.5.xml:356 #, 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:344 +#: apt.conf.5.xml:351 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 " @@ -6363,12 +6475,12 @@ msgstr "" "spécifiées en utilisant <literal>UMount</literal>." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:354 +#: apt.conf.5.xml:361 msgid "gpgv" msgstr "gpgv" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:355 +#: apt.conf.5.xml:362 msgid "" "GPGV URIs; the only option for GPGV URIs is the option to pass additional " "parameters to gpgv. <literal>gpgv::Options</literal> Additional options " @@ -6379,18 +6491,18 @@ msgstr "" "supplémentaires passées à gpgv." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:360 +#: apt.conf.5.xml:367 msgid "CompressionTypes" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:366 +#: apt.conf.5.xml:373 #, 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:361 +#: apt.conf.5.xml:368 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@ -6402,19 +6514,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:371 +#: apt.conf.5.xml:378 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:374 +#: apt.conf.5.xml:381 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:367 +#: apt.conf.5.xml:374 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 " @@ -6431,13 +6543,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:378 +#: apt.conf.5.xml:385 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:376 +#: apt.conf.5.xml:383 msgid "" "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" "replaceable></literal> will be checked: If this setting exists the method " @@ -6452,7 +6564,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:383 +#: apt.conf.5.xml:390 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 " @@ -6461,6 +6573,53 @@ msgid "" "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 "" @@ -6472,12 +6631,12 @@ msgstr "" "id=\"0\"/>" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:392 +#: apt.conf.5.xml:420 msgid "Directories" msgstr "Les répertoires" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:394 +#: apt.conf.5.xml:422 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@ -6497,7 +6656,7 @@ msgstr "" "filename>." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:401 +#: apt.conf.5.xml:429 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@ -6520,7 +6679,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:410 +#: apt.conf.5.xml:438 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@ -6535,7 +6694,7 @@ msgstr "" "fichier de configuration indiqué par la variable <envar>APT_CONFIG</envar>)." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:416 +#: apt.conf.5.xml:444 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 " @@ -6546,8 +6705,15 @@ msgstr "" "configuration est chargé." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:420 +#: apt.conf.5.xml:448 #, 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 " @@ -6564,7 +6730,7 @@ msgstr "" "l'emplacement des programmes correspondants." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:428 +#: apt.conf.5.xml:456 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@ -6586,12 +6752,12 @@ msgstr "" "staging/var/lib/dpkg/status</filename>." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:441 +#: apt.conf.5.xml:469 msgid "APT in DSelect" msgstr "APT et DSelect" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:443 +#: apt.conf.5.xml:471 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behaviour. These are in the <literal>DSelect</literal> " @@ -6602,12 +6768,12 @@ msgstr "" "<literal>DSelect</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:447 +#: apt.conf.5.xml:475 msgid "Clean" msgstr "Clean" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:448 +#: apt.conf.5.xml:476 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 " @@ -6625,7 +6791,7 @@ msgstr "" "supprime avant de récupérer de nouveaux paquets." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:457 +#: apt.conf.5.xml:485 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the install phase." @@ -6634,12 +6800,12 @@ msgstr "" "&apt-get; lors de la phase d'installation." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:461 +#: apt.conf.5.xml:489 msgid "Updateoptions" msgstr "UpdateOptions" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:462 +#: apt.conf.5.xml:490 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the update phase." @@ -6648,12 +6814,12 @@ msgstr "" "&apt-get; lors de la phase de mise à jour." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:466 +#: apt.conf.5.xml:494 msgid "PromptAfterUpdate" msgstr "PromptAfterUpdate" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:467 +#: apt.conf.5.xml:495 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." @@ -6663,12 +6829,12 @@ msgstr "" "d'erreur que l'on propose à l'utilisateur d'intervenir." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:473 +#: apt.conf.5.xml:501 msgid "How APT calls dpkg" msgstr "Méthode d'appel de &dpkg; par APT" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:474 +#: apt.conf.5.xml:502 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." @@ -6677,7 +6843,7 @@ msgstr "" "&dpkg; : elles figurent dans la section <literal>DPkg</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:479 +#: apt.conf.5.xml:507 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 " @@ -6688,17 +6854,17 @@ msgstr "" "est passé comme un seul paramètre à &dpkg;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:484 +#: apt.conf.5.xml:512 msgid "Pre-Invoke" msgstr "Pre-Invoke" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:484 +#: apt.conf.5.xml:512 msgid "Post-Invoke" msgstr "Post-Invoke" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:485 +#: apt.conf.5.xml:513 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 " @@ -6711,12 +6877,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:491 +#: apt.conf.5.xml:519 msgid "Pre-Install-Pkgs" msgstr "Pre-Install-Pkgs" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:492 +#: apt.conf.5.xml:520 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 " @@ -6732,7 +6898,7 @@ msgstr "" "qu'il va installer, à raison d'un par ligne." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:498 +#: apt.conf.5.xml:526 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@ -6748,12 +6914,12 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:505 +#: apt.conf.5.xml:533 msgid "Run-Directory" msgstr "Run-Directory" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:506 +#: apt.conf.5.xml:534 msgid "" "APT chdirs to this directory before invoking dpkg, the default is <filename>/" "</filename>." @@ -6762,12 +6928,12 @@ msgstr "" "le répertoire <filename>/</filename>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:510 +#: apt.conf.5.xml:538 msgid "Build-options" msgstr "Build-options" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:511 +#: apt.conf.5.xml:539 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages, the " "default is to disable signing and produce all binaries." @@ -6777,12 +6943,12 @@ msgstr "" "créés." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt.conf.5.xml:516 +#: apt.conf.5.xml:544 msgid "dpkg trigger usage (and related options)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:517 +#: apt.conf.5.xml:545 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 " @@ -6797,7 +6963,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:532 +#: apt.conf.5.xml:560 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@ -6807,7 +6973,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:526 +#: apt.conf.5.xml:554 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 " @@ -6821,12 +6987,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:538 +#: apt.conf.5.xml:566 msgid "DPkg::NoTriggers" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:539 +#: apt.conf.5.xml:567 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 " @@ -6838,13 +7004,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:546 +#: apt.conf.5.xml:574 #, fuzzy +#| msgid "Packages::Compress" msgid "PackageManager::Configure" msgstr "Packages::Compress" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:547 +#: apt.conf.5.xml:575 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@ -6860,12 +7027,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:557 +#: apt.conf.5.xml:585 msgid "DPkg::ConfigurePending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:558 +#: apt.conf.5.xml:586 msgid "" "If this option is set apt will call <command>dpkg --configure --pending</" "command> to let dpkg handle all required configurations and triggers. This " @@ -6876,12 +7043,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:564 +#: apt.conf.5.xml:592 msgid "DPkg::TriggersPending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:565 +#: apt.conf.5.xml:593 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@ -6891,12 +7058,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:570 +#: apt.conf.5.xml:598 msgid "PackageManager::UnpackAll" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:571 +#: apt.conf.5.xml:599 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-" @@ -6908,12 +7075,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:578 +#: apt.conf.5.xml:606 msgid "OrderList::Score::Immediate" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:586 +#: apt.conf.5.xml:614 #, no-wrap msgid "" "OrderList::Score {\n" @@ -6925,7 +7092,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:579 +#: apt.conf.5.xml:607 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 " @@ -6939,12 +7106,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:599 +#: apt.conf.5.xml:627 msgid "Periodic and Archives options" msgstr "Options « Periodic » et « Archive »" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:600 +#: apt.conf.5.xml:628 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@ -6956,12 +7123,12 @@ msgstr "" "script <literal>/etc/cron.daily/apt</literal>, lancé quotidiennement." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:608 +#: apt.conf.5.xml:636 msgid "Debug options" msgstr "Les options de débogage" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:610 +#: apt.conf.5.xml:638 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -6979,7 +7146,7 @@ msgstr "" "peuvent tout de même être utiles :" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:621 +#: apt.conf.5.xml:649 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@ -6990,7 +7157,7 @@ msgstr "" "upgrade, upgrade, install, remove et purge</literal>." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:629 +#: apt.conf.5.xml:657 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@ -7002,7 +7169,7 @@ msgstr "" "superutilisateur." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:638 +#: apt.conf.5.xml:666 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -7014,7 +7181,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:646 +#: apt.conf.5.xml:674 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CDROM IDs." @@ -7023,17 +7190,17 @@ msgstr "" "type statfs dans les identifiants de CD." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:656 +#: apt.conf.5.xml:684 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:661 +#: apt.conf.5.xml:689 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:665 +#: apt.conf.5.xml:693 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" @@ -7041,44 +7208,44 @@ msgstr "" "literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:672 +#: apt.conf.5.xml:700 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:676 +#: apt.conf.5.xml:704 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:683 +#: apt.conf.5.xml:711 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:687 +#: apt.conf.5.xml:715 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:694 +#: apt.conf.5.xml:722 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:698 +#: apt.conf.5.xml:726 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:705 +#: apt.conf.5.xml:733 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:709 +#: apt.conf.5.xml:737 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." @@ -7087,12 +7254,12 @@ msgstr "" "cryptographiques avec <literal>gpg</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:716 +#: apt.conf.5.xml:744 msgid "<literal>Debug::aptcdrom</literal>" msgstr "<literal>Debug::aptcdrom</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:720 +#: apt.conf.5.xml:748 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." @@ -7101,24 +7268,24 @@ msgstr "" "stockées sur CD." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:727 +#: apt.conf.5.xml:755 msgid "<literal>Debug::BuildDeps</literal>" msgstr "<literal>Debug::BuildDeps</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:730 +#: apt.conf.5.xml:758 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:737 +#: apt.conf.5.xml:765 msgid "<literal>Debug::Hashes</literal>" msgstr "<literal>Debug::Hashes</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:740 +#: apt.conf.5.xml:768 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." @@ -7127,12 +7294,12 @@ msgstr "" "librairies d'<literal>apt</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:747 +#: apt.conf.5.xml:775 msgid "<literal>Debug::IdentCDROM</literal>" msgstr "<literal>Debug::IdentCDROM</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:750 +#: apt.conf.5.xml:778 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 " @@ -7143,12 +7310,12 @@ msgstr "" "utilisés sur le système de fichier du CD." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:758 +#: apt.conf.5.xml:786 msgid "<literal>Debug::NoLocking</literal>" msgstr "<literal>Debug::NoLocking</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:761 +#: apt.conf.5.xml:789 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." @@ -7158,24 +7325,24 @@ msgstr "" "temps." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:769 +#: apt.conf.5.xml:797 msgid "<literal>Debug::pkgAcquire</literal>" msgstr "<literal>Debug::pkgAcquire</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:773 +#: apt.conf.5.xml:801 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:780 +#: apt.conf.5.xml:808 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:783 +#: apt.conf.5.xml:811 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." @@ -7185,12 +7352,12 @@ msgstr "" "éventuelles." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:790 +#: apt.conf.5.xml:818 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:793 +#: apt.conf.5.xml:821 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." @@ -7200,12 +7367,12 @@ msgstr "" "éventuelles." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:801 +#: apt.conf.5.xml:829 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:805 +#: apt.conf.5.xml:833 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." @@ -7215,12 +7382,12 @@ msgstr "" "place des fichiers complets." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:812 +#: apt.conf.5.xml:840 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:816 +#: apt.conf.5.xml:844 msgid "" "Log all interactions with the sub-processes that actually perform downloads." msgstr "" @@ -7228,12 +7395,12 @@ msgstr "" "effectivement des téléchargements." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:823 +#: apt.conf.5.xml:851 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "<literal>Debug::pkgAutoRemove</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:827 +#: apt.conf.5.xml:855 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." @@ -7242,12 +7409,12 @@ msgstr "" "automatiquement, et la suppression des paquets inutiles." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:834 +#: apt.conf.5.xml:862 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:837 +#: apt.conf.5.xml:865 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@ -7262,12 +7429,12 @@ msgstr "" "de APT ; voir <literal>Debug::pkgProblemResolver</literal> pour ce dernier." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:848 +#: apt.conf.5.xml:876 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:851 +#: apt.conf.5.xml:879 msgid "" "Generate debug messages describing which package is marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@ -7302,24 +7469,24 @@ msgstr "" "de APT ; voir <literal>Debug::pkgProblemResolver</literal> pour ce dernier." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:870 +#: apt.conf.5.xml:898 msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "<literal>Debug::pkgInitConfig</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:873 +#: apt.conf.5.xml:901 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:880 +#: apt.conf.5.xml:908 msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "<literal>Debug::pkgDPkgPM</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:883 +#: apt.conf.5.xml:911 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." @@ -7328,12 +7495,12 @@ msgstr "" "paramètres sont séparés par des espaces." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:891 +#: apt.conf.5.xml:919 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:894 +#: apt.conf.5.xml:922 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." @@ -7343,12 +7510,12 @@ msgstr "" "fichier." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:901 +#: apt.conf.5.xml:929 msgid "<literal>Debug::pkgOrderList</literal>" msgstr "<literal>Debug::pkgOrderList</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:905 +#: apt.conf.5.xml:933 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." @@ -7357,33 +7524,33 @@ msgstr "" "<literal>apt</literal> passe les paquets à &dpkg;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:913 +#: apt.conf.5.xml:941 msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "<literal>Debug::pkgPackageManager</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:917 +#: apt.conf.5.xml:945 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:924 +#: apt.conf.5.xml:952 msgid "<literal>Debug::pkgPolicy</literal>" msgstr "<literal>Debug::pkgPolicy</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:928 +#: apt.conf.5.xml:956 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:934 +#: apt.conf.5.xml:962 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "<literal>Debug::pkgProblemResolver</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:938 +#: apt.conf.5.xml:966 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." @@ -7392,12 +7559,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:946 +#: apt.conf.5.xml:974 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:949 +#: apt.conf.5.xml:977 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 " @@ -7408,12 +7575,12 @@ msgstr "" "est décrite dans <literal>Debug::pkgDepCache::Marker</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:957 +#: apt.conf.5.xml:985 msgid "<literal>Debug::sourceList</literal>" msgstr "<literal>Debug::sourceList</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:961 +#: apt.conf.5.xml:989 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." @@ -7422,7 +7589,7 @@ msgstr "" "list</filename>." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:983 +#: apt.conf.5.xml:1012 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." @@ -7431,14 +7598,15 @@ msgstr "" "exemples pour toutes les options existantes." #. type: Content of: <refentry><refsect1><variablelist> -#: apt.conf.5.xml:990 +#: apt.conf.5.xml:1019 #, fuzzy +#| msgid "&apt-conf;" msgid "&file-aptconf;" msgstr "&apt-conf;" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:995 +#: apt.conf.5.xml:1024 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-cache;, &apt-config;, &apt-preferences;." @@ -7461,6 +7629,10 @@ msgstr "Fichier de contrôle des préférences pour 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 " @@ -8638,6 +8810,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist> #: apt_preferences.5.xml:617 #, fuzzy +#| msgid "apt_preferences" msgid "&file-preferences;" msgstr "apt_preferences" diff --git a/doc/po/it.po b/doc/po/it.po index 4e02c188d..e4dd528a5 100644 --- a/doc/po/it.po +++ b/doc/po/it.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2009-12-10 22:04+0100\n" +"POT-Creation-Date: 2009-11-27 00:18+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 @@ 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 @@ 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:988 apt_preferences.5.xml:615 +#: apt.conf.5.xml:1017 apt_preferences.5.xml:615 msgid "Files" msgstr "" @@ -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:994 apt_preferences.5.xml:622 +#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1023 apt_preferences.5.xml:622 #: sources.list.5.xml:233 msgid "See Also" msgstr "" @@ -2696,7 +2696,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:561 apt.conf.5.xml:982 apt_preferences.5.xml:462 +#: apt-ftparchive.1.xml:561 apt.conf.5.xml:1011 apt_preferences.5.xml:462 #: sources.list.5.xml:193 msgid "Examples" msgstr "" @@ -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:321 +#: apt.conf.5.xml:264 apt.conf.5.xml:328 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,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:281 +#: apt.conf.5.xml:286 msgid "https" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:282 +#: apt.conf.5.xml:287 msgid "" -"HTTPS URIs. Cache-control and proxy options are the same as for " -"<literal>http</literal> method. <literal>Pipeline-Depth</literal> option is " +"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:286 +#: apt.conf.5.xml:293 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is " @@ -4673,12 +4683,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:304 sources.list.5.xml:150 +#: apt.conf.5.xml:311 sources.list.5.xml:150 msgid "ftp" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:305 +#: apt.conf.5.xml:312 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 " @@ -4697,7 +4707,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:324 +#: apt.conf.5.xml:331 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 " @@ -4707,7 +4717,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:331 +#: apt.conf.5.xml:338 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 " @@ -4716,7 +4726,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:336 +#: apt.conf.5.xml:343 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@ -4726,18 +4736,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:343 sources.list.5.xml:132 +#: apt.conf.5.xml:350 sources.list.5.xml:132 msgid "cdrom" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:349 +#: apt.conf.5.xml:356 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:344 +#: apt.conf.5.xml:351 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 " @@ -4750,12 +4760,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:354 +#: apt.conf.5.xml:361 msgid "gpgv" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:355 +#: apt.conf.5.xml:362 msgid "" "GPGV URIs; the only option for GPGV URIs is the option to pass additional " "parameters to gpgv. <literal>gpgv::Options</literal> Additional options " @@ -4763,18 +4773,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:360 +#: apt.conf.5.xml:367 msgid "CompressionTypes" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:366 +#: apt.conf.5.xml:373 #, 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:361 +#: apt.conf.5.xml:368 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@ -4786,19 +4796,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:371 +#: apt.conf.5.xml:378 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:374 +#: apt.conf.5.xml:381 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:367 +#: apt.conf.5.xml:374 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 " @@ -4815,13 +4825,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:378 +#: apt.conf.5.xml:385 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:376 +#: apt.conf.5.xml:383 msgid "" "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" "replaceable></literal> will be checked: If this setting exists the method " @@ -4836,7 +4846,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:383 +#: apt.conf.5.xml:390 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 " @@ -4845,6 +4855,53 @@ msgid "" "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 "" @@ -4853,12 +4910,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:392 +#: apt.conf.5.xml:420 msgid "Directories" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:394 +#: apt.conf.5.xml:422 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@ -4870,7 +4927,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:401 +#: apt.conf.5.xml:429 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@ -4883,7 +4940,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:410 +#: apt.conf.5.xml:438 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@ -4893,7 +4950,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:416 +#: apt.conf.5.xml:444 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 " @@ -4901,7 +4958,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:420 +#: apt.conf.5.xml:448 msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" "Bin::Methods</literal> specifies the location of the method handlers and " @@ -4912,7 +4969,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:428 +#: apt.conf.5.xml:456 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@ -4925,13 +4982,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:441 +#: apt.conf.5.xml:469 #, fuzzy msgid "APT in DSelect" msgstr "DSelect" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:443 +#: apt.conf.5.xml:471 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behaviour. These are in the <literal>DSelect</literal> " @@ -4939,12 +4996,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:447 +#: apt.conf.5.xml:475 msgid "Clean" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:448 +#: apt.conf.5.xml:476 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 " @@ -4955,50 +5012,50 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:457 +#: apt.conf.5.xml:485 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:461 +#: apt.conf.5.xml:489 msgid "Updateoptions" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:462 +#: apt.conf.5.xml:490 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:466 +#: apt.conf.5.xml:494 msgid "PromptAfterUpdate" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:467 +#: apt.conf.5.xml:495 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:473 +#: apt.conf.5.xml:501 msgid "How APT calls dpkg" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:474 +#: apt.conf.5.xml:502 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:479 +#: apt.conf.5.xml:507 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 " @@ -5006,17 +5063,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:484 +#: apt.conf.5.xml:512 msgid "Pre-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:484 +#: apt.conf.5.xml:512 msgid "Post-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:485 +#: apt.conf.5.xml:513 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 " @@ -5025,12 +5082,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:491 +#: apt.conf.5.xml:519 msgid "Pre-Install-Pkgs" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:492 +#: apt.conf.5.xml:520 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 " @@ -5040,7 +5097,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:498 +#: apt.conf.5.xml:526 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@ -5050,36 +5107,36 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:505 +#: apt.conf.5.xml:533 msgid "Run-Directory" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:506 +#: apt.conf.5.xml:534 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:510 +#: apt.conf.5.xml:538 msgid "Build-options" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:511 +#: apt.conf.5.xml:539 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:516 +#: apt.conf.5.xml:544 msgid "dpkg trigger usage (and related options)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:517 +#: apt.conf.5.xml:545 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 " @@ -5094,7 +5151,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:532 +#: apt.conf.5.xml:560 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@ -5104,7 +5161,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:526 +#: apt.conf.5.xml:554 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 " @@ -5118,12 +5175,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:538 +#: apt.conf.5.xml:566 msgid "DPkg::NoTriggers" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:539 +#: apt.conf.5.xml:567 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 " @@ -5135,12 +5192,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:546 +#: apt.conf.5.xml:574 msgid "PackageManager::Configure" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:547 +#: apt.conf.5.xml:575 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@ -5156,12 +5213,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:557 +#: apt.conf.5.xml:585 msgid "DPkg::ConfigurePending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:558 +#: apt.conf.5.xml:586 msgid "" "If this option is set apt will call <command>dpkg --configure --pending</" "command> to let dpkg handle all required configurations and triggers. This " @@ -5172,12 +5229,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:564 +#: apt.conf.5.xml:592 msgid "DPkg::TriggersPending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:565 +#: apt.conf.5.xml:593 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@ -5187,12 +5244,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:570 +#: apt.conf.5.xml:598 msgid "PackageManager::UnpackAll" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:571 +#: apt.conf.5.xml:599 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-" @@ -5204,12 +5261,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:578 +#: apt.conf.5.xml:606 msgid "OrderList::Score::Immediate" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:586 +#: apt.conf.5.xml:614 #, no-wrap msgid "" "OrderList::Score {\n" @@ -5221,7 +5278,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:579 +#: apt.conf.5.xml:607 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 " @@ -5235,12 +5292,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:599 +#: apt.conf.5.xml:627 msgid "Periodic and Archives options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:600 +#: apt.conf.5.xml:628 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@ -5249,12 +5306,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:608 +#: apt.conf.5.xml:636 msgid "Debug options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:610 +#: apt.conf.5.xml:638 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -5265,7 +5322,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:621 +#: apt.conf.5.xml:649 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@ -5273,7 +5330,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:629 +#: apt.conf.5.xml:657 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@ -5281,7 +5338,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:638 +#: apt.conf.5.xml:666 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -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:646 +#: apt.conf.5.xml:674 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:656 +#: apt.conf.5.xml:684 msgid "A full list of debugging options to apt follows." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:661 +#: apt.conf.5.xml:689 msgid "<literal>Debug::Acquire::cdrom</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:665 +#: apt.conf.5.xml:693 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:672 +#: apt.conf.5.xml:700 msgid "<literal>Debug::Acquire::ftp</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:676 +#: apt.conf.5.xml:704 msgid "Print information related to downloading packages using FTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:683 +#: apt.conf.5.xml:711 msgid "<literal>Debug::Acquire::http</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:687 +#: apt.conf.5.xml:715 msgid "Print information related to downloading packages using HTTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:694 +#: apt.conf.5.xml:722 msgid "<literal>Debug::Acquire::https</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:698 +#: apt.conf.5.xml:726 msgid "Print information related to downloading packages using HTTPS." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:705 +#: apt.conf.5.xml:733 msgid "<literal>Debug::Acquire::gpgv</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:709 +#: apt.conf.5.xml:737 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:716 +#: apt.conf.5.xml:744 msgid "<literal>Debug::aptcdrom</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:720 +#: apt.conf.5.xml:748 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:727 +#: apt.conf.5.xml:755 msgid "<literal>Debug::BuildDeps</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:730 +#: apt.conf.5.xml:758 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:737 +#: apt.conf.5.xml:765 msgid "<literal>Debug::Hashes</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:740 +#: apt.conf.5.xml:768 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:747 +#: apt.conf.5.xml:775 msgid "<literal>Debug::IdentCDROM</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:750 +#: apt.conf.5.xml:778 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 " @@ -5403,93 +5460,93 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:758 +#: apt.conf.5.xml:786 msgid "<literal>Debug::NoLocking</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:761 +#: apt.conf.5.xml:789 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:769 +#: apt.conf.5.xml:797 msgid "<literal>Debug::pkgAcquire</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:773 +#: apt.conf.5.xml:801 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:780 +#: apt.conf.5.xml:808 msgid "<literal>Debug::pkgAcquire::Auth</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:783 +#: apt.conf.5.xml:811 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:790 +#: apt.conf.5.xml:818 msgid "<literal>Debug::pkgAcquire::Diffs</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:793 +#: apt.conf.5.xml:821 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:801 +#: apt.conf.5.xml:829 msgid "<literal>Debug::pkgAcquire::RRed</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:805 +#: apt.conf.5.xml:833 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:812 +#: apt.conf.5.xml:840 msgid "<literal>Debug::pkgAcquire::Worker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:816 +#: apt.conf.5.xml:844 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:823 +#: apt.conf.5.xml:851 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:827 +#: apt.conf.5.xml:855 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:834 +#: apt.conf.5.xml:862 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:837 +#: apt.conf.5.xml:865 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@ -5499,12 +5556,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:848 +#: apt.conf.5.xml:876 msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:851 +#: apt.conf.5.xml:879 msgid "" "Generate debug messages describing which package is marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@ -5521,91 +5578,91 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:870 +#: apt.conf.5.xml:898 msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:873 +#: apt.conf.5.xml:901 msgid "Dump the default configuration to standard error on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:880 +#: apt.conf.5.xml:908 msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:883 +#: apt.conf.5.xml:911 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:891 +#: apt.conf.5.xml:919 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:894 +#: apt.conf.5.xml:922 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:901 +#: apt.conf.5.xml:929 msgid "<literal>Debug::pkgOrderList</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:905 +#: apt.conf.5.xml:933 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:913 +#: apt.conf.5.xml:941 msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:917 +#: apt.conf.5.xml:945 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:924 +#: apt.conf.5.xml:952 msgid "<literal>Debug::pkgPolicy</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:928 +#: apt.conf.5.xml:956 msgid "Output the priority of each package list on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:934 +#: apt.conf.5.xml:962 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:938 +#: apt.conf.5.xml:966 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:946 +#: apt.conf.5.xml:974 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:949 +#: apt.conf.5.xml:977 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 " @@ -5613,32 +5670,32 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:957 +#: apt.conf.5.xml:985 msgid "<literal>Debug::sourceList</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:961 +#: apt.conf.5.xml:989 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:983 +#: apt.conf.5.xml:1012 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt.conf.5.xml:990 +#: apt.conf.5.xml:1019 msgid "&file-aptconf;" msgstr "" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:995 +#: apt.conf.5.xml:1024 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "" diff --git a/doc/po/ja.po b/doc/po/ja.po index ee2d4aca1..ba04b200f 100644 --- a/doc/po/ja.po +++ b/doc/po/ja.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2009-12-10 22:04+0100\n" +"POT-Creation-Date: 2009-11-27 00:05+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,6 +604,15 @@ 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" @@ -655,6 +664,13 @@ 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" @@ -674,6 +690,13 @@ 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" @@ -693,6 +716,12 @@ 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" @@ -957,6 +986,7 @@ 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" @@ -969,6 +999,7 @@ msgstr "取得中パッケージファイル格納エリア。設定項目 - <li #. 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" @@ -1018,6 +1049,7 @@ 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" @@ -1031,6 +1063,7 @@ 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" @@ -1556,6 +1589,12 @@ msgstr "pkgnames <replaceable>[ prefix ]</replaceable>" #. 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 " @@ -1685,7 +1724,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 "オプション" @@ -1935,7 +1974,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:988 apt_preferences.5.xml:615 +#: apt.conf.5.xml:1017 apt_preferences.5.xml:615 msgid "Files" msgstr "ファイル" @@ -1949,7 +1988,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:994 apt_preferences.5.xml:622 +#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1023 apt_preferences.5.xml:622 #: sources.list.5.xml:233 msgid "See Also" msgstr "関連項目" @@ -2487,6 +2526,9 @@ 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>" @@ -2510,6 +2552,25 @@ 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> " @@ -3677,7 +3738,7 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:561 apt.conf.5.xml:982 apt_preferences.5.xml:462 +#: apt-ftparchive.1.xml:561 apt.conf.5.xml:1011 apt_preferences.5.xml:462 #: sources.list.5.xml:193 msgid "Examples" msgstr "サンプル" @@ -3734,6 +3795,37 @@ 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> " @@ -4070,6 +4162,18 @@ 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 " @@ -5073,6 +5177,9 @@ 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>" @@ -5096,6 +5203,11 @@ 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" @@ -5123,6 +5235,12 @@ 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 " @@ -5178,6 +5296,10 @@ 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." @@ -5188,6 +5310,7 @@ 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>" @@ -5195,6 +5318,7 @@ msgstr "<option>-f=<filename>FILENAME</filename></option>" #. 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>" @@ -5204,6 +5328,11 @@ msgstr "<option>--file=<filename>FILENAME</filename></option>" #. 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 " @@ -5250,6 +5379,7 @@ 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>" @@ -5265,6 +5395,7 @@ 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;" @@ -5716,6 +5847,11 @@ 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 " @@ -5792,6 +5928,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 " @@ -5884,6 +6028,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 descendents are " +#| "erased." msgid "" "Two specials are allowed, <literal>#include</literal> (which is deprecated " "and not supported by alternative implementations) and <literal>#clear</" @@ -5913,6 +6064,12 @@ 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 " @@ -6249,6 +6406,13 @@ 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 " @@ -6291,7 +6455,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:321 +#: apt.conf.5.xml:264 apt.conf.5.xml:328 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method, this applies to all things including connection timeout and data " @@ -6340,17 +6504,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:281 +#: apt.conf.5.xml:286 msgid "https" msgstr "https" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: 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 " +#: apt.conf.5.xml:287 +#, fuzzy +#| msgid "" +#| "HTTPS URIs. Cache-control and proxy options are the same as for " +#| "<literal>http</literal> method. <literal>Pipeline-Depth</literal> option " +#| "is not supported yet." +msgid "" +"HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy " +"options are the same as for <literal>http</literal> method and will also " +"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> メ" @@ -6358,7 +6537,7 @@ msgstr "" "していません。" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:286 +#: apt.conf.5.xml:293 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is " @@ -6380,14 +6559,26 @@ msgstr "" # type: <tag></tag> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:304 sources.list.5.xml:150 +#: apt.conf.5.xml:311 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:305 +#: apt.conf.5.xml:312 #, 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 " @@ -6417,7 +6608,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:324 +#: apt.conf.5.xml:331 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 " @@ -6433,7 +6624,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:338 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 " @@ -6447,7 +6638,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:336 +#: apt.conf.5.xml:343 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@ -6464,19 +6655,20 @@ msgstr "" # type: Content of: <refentry><refnamediv><refname> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:343 sources.list.5.xml:132 +#: apt.conf.5.xml:350 sources.list.5.xml:132 msgid "cdrom" msgstr "cdrom" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:349 +#: apt.conf.5.xml:356 #, 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:344 +#: apt.conf.5.xml:351 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 " @@ -6497,13 +6689,13 @@ msgstr "" "す。" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:354 +#: apt.conf.5.xml:361 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:355 +#: apt.conf.5.xml:362 msgid "" "GPGV URIs; the only option for GPGV URIs is the option to pass additional " "parameters to gpgv. <literal>gpgv::Options</literal> Additional options " @@ -6514,18 +6706,18 @@ msgstr "" "す。" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:360 +#: apt.conf.5.xml:367 msgid "CompressionTypes" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:366 +#: apt.conf.5.xml:373 #, 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:361 +#: apt.conf.5.xml:368 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@ -6537,19 +6729,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:371 +#: apt.conf.5.xml:378 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:374 +#: apt.conf.5.xml:381 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:367 +#: apt.conf.5.xml:374 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 " @@ -6566,13 +6758,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:378 +#: apt.conf.5.xml:385 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:376 +#: apt.conf.5.xml:383 msgid "" "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" "replaceable></literal> will be checked: If this setting exists the method " @@ -6587,7 +6779,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:383 +#: apt.conf.5.xml:390 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 " @@ -6596,6 +6788,53 @@ msgid "" "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 @@ -6609,13 +6848,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:392 +#: apt.conf.5.xml:420 msgid "Directories" msgstr "ディレクトリ" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:394 +#: apt.conf.5.xml:422 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@ -6635,7 +6874,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:401 +#: apt.conf.5.xml:429 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@ -6657,7 +6896,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:410 +#: apt.conf.5.xml:438 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@ -6672,7 +6911,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:416 +#: apt.conf.5.xml:444 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 " @@ -6684,8 +6923,15 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:420 +#: apt.conf.5.xml:448 #, 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 " @@ -6702,7 +6948,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:428 +#: apt.conf.5.xml:456 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@ -6723,13 +6969,13 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:441 +#: apt.conf.5.xml:469 msgid "APT in DSelect" msgstr "DSelect での APT" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:443 +#: apt.conf.5.xml:471 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behaviour. These are in the <literal>DSelect</literal> " @@ -6739,13 +6985,13 @@ msgstr "" "設定項目で、デフォルトの動作を制御します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:447 +#: apt.conf.5.xml:475 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:448 +#: apt.conf.5.xml:476 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 " @@ -6762,7 +7008,7 @@ msgstr "" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:457 +#: apt.conf.5.xml:485 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the install phase." @@ -6772,13 +7018,13 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:461 +#: apt.conf.5.xml:489 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:462 +#: apt.conf.5.xml:490 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the update phase." @@ -6787,13 +7033,13 @@ msgstr "" "されます。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:466 +#: apt.conf.5.xml:494 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:467 +#: apt.conf.5.xml:495 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." @@ -6803,13 +7049,13 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:473 +#: apt.conf.5.xml:501 msgid "How APT calls dpkg" msgstr "APT が dpkg を呼ぶ方法" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:474 +#: apt.conf.5.xml:502 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." @@ -6819,7 +7065,7 @@ msgstr "" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:479 +#: apt.conf.5.xml:507 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 " @@ -6829,18 +7075,18 @@ msgstr "" "ければなりません。また、各リストは単一の引数として &dpkg; に渡されます。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:484 +#: apt.conf.5.xml:512 msgid "Pre-Invoke" msgstr "Pre-Invoke" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:484 +#: apt.conf.5.xml:512 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:485 +#: apt.conf.5.xml:513 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 " @@ -6854,13 +7100,13 @@ msgstr "" # type: <tag></tag> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:491 +#: apt.conf.5.xml:519 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:492 +#: apt.conf.5.xml:520 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 " @@ -6876,7 +7122,7 @@ msgstr "" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:498 +#: apt.conf.5.xml:526 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@ -6892,13 +7138,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:505 +#: apt.conf.5.xml:533 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:506 +#: apt.conf.5.xml:534 msgid "" "APT chdirs to this directory before invoking dpkg, the default is <filename>/" "</filename>." @@ -6908,13 +7154,13 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:510 +#: apt.conf.5.xml:538 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:511 +#: apt.conf.5.xml:539 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages, the " "default is to disable signing and produce all binaries." @@ -6923,12 +7169,12 @@ msgstr "" "ます。デフォルトでは署名を無効にし、全バイナリを生成します。" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt.conf.5.xml:516 +#: apt.conf.5.xml:544 msgid "dpkg trigger usage (and related options)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:517 +#: apt.conf.5.xml:545 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 " @@ -6943,7 +7189,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:532 +#: apt.conf.5.xml:560 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@ -6953,7 +7199,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:526 +#: apt.conf.5.xml:554 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 " @@ -6967,12 +7213,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:538 +#: apt.conf.5.xml:566 msgid "DPkg::NoTriggers" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:539 +#: apt.conf.5.xml:567 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 " @@ -6985,13 +7231,14 @@ msgstr "" # type: <tag></tag> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:546 +#: apt.conf.5.xml:574 #, fuzzy +#| msgid "Packages::Compress" msgid "PackageManager::Configure" msgstr "Packages::Compress" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:547 +#: apt.conf.5.xml:575 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@ -7008,13 +7255,13 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:557 +#: apt.conf.5.xml:585 #, fuzzy msgid "DPkg::ConfigurePending" msgstr "ユーザの設定" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:558 +#: apt.conf.5.xml:586 msgid "" "If this option is set apt will call <command>dpkg --configure --pending</" "command> to let dpkg handle all required configurations and triggers. This " @@ -7025,12 +7272,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:564 +#: apt.conf.5.xml:592 msgid "DPkg::TriggersPending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:565 +#: apt.conf.5.xml:593 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@ -7040,12 +7287,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:570 +#: apt.conf.5.xml:598 msgid "PackageManager::UnpackAll" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:571 +#: apt.conf.5.xml:599 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-" @@ -7057,12 +7304,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:578 +#: apt.conf.5.xml:606 msgid "OrderList::Score::Immediate" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:586 +#: apt.conf.5.xml:614 #, no-wrap msgid "" "OrderList::Score {\n" @@ -7074,7 +7321,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:579 +#: apt.conf.5.xml:607 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 " @@ -7088,12 +7335,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:599 +#: apt.conf.5.xml:627 msgid "Periodic and Archives options" msgstr "Periodic オプションと Archives オプション" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:600 +#: apt.conf.5.xml:628 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@ -7107,12 +7354,12 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:608 +#: apt.conf.5.xml:636 msgid "Debug options" msgstr "デバッグオプション" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:610 +#: apt.conf.5.xml:638 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -7123,7 +7370,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:621 +#: apt.conf.5.xml:649 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@ -7134,7 +7381,7 @@ msgstr "" "にします。" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:629 +#: apt.conf.5.xml:657 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@ -7145,7 +7392,7 @@ msgstr "" "literal>) を行う場合に使用します。" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:638 +#: apt.conf.5.xml:666 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -7155,66 +7402,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:646 +#: apt.conf.5.xml:674 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:656 +#: apt.conf.5.xml:684 msgid "A full list of debugging options to apt follows." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:661 +#: apt.conf.5.xml:689 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:665 +#: apt.conf.5.xml:693 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:672 +#: apt.conf.5.xml:700 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:676 +#: apt.conf.5.xml:704 msgid "Print information related to downloading packages using FTP." msgstr "FTP を用いたパッケージのダウンロードに関する情報を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:683 +#: apt.conf.5.xml:711 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:687 +#: apt.conf.5.xml:715 msgid "Print information related to downloading packages using HTTP." msgstr "HTTP を用いたパッケージのダウンロードに関する情報を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:694 +#: apt.conf.5.xml:722 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:698 +#: apt.conf.5.xml:726 msgid "Print information related to downloading packages using HTTPS." msgstr "HTTPS を用いたパッケージのダウンロードに関する情報を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:705 +#: apt.conf.5.xml:733 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:709 +#: apt.conf.5.xml:737 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." @@ -7222,46 +7469,46 @@ msgstr "" "<literal>gpg</literal> を用いた暗号署名の検証に関する情報を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:716 +#: apt.conf.5.xml:744 msgid "<literal>Debug::aptcdrom</literal>" msgstr "<literal>Debug::aptcdrom</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:720 +#: apt.conf.5.xml:748 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:727 +#: apt.conf.5.xml:755 msgid "<literal>Debug::BuildDeps</literal>" msgstr "<literal>Debug::BuildDeps</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:730 +#: apt.conf.5.xml:758 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:737 +#: apt.conf.5.xml:765 msgid "<literal>Debug::Hashes</literal>" msgstr "<literal>Debug::Hashes</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:740 +#: apt.conf.5.xml:768 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:747 +#: apt.conf.5.xml:775 msgid "<literal>Debug::IdentCDROM</literal>" msgstr "<literal>Debug::IdentCDROM</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:750 +#: apt.conf.5.xml:778 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 " @@ -7269,93 +7516,93 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:758 +#: apt.conf.5.xml:786 msgid "<literal>Debug::NoLocking</literal>" msgstr "<literal>Debug::NoLocking</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:761 +#: apt.conf.5.xml:789 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:769 +#: apt.conf.5.xml:797 msgid "<literal>Debug::pkgAcquire</literal>" msgstr "<literal>Debug::pkgAcquire</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:773 +#: apt.conf.5.xml:801 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:780 +#: apt.conf.5.xml:808 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:783 +#: apt.conf.5.xml:811 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:790 +#: apt.conf.5.xml:818 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:793 +#: apt.conf.5.xml:821 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:801 +#: apt.conf.5.xml:829 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:805 +#: apt.conf.5.xml:833 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:812 +#: apt.conf.5.xml:840 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:816 +#: apt.conf.5.xml:844 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:823 +#: apt.conf.5.xml:851 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "<literal>Debug::pkgAutoRemove</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:827 +#: apt.conf.5.xml:855 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:834 +#: apt.conf.5.xml:862 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:837 +#: apt.conf.5.xml:865 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@ -7365,12 +7612,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:848 +#: apt.conf.5.xml:876 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:851 +#: apt.conf.5.xml:879 msgid "" "Generate debug messages describing which package is marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@ -7387,91 +7634,91 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:870 +#: apt.conf.5.xml:898 msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "<literal>Debug::pkgInitConfig</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:873 +#: apt.conf.5.xml:901 msgid "Dump the default configuration to standard error on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:880 +#: apt.conf.5.xml:908 msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "<literal>Debug::pkgDPkgPM</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:883 +#: apt.conf.5.xml:911 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:891 +#: apt.conf.5.xml:919 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:894 +#: apt.conf.5.xml:922 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:901 +#: apt.conf.5.xml:929 msgid "<literal>Debug::pkgOrderList</literal>" msgstr "<literal>Debug::pkgOrderList</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:905 +#: apt.conf.5.xml:933 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:913 +#: apt.conf.5.xml:941 msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "<literal>Debug::pkgPackageManager</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:917 +#: apt.conf.5.xml:945 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:924 +#: apt.conf.5.xml:952 msgid "<literal>Debug::pkgPolicy</literal>" msgstr "<literal>Debug::pkgPolicy</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:928 +#: apt.conf.5.xml:956 msgid "Output the priority of each package list on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:934 +#: apt.conf.5.xml:962 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "<literal>Debug::pkgProblemResolver</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:938 +#: apt.conf.5.xml:966 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:946 +#: apt.conf.5.xml:974 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:949 +#: apt.conf.5.xml:977 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 " @@ -7479,12 +7726,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:957 +#: apt.conf.5.xml:985 msgid "<literal>Debug::sourceList</literal>" msgstr "<literal>Debug::sourceList</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:961 +#: apt.conf.5.xml:989 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." @@ -7492,7 +7739,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:983 +#: apt.conf.5.xml:1012 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." @@ -7502,15 +7749,16 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><variablelist> -#: apt.conf.5.xml:990 +#: apt.conf.5.xml:1019 #, 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:995 +#: apt.conf.5.xml:1024 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-cache;, &apt-config;, &apt-preferences;." @@ -7536,6 +7784,10 @@ 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 " @@ -8770,6 +9022,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist> #: apt_preferences.5.xml:617 #, fuzzy +#| msgid "apt_preferences" msgid "&file-preferences;" msgstr "apt_preferences" diff --git a/doc/po/pl.po b/doc/po/pl.po index 3b3670abf..7ee8cc964 100644 --- a/doc/po/pl.po +++ b/doc/po/pl.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" -"POT-Creation-Date: 2009-12-10 22:04+0100\n" +"POT-Creation-Date: 2009-11-27 00:18+0100\n" "PO-Revision-Date: 2004-02-12 15:06+0100\n" "Last-Translator: Krzysztof Fiertek <akfedux@megapolis.pl>\n" "Language-Team: <debian-l10n-polish@lists.debian.org>\n" @@ -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 @@ 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:988 apt_preferences.5.xml:615 +#: apt.conf.5.xml:1017 apt_preferences.5.xml:615 msgid "Files" msgstr "" @@ -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:994 apt_preferences.5.xml:622 +#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1023 apt_preferences.5.xml:622 #: sources.list.5.xml:233 msgid "See Also" msgstr "" @@ -2702,7 +2702,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:561 apt.conf.5.xml:982 apt_preferences.5.xml:462 +#: apt-ftparchive.1.xml:561 apt.conf.5.xml:1011 apt_preferences.5.xml:462 #: sources.list.5.xml:193 msgid "Examples" msgstr "" @@ -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:321 +#: apt.conf.5.xml:264 apt.conf.5.xml:328 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,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:281 +#: apt.conf.5.xml:286 msgid "https" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:282 +#: apt.conf.5.xml:287 msgid "" -"HTTPS URIs. Cache-control and proxy options are the same as for " -"<literal>http</literal> method. <literal>Pipeline-Depth</literal> option is " +"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:286 +#: apt.conf.5.xml:293 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is " @@ -4675,12 +4685,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:304 sources.list.5.xml:150 +#: apt.conf.5.xml:311 sources.list.5.xml:150 msgid "ftp" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:305 +#: apt.conf.5.xml:312 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 " @@ -4699,7 +4709,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:324 +#: apt.conf.5.xml:331 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 " @@ -4709,7 +4719,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:331 +#: apt.conf.5.xml:338 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 " @@ -4718,7 +4728,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:336 +#: apt.conf.5.xml:343 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@ -4728,18 +4738,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:343 sources.list.5.xml:132 +#: apt.conf.5.xml:350 sources.list.5.xml:132 msgid "cdrom" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:349 +#: apt.conf.5.xml:356 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:344 +#: apt.conf.5.xml:351 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 " @@ -4752,12 +4762,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:354 +#: apt.conf.5.xml:361 msgid "gpgv" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:355 +#: apt.conf.5.xml:362 msgid "" "GPGV URIs; the only option for GPGV URIs is the option to pass additional " "parameters to gpgv. <literal>gpgv::Options</literal> Additional options " @@ -4765,18 +4775,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:360 +#: apt.conf.5.xml:367 msgid "CompressionTypes" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:366 +#: apt.conf.5.xml:373 #, 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:361 +#: apt.conf.5.xml:368 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@ -4788,19 +4798,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:371 +#: apt.conf.5.xml:378 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:374 +#: apt.conf.5.xml:381 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:367 +#: apt.conf.5.xml:374 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 " @@ -4817,13 +4827,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:378 +#: apt.conf.5.xml:385 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:376 +#: apt.conf.5.xml:383 msgid "" "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" "replaceable></literal> will be checked: If this setting exists the method " @@ -4838,7 +4848,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:383 +#: apt.conf.5.xml:390 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 " @@ -4847,6 +4857,53 @@ msgid "" "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 "" @@ -4855,12 +4912,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:392 +#: apt.conf.5.xml:420 msgid "Directories" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:394 +#: apt.conf.5.xml:422 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@ -4872,7 +4929,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:401 +#: apt.conf.5.xml:429 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@ -4885,7 +4942,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:410 +#: apt.conf.5.xml:438 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@ -4895,7 +4952,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:416 +#: apt.conf.5.xml:444 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 " @@ -4903,7 +4960,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:420 +#: apt.conf.5.xml:448 msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" "Bin::Methods</literal> specifies the location of the method handlers and " @@ -4914,7 +4971,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:428 +#: apt.conf.5.xml:456 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@ -4927,12 +4984,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:441 +#: apt.conf.5.xml:469 msgid "APT in DSelect" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:443 +#: apt.conf.5.xml:471 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behaviour. These are in the <literal>DSelect</literal> " @@ -4940,12 +4997,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:447 +#: apt.conf.5.xml:475 msgid "Clean" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:448 +#: apt.conf.5.xml:476 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 " @@ -4956,50 +5013,50 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:457 +#: apt.conf.5.xml:485 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:461 +#: apt.conf.5.xml:489 msgid "Updateoptions" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:462 +#: apt.conf.5.xml:490 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:466 +#: apt.conf.5.xml:494 msgid "PromptAfterUpdate" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:467 +#: apt.conf.5.xml:495 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:473 +#: apt.conf.5.xml:501 msgid "How APT calls dpkg" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:474 +#: apt.conf.5.xml:502 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:479 +#: apt.conf.5.xml:507 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 " @@ -5007,17 +5064,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:484 +#: apt.conf.5.xml:512 msgid "Pre-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:484 +#: apt.conf.5.xml:512 msgid "Post-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:485 +#: apt.conf.5.xml:513 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 " @@ -5026,12 +5083,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:491 +#: apt.conf.5.xml:519 msgid "Pre-Install-Pkgs" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:492 +#: apt.conf.5.xml:520 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 " @@ -5041,7 +5098,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:498 +#: apt.conf.5.xml:526 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@ -5051,36 +5108,36 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:505 +#: apt.conf.5.xml:533 msgid "Run-Directory" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:506 +#: apt.conf.5.xml:534 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:510 +#: apt.conf.5.xml:538 msgid "Build-options" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:511 +#: apt.conf.5.xml:539 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:516 +#: apt.conf.5.xml:544 msgid "dpkg trigger usage (and related options)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:517 +#: apt.conf.5.xml:545 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 " @@ -5095,7 +5152,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:532 +#: apt.conf.5.xml:560 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@ -5105,7 +5162,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:526 +#: apt.conf.5.xml:554 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 " @@ -5119,12 +5176,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:538 +#: apt.conf.5.xml:566 msgid "DPkg::NoTriggers" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:539 +#: apt.conf.5.xml:567 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 " @@ -5136,12 +5193,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:546 +#: apt.conf.5.xml:574 msgid "PackageManager::Configure" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:547 +#: apt.conf.5.xml:575 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@ -5157,12 +5214,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:557 +#: apt.conf.5.xml:585 msgid "DPkg::ConfigurePending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:558 +#: apt.conf.5.xml:586 msgid "" "If this option is set apt will call <command>dpkg --configure --pending</" "command> to let dpkg handle all required configurations and triggers. This " @@ -5173,12 +5230,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:564 +#: apt.conf.5.xml:592 msgid "DPkg::TriggersPending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:565 +#: apt.conf.5.xml:593 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@ -5188,12 +5245,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:570 +#: apt.conf.5.xml:598 msgid "PackageManager::UnpackAll" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:571 +#: apt.conf.5.xml:599 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-" @@ -5205,12 +5262,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:578 +#: apt.conf.5.xml:606 msgid "OrderList::Score::Immediate" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:586 +#: apt.conf.5.xml:614 #, no-wrap msgid "" "OrderList::Score {\n" @@ -5222,7 +5279,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:579 +#: apt.conf.5.xml:607 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 " @@ -5236,12 +5293,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:599 +#: apt.conf.5.xml:627 msgid "Periodic and Archives options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:600 +#: apt.conf.5.xml:628 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@ -5250,12 +5307,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:608 +#: apt.conf.5.xml:636 msgid "Debug options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:610 +#: apt.conf.5.xml:638 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -5266,7 +5323,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:621 +#: apt.conf.5.xml:649 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@ -5274,7 +5331,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:629 +#: apt.conf.5.xml:657 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@ -5282,7 +5339,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:638 +#: apt.conf.5.xml:666 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -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:646 +#: apt.conf.5.xml:674 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:656 +#: apt.conf.5.xml:684 msgid "A full list of debugging options to apt follows." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:661 +#: apt.conf.5.xml:689 msgid "<literal>Debug::Acquire::cdrom</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:665 +#: apt.conf.5.xml:693 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:672 +#: apt.conf.5.xml:700 msgid "<literal>Debug::Acquire::ftp</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:676 +#: apt.conf.5.xml:704 msgid "Print information related to downloading packages using FTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:683 +#: apt.conf.5.xml:711 msgid "<literal>Debug::Acquire::http</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:687 +#: apt.conf.5.xml:715 msgid "Print information related to downloading packages using HTTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:694 +#: apt.conf.5.xml:722 msgid "<literal>Debug::Acquire::https</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:698 +#: apt.conf.5.xml:726 msgid "Print information related to downloading packages using HTTPS." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:705 +#: apt.conf.5.xml:733 msgid "<literal>Debug::Acquire::gpgv</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:709 +#: apt.conf.5.xml:737 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:716 +#: apt.conf.5.xml:744 msgid "<literal>Debug::aptcdrom</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:720 +#: apt.conf.5.xml:748 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:727 +#: apt.conf.5.xml:755 msgid "<literal>Debug::BuildDeps</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:730 +#: apt.conf.5.xml:758 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:737 +#: apt.conf.5.xml:765 msgid "<literal>Debug::Hashes</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:740 +#: apt.conf.5.xml:768 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:747 +#: apt.conf.5.xml:775 msgid "<literal>Debug::IdentCDROM</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:750 +#: apt.conf.5.xml:778 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 " @@ -5404,93 +5461,93 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:758 +#: apt.conf.5.xml:786 msgid "<literal>Debug::NoLocking</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:761 +#: apt.conf.5.xml:789 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:769 +#: apt.conf.5.xml:797 msgid "<literal>Debug::pkgAcquire</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:773 +#: apt.conf.5.xml:801 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:780 +#: apt.conf.5.xml:808 msgid "<literal>Debug::pkgAcquire::Auth</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:783 +#: apt.conf.5.xml:811 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:790 +#: apt.conf.5.xml:818 msgid "<literal>Debug::pkgAcquire::Diffs</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:793 +#: apt.conf.5.xml:821 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:801 +#: apt.conf.5.xml:829 msgid "<literal>Debug::pkgAcquire::RRed</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:805 +#: apt.conf.5.xml:833 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:812 +#: apt.conf.5.xml:840 msgid "<literal>Debug::pkgAcquire::Worker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:816 +#: apt.conf.5.xml:844 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:823 +#: apt.conf.5.xml:851 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:827 +#: apt.conf.5.xml:855 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:834 +#: apt.conf.5.xml:862 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:837 +#: apt.conf.5.xml:865 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@ -5500,12 +5557,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:848 +#: apt.conf.5.xml:876 msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:851 +#: apt.conf.5.xml:879 msgid "" "Generate debug messages describing which package is marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@ -5522,91 +5579,91 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:870 +#: apt.conf.5.xml:898 msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:873 +#: apt.conf.5.xml:901 msgid "Dump the default configuration to standard error on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:880 +#: apt.conf.5.xml:908 msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:883 +#: apt.conf.5.xml:911 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:891 +#: apt.conf.5.xml:919 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:894 +#: apt.conf.5.xml:922 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:901 +#: apt.conf.5.xml:929 msgid "<literal>Debug::pkgOrderList</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:905 +#: apt.conf.5.xml:933 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:913 +#: apt.conf.5.xml:941 msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:917 +#: apt.conf.5.xml:945 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:924 +#: apt.conf.5.xml:952 msgid "<literal>Debug::pkgPolicy</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:928 +#: apt.conf.5.xml:956 msgid "Output the priority of each package list on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:934 +#: apt.conf.5.xml:962 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:938 +#: apt.conf.5.xml:966 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:946 +#: apt.conf.5.xml:974 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:949 +#: apt.conf.5.xml:977 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 " @@ -5614,32 +5671,32 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:957 +#: apt.conf.5.xml:985 msgid "<literal>Debug::sourceList</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:961 +#: apt.conf.5.xml:989 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:983 +#: apt.conf.5.xml:1012 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt.conf.5.xml:990 +#: apt.conf.5.xml:1019 msgid "&file-aptconf;" msgstr "" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:995 +#: apt.conf.5.xml:1024 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "" diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po index de86f98bb..331cb4d3f 100644 --- a/doc/po/pt_BR.po +++ b/doc/po/pt_BR.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" -"POT-Creation-Date: 2009-12-10 22:04+0100\n" +"POT-Creation-Date: 2009-11-27 00:18+0100\n" "PO-Revision-Date: 2004-09-20 17:02+0000\n" "Last-Translator: André Luís Lopes <andrelop@debian.org>\n" "Language-Team: <debian-l10n-portuguese@lists.debian.org>\n" @@ -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 @@ 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:988 apt_preferences.5.xml:615 +#: apt.conf.5.xml:1017 apt_preferences.5.xml:615 msgid "Files" msgstr "" @@ -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:994 apt_preferences.5.xml:622 +#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1023 apt_preferences.5.xml:622 #: sources.list.5.xml:233 #, fuzzy msgid "See Also" @@ -2749,7 +2749,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:561 apt.conf.5.xml:982 apt_preferences.5.xml:462 +#: apt-ftparchive.1.xml:561 apt.conf.5.xml:1011 apt_preferences.5.xml:462 #: sources.list.5.xml:193 #, fuzzy msgid "Examples" @@ -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:321 +#: apt.conf.5.xml:264 apt.conf.5.xml:328 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,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:281 +#: apt.conf.5.xml:286 msgid "https" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:282 +#: apt.conf.5.xml:287 msgid "" -"HTTPS URIs. Cache-control and proxy options are the same as for " -"<literal>http</literal> method. <literal>Pipeline-Depth</literal> option is " +"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:286 +#: apt.conf.5.xml:293 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is " @@ -4724,12 +4734,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:304 sources.list.5.xml:150 +#: apt.conf.5.xml:311 sources.list.5.xml:150 msgid "ftp" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:305 +#: apt.conf.5.xml:312 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 " @@ -4748,7 +4758,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:324 +#: apt.conf.5.xml:331 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 " @@ -4758,7 +4768,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:331 +#: apt.conf.5.xml:338 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 " @@ -4767,7 +4777,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:336 +#: apt.conf.5.xml:343 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@ -4777,18 +4787,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:343 sources.list.5.xml:132 +#: apt.conf.5.xml:350 sources.list.5.xml:132 msgid "cdrom" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:349 +#: apt.conf.5.xml:356 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:344 +#: apt.conf.5.xml:351 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 " @@ -4801,12 +4811,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:354 +#: apt.conf.5.xml:361 msgid "gpgv" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:355 +#: apt.conf.5.xml:362 msgid "" "GPGV URIs; the only option for GPGV URIs is the option to pass additional " "parameters to gpgv. <literal>gpgv::Options</literal> Additional options " @@ -4814,18 +4824,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:360 +#: apt.conf.5.xml:367 msgid "CompressionTypes" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:366 +#: apt.conf.5.xml:373 #, 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:361 +#: apt.conf.5.xml:368 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@ -4837,19 +4847,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:371 +#: apt.conf.5.xml:378 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:374 +#: apt.conf.5.xml:381 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:367 +#: apt.conf.5.xml:374 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 " @@ -4866,13 +4876,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:378 +#: apt.conf.5.xml:385 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:376 +#: apt.conf.5.xml:383 msgid "" "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" "replaceable></literal> will be checked: If this setting exists the method " @@ -4887,7 +4897,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:383 +#: apt.conf.5.xml:390 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 " @@ -4896,6 +4906,53 @@ msgid "" "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 "" @@ -4904,12 +4961,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:392 +#: apt.conf.5.xml:420 msgid "Directories" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:394 +#: apt.conf.5.xml:422 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@ -4921,7 +4978,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:401 +#: apt.conf.5.xml:429 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@ -4934,7 +4991,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:410 +#: apt.conf.5.xml:438 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@ -4944,7 +5001,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:416 +#: apt.conf.5.xml:444 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 " @@ -4952,7 +5009,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:420 +#: apt.conf.5.xml:448 msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" "Bin::Methods</literal> specifies the location of the method handlers and " @@ -4963,7 +5020,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:428 +#: apt.conf.5.xml:456 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@ -4976,12 +5033,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:441 +#: apt.conf.5.xml:469 msgid "APT in DSelect" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:443 +#: apt.conf.5.xml:471 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behaviour. These are in the <literal>DSelect</literal> " @@ -4989,12 +5046,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:447 +#: apt.conf.5.xml:475 msgid "Clean" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:448 +#: apt.conf.5.xml:476 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 " @@ -5005,50 +5062,50 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:457 +#: apt.conf.5.xml:485 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:461 +#: apt.conf.5.xml:489 msgid "Updateoptions" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:462 +#: apt.conf.5.xml:490 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:466 +#: apt.conf.5.xml:494 msgid "PromptAfterUpdate" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:467 +#: apt.conf.5.xml:495 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:473 +#: apt.conf.5.xml:501 msgid "How APT calls dpkg" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:474 +#: apt.conf.5.xml:502 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:479 +#: apt.conf.5.xml:507 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 " @@ -5056,17 +5113,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:484 +#: apt.conf.5.xml:512 msgid "Pre-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:484 +#: apt.conf.5.xml:512 msgid "Post-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:485 +#: apt.conf.5.xml:513 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 " @@ -5075,12 +5132,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:491 +#: apt.conf.5.xml:519 msgid "Pre-Install-Pkgs" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:492 +#: apt.conf.5.xml:520 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 " @@ -5090,7 +5147,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:498 +#: apt.conf.5.xml:526 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@ -5100,36 +5157,36 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:505 +#: apt.conf.5.xml:533 msgid "Run-Directory" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:506 +#: apt.conf.5.xml:534 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:510 +#: apt.conf.5.xml:538 msgid "Build-options" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:511 +#: apt.conf.5.xml:539 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:516 +#: apt.conf.5.xml:544 msgid "dpkg trigger usage (and related options)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:517 +#: apt.conf.5.xml:545 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 " @@ -5144,7 +5201,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:532 +#: apt.conf.5.xml:560 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@ -5154,7 +5211,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:526 +#: apt.conf.5.xml:554 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 " @@ -5168,12 +5225,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:538 +#: apt.conf.5.xml:566 msgid "DPkg::NoTriggers" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:539 +#: apt.conf.5.xml:567 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 " @@ -5185,12 +5242,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:546 +#: apt.conf.5.xml:574 msgid "PackageManager::Configure" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:547 +#: apt.conf.5.xml:575 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@ -5206,12 +5263,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:557 +#: apt.conf.5.xml:585 msgid "DPkg::ConfigurePending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:558 +#: apt.conf.5.xml:586 msgid "" "If this option is set apt will call <command>dpkg --configure --pending</" "command> to let dpkg handle all required configurations and triggers. This " @@ -5222,12 +5279,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:564 +#: apt.conf.5.xml:592 msgid "DPkg::TriggersPending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:565 +#: apt.conf.5.xml:593 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@ -5237,12 +5294,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:570 +#: apt.conf.5.xml:598 msgid "PackageManager::UnpackAll" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:571 +#: apt.conf.5.xml:599 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-" @@ -5254,12 +5311,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:578 +#: apt.conf.5.xml:606 msgid "OrderList::Score::Immediate" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:586 +#: apt.conf.5.xml:614 #, no-wrap msgid "" "OrderList::Score {\n" @@ -5271,7 +5328,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:579 +#: apt.conf.5.xml:607 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 " @@ -5285,12 +5342,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:599 +#: apt.conf.5.xml:627 msgid "Periodic and Archives options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:600 +#: apt.conf.5.xml:628 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@ -5299,12 +5356,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:608 +#: apt.conf.5.xml:636 msgid "Debug options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:610 +#: apt.conf.5.xml:638 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -5315,7 +5372,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:621 +#: apt.conf.5.xml:649 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@ -5323,7 +5380,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:629 +#: apt.conf.5.xml:657 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@ -5331,7 +5388,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:638 +#: apt.conf.5.xml:666 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -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:646 +#: apt.conf.5.xml:674 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:656 +#: apt.conf.5.xml:684 msgid "A full list of debugging options to apt follows." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:661 +#: apt.conf.5.xml:689 #, 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:665 +#: apt.conf.5.xml:693 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:672 +#: apt.conf.5.xml:700 #, 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:676 +#: apt.conf.5.xml:704 msgid "Print information related to downloading packages using FTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:683 +#: apt.conf.5.xml:711 #, 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:687 +#: apt.conf.5.xml:715 msgid "Print information related to downloading packages using HTTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:694 +#: apt.conf.5.xml:722 #, 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:698 +#: apt.conf.5.xml:726 msgid "Print information related to downloading packages using HTTPS." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:705 +#: apt.conf.5.xml:733 #, 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:709 +#: apt.conf.5.xml:737 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:716 +#: apt.conf.5.xml:744 #, 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:720 +#: apt.conf.5.xml:748 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:727 +#: apt.conf.5.xml:755 #, 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:730 +#: apt.conf.5.xml:758 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:737 +#: apt.conf.5.xml:765 #, 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:740 +#: apt.conf.5.xml:768 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:747 +#: apt.conf.5.xml:775 #, 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:750 +#: apt.conf.5.xml:778 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 " @@ -5462,99 +5519,99 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:758 +#: apt.conf.5.xml:786 #, 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:761 +#: apt.conf.5.xml:789 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:769 +#: apt.conf.5.xml:797 #, 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:773 +#: apt.conf.5.xml:801 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:780 +#: apt.conf.5.xml:808 #, 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:783 +#: apt.conf.5.xml:811 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:790 +#: apt.conf.5.xml:818 #, 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:793 +#: apt.conf.5.xml:821 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:801 +#: apt.conf.5.xml:829 #, 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:805 +#: apt.conf.5.xml:833 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:812 +#: apt.conf.5.xml:840 #, 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:816 +#: apt.conf.5.xml:844 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:823 +#: apt.conf.5.xml:851 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:827 +#: apt.conf.5.xml:855 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:834 +#: apt.conf.5.xml:862 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:837 +#: apt.conf.5.xml:865 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@ -5564,12 +5621,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:848 +#: apt.conf.5.xml:876 msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:851 +#: apt.conf.5.xml:879 msgid "" "Generate debug messages describing which package is marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@ -5586,96 +5643,96 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:870 +#: apt.conf.5.xml:898 #, 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:873 +#: apt.conf.5.xml:901 msgid "Dump the default configuration to standard error on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:880 +#: apt.conf.5.xml:908 #, 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:883 +#: apt.conf.5.xml:911 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:891 +#: apt.conf.5.xml:919 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:894 +#: apt.conf.5.xml:922 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:901 +#: apt.conf.5.xml:929 #, 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:905 +#: apt.conf.5.xml:933 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:913 +#: apt.conf.5.xml:941 #, 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:917 +#: apt.conf.5.xml:945 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:924 +#: apt.conf.5.xml:952 #, 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:928 +#: apt.conf.5.xml:956 msgid "Output the priority of each package list on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:934 +#: apt.conf.5.xml:962 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:938 +#: apt.conf.5.xml:966 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:946 +#: apt.conf.5.xml:974 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:949 +#: apt.conf.5.xml:977 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 " @@ -5683,33 +5740,33 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:957 +#: apt.conf.5.xml:985 #, 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:961 +#: apt.conf.5.xml:989 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:983 +#: apt.conf.5.xml:1012 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt.conf.5.xml:990 +#: apt.conf.5.xml:1019 msgid "&file-aptconf;" msgstr "" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:995 +#: apt.conf.5.xml:1024 #, fuzzy msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;" -- cgit v1.2.3-70-g09d2 From acdd8da1f53c69e8d3a8e3c8430470752aa3df3a Mon Sep 17 00:00:00 2001 From: Michael Vogt <michael.vogt@ubuntu.com> Date: Thu, 10 Dec 2009 23:28:57 +0100 Subject: * apt-pkg/init.h: - add compatibilty with old ABI name until the next ABI break --- apt-pkg/init.h | 4 +++- debian/changelog | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/apt-pkg/init.h b/apt-pkg/init.h index f0757f644..dde4cf679 100644 --- a/apt-pkg/init.h +++ b/apt-pkg/init.h @@ -21,7 +21,9 @@ // reverse-dependencies of libapt-pkg against the new SONAME. // Non-ABI-Breaks should only increase RELEASE number. // See also buildlib/libversion.mak -#define APT_PKG_MAJOR 4 +// FIXME: this needs to be changed to "4" (without quotes) on the next +// ABI break +#define APT_PKG_MAJOR libc6.10-6-4 #define APT_PKG_MINOR 8 #define APT_PKG_RELEASE 0 diff --git a/debian/changelog b/debian/changelog index 1f4fa38b8..64e676709 100644 --- a/debian/changelog +++ b/debian/changelog @@ -36,6 +36,8 @@ apt (0.7.25) UNRELEASED; urgency=low (thanks also to Jussi Hakala and Julian Andres Klode) * apt-pkg/deb/dpkgpm.cc: - add "purge" to list of known actions + * apt-pkg/init.h: + - add compatibilty with old ABI name until the next ABI break [ Brian Murray ] * apt-pkg/depcache.cc, apt-pkg/indexcopy.cc: -- cgit v1.2.3-70-g09d2 From 30fa74369085863842efed5e86054dd3a1d7b05a Mon Sep 17 00:00:00 2001 From: Michael Vogt <mvo@debian.org> Date: Thu, 10 Dec 2009 23:48:04 +0100 Subject: * apt-pkg/init.h: - add compatibilty with old ABI name until the next ABI break --- apt-pkg/init.h | 4 +++- debian/changelog | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/apt-pkg/init.h b/apt-pkg/init.h index f0757f644..f892e7ff4 100644 --- a/apt-pkg/init.h +++ b/apt-pkg/init.h @@ -21,7 +21,9 @@ // reverse-dependencies of libapt-pkg against the new SONAME. // Non-ABI-Breaks should only increase RELEASE number. // See also buildlib/libversion.mak -#define APT_PKG_MAJOR 4 +// FIXME: this needs to be changed to "4" (without quotes) on the next +// ABI break +#define APT_PKG_MAJOR libc6.9-6-4 #define APT_PKG_MINOR 8 #define APT_PKG_RELEASE 0 diff --git a/debian/changelog b/debian/changelog index 1f4fa38b8..64e676709 100644 --- a/debian/changelog +++ b/debian/changelog @@ -36,6 +36,8 @@ apt (0.7.25) UNRELEASED; urgency=low (thanks also to Jussi Hakala and Julian Andres Klode) * apt-pkg/deb/dpkgpm.cc: - add "purge" to list of known actions + * apt-pkg/init.h: + - add compatibilty with old ABI name until the next ABI break [ Brian Murray ] * apt-pkg/depcache.cc, apt-pkg/indexcopy.cc: -- cgit v1.2.3-70-g09d2 From bb1293d975294884a95b9cb298432c9cf9ecc995 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Fri, 11 Dec 2009 00:23:18 +0100 Subject: Backport rred patches from my own sid branch to the 0.7.25 branch * rewrite and refactor rred method to be able to handle even big (>30 MB) patches (Closes: #554349) and hardening the method itself by using more constants and a return value which can't be misinterpreted as linenumber * Finally adope the patch from Morten Hustveit <morten@debian.org> to be able to optional use mmaps and iovec to increase patch speed - but as this increase memory usage we can always fall back to the "old" method which doesn't depend on mmaps. --- debian/changelog | 4 + methods/rred.cc | 648 +++++++++++++++++++++++++++++++++++++++---------------- 2 files changed, 468 insertions(+), 184 deletions(-) diff --git a/debian/changelog b/debian/changelog index 64e676709..c54fb431b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -90,6 +90,10 @@ apt (0.7.25) UNRELEASED; urgency=low - add APT::FTPArchive::LongDescription to be able to disable them * apt-pkg/deb/debsrcrecords.cc: - use "diff" filetype for .debian.tar.* files (Closes: #554898) + * 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! [ Chris Leick ] * doc/ various manpages: diff --git a/methods/rred.cc b/methods/rred.cc index 27d95bdde..262c78cab 100644 --- a/methods/rred.cc +++ b/methods/rred.cc @@ -1,202 +1,443 @@ +// Includes /*{{{*/ #include <apt-pkg/fileutl.h> +#include <apt-pkg/mmap.h> #include <apt-pkg/error.h> #include <apt-pkg/acquire-method.h> #include <apt-pkg/strutl.h> #include <apt-pkg/hashes.h> #include <sys/stat.h> +#include <sys/uio.h> #include <unistd.h> #include <utime.h> #include <stdio.h> #include <errno.h> #include <apti18n.h> - -/* this method implements a patch functionality similar to "patch --ed" that is - * used by the "tiffany" incremental packages download stuff. it differs from - * "ed" insofar that it is way more restricted (and therefore secure). in the - * moment only the "c", "a" and "d" commands of ed are implemented (diff - * doesn't output any other). additionally the records must be reverse sorted - * by line number and may not overlap (diff *seems* to produce this kind of - * output). + /*}}}*/ +/** \brief RredMethod - ed-style incremential patch method {{{ + * + * This method implements a patch functionality similar to "patch --ed" that is + * used by the "tiffany" incremental packages download stuff. It differs from + * "ed" insofar that it is way more restricted (and therefore secure). + * The currently supported ed commands are "<em>c</em>hange", "<em>a</em>dd" and + * "<em>d</em>elete" (diff doesn't output any other). + * Additionally the records must be reverse sorted by line number and + * may not overlap (diff *seems* to produce this kind of output). * */ +class RredMethod : public pkgAcqMethod { + bool Debug; + // the size of this doesn't really matter (except for performance) + const static int BUF_SIZE = 1024; + // the supported ed commands + enum Mode {MODE_CHANGED='c', MODE_DELETED='d', MODE_ADDED='a'}; + // return values + enum State {ED_OK, ED_ORDERING, ED_PARSER, ED_FAILURE, MMAP_FAILED}; -const char *Prog; + State applyFile(FILE *ed_cmds, FILE *in_file, FILE *out_file, + unsigned long &line, char *buffer, Hashes *hash) const; + void ignoreLineInFile(FILE *fin, char *buffer) const; + void copyLinesFromFileToFile(FILE *fin, FILE *fout, unsigned int lines, + Hashes *hash, char *buffer) const; -class RredMethod : public pkgAcqMethod -{ - bool Debug; - // the size of this doesn't really matter (except for performance) - const static int BUF_SIZE = 1024; - // the ed commands - enum Mode {MODE_CHANGED, MODE_DELETED, MODE_ADDED}; - // return values - enum State {ED_OK, ED_ORDERING, ED_PARSER, ED_FAILURE}; - // this applies a single hunk, it uses a tail recursion to - // reverse the hunks in the file - int ed_rec(FILE *ed_cmds, FILE *in_file, FILE *out_file, int line, - char *buffer, unsigned int bufsize, Hashes *hash); - // apply a patch file - int ed_file(FILE *ed_cmds, FILE *in_file, FILE *out_file, Hashes *hash); - // the methods main method - virtual bool Fetch(FetchItem *Itm); - - public: - - RredMethod() : pkgAcqMethod("1.1",SingleInstance | SendConfig) {}; + State patchFile(FileFd &Patch, FileFd &From, FileFd &out_file, Hashes *hash) const; + State patchMMap(FileFd &Patch, FileFd &From, FileFd &out_file, Hashes *hash) const; + +protected: + // the methods main method + virtual bool Fetch(FetchItem *Itm); + +public: + RredMethod() : pkgAcqMethod("1.1",SingleInstance | SendConfig) {}; }; + /*}}}*/ +/** \brief applyFile - in reverse order with a tail recursion {{{ + * + * As it is expected that the commands are in reversed order in the patch file + * we check in the first half if the command is valid, but doesn't execute it + * and move a step deeper. After reaching the end of the file we apply the + * patches in the correct order: last found command first. + * + * \param ed_cmds patch file to apply + * \param in_file base file we want to patch + * \param out_file file to write the patched result to + * \param line of command operation + * \param buffer internal used read/write buffer + * \param hash the created file for correctness + * \return the success State of the ed command executor + */ +RredMethod::State RredMethod::applyFile(FILE *ed_cmds, FILE *in_file, FILE *out_file, + unsigned long &line, char *buffer, Hashes *hash) const { + // get the current command and parse it + if (fgets(buffer, BUF_SIZE, ed_cmds) == NULL) { + if (Debug == true) + std::clog << "rred: encounter end of file - we can start patching now." << std::endl; + line = 0; + return ED_OK; + } -int RredMethod::ed_rec(FILE *ed_cmds, FILE *in_file, FILE *out_file, int line, - char *buffer, unsigned int bufsize, Hashes *hash) { - int pos; - int startline; - int stopline; - int mode; - int written; - char *idx; - - /* get the current command and parse it*/ - if (fgets(buffer, bufsize, ed_cmds) == NULL) { - return line; - } - startline = strtol(buffer, &idx, 10); - if (startline < line) { - return ED_ORDERING; - } - if (*idx == ',') { - idx++; - stopline = strtol(idx, &idx, 10); - } - else { - stopline = startline; - } - if (*idx == 'c') { - mode = MODE_CHANGED; - if (Debug == true) { - std::clog << "changing from line " << startline - << " to " << stopline << std::endl; - } - } - else if (*idx == 'a') { - mode = MODE_ADDED; - if (Debug == true) { - std::clog << "adding after line " << startline << std::endl; - } - } - else if (*idx == 'd') { - mode = MODE_DELETED; - if (Debug == true) { - std::clog << "deleting from line " << startline - << " to " << stopline << std::endl; - } - } - else { - return ED_PARSER; - } - /* get the current position */ - pos = ftell(ed_cmds); - /* if this is add or change then go to the next full stop */ - if ((mode == MODE_CHANGED) || (mode == MODE_ADDED)) { - do { - fgets(buffer, bufsize, ed_cmds); - while ((strlen(buffer) == (bufsize - 1)) - && (buffer[bufsize - 2] != '\n')) { - fgets(buffer, bufsize, ed_cmds); - buffer[0] = ' '; - } - } while (strncmp(buffer, ".", 1) != 0); - } - /* do the recursive call */ - line = ed_rec(ed_cmds, in_file, out_file, line, buffer, bufsize, - hash); - /* pass on errors */ - if (line < 0) { - return line; - } - /* apply our hunk */ - fseek(ed_cmds, pos, SEEK_SET); - /* first wind to the current position */ - if (mode != MODE_ADDED) { - startline -= 1; - } - while (line < startline) { - fgets(buffer, bufsize, in_file); - written = fwrite(buffer, 1, strlen(buffer), out_file); - hash->Add((unsigned char*)buffer, written); - while ((strlen(buffer) == (bufsize - 1)) - && (buffer[bufsize - 2] != '\n')) { - fgets(buffer, bufsize, in_file); - written = fwrite(buffer, 1, strlen(buffer), out_file); - hash->Add((unsigned char*)buffer, written); - } - line++; - } - /* include from ed script */ - if ((mode == MODE_ADDED) || (mode == MODE_CHANGED)) { - do { - fgets(buffer, bufsize, ed_cmds); - if (strncmp(buffer, ".", 1) != 0) { - written = fwrite(buffer, 1, strlen(buffer), out_file); - hash->Add((unsigned char*)buffer, written); - while ((strlen(buffer) == (bufsize - 1)) - && (buffer[bufsize - 2] != '\n')) { - fgets(buffer, bufsize, ed_cmds); - written = fwrite(buffer, 1, strlen(buffer), out_file); - hash->Add((unsigned char*)buffer, written); - } - } - else { - break; - } - } while (1); - } - /* ignore the corresponding number of lines from input */ - if ((mode == MODE_DELETED) || (mode == MODE_CHANGED)) { - while (line < stopline) { - fgets(buffer, bufsize, in_file); - while ((strlen(buffer) == (bufsize - 1)) - && (buffer[bufsize - 2] != '\n')) { - fgets(buffer, bufsize, in_file); - } - line++; - } - } - return line; -} + // parse in the effected linenumbers + char* idx; + errno=0; + unsigned long const startline = strtol(buffer, &idx, 10); + if (errno == ERANGE || errno == EINVAL) { + _error->Errno("rred", "startline is an invalid number"); + return ED_PARSER; + } + if (startline > line) { + _error->Error("rred: The start line (%lu) of the next command is higher than the last line (%lu). This is not allowed.", startline, line); + return ED_ORDERING; + } + unsigned long stopline; + if (*idx == ',') { + idx++; + errno=0; + stopline = strtol(idx, &idx, 10); + if (errno == ERANGE || errno == EINVAL) { + _error->Errno("rred", "stopline is an invalid number"); + return ED_PARSER; + } + } + else { + stopline = startline; + } + line = startline; + + // which command to execute on this line(s)? + switch (*idx) { + case MODE_CHANGED: + if (Debug == true) + std::clog << "Change from line " << startline << " to " << stopline << std::endl; + break; + case MODE_ADDED: + if (Debug == true) + std::clog << "Insert after line " << startline << std::endl; + break; + case MODE_DELETED: + if (Debug == true) + std::clog << "Delete from line " << startline << " to " << stopline << std::endl; + break; + default: + _error->Error("rred: Unknown ed command '%c'. Abort.", *idx); + return ED_PARSER; + } + unsigned char mode = *idx; + + // save the current position + unsigned const long pos = ftell(ed_cmds); + + // if this is add or change then go to the next full stop + unsigned int data_length = 0; + if (mode == MODE_CHANGED || mode == MODE_ADDED) { + do { + ignoreLineInFile(ed_cmds, buffer); + data_length++; + } + while (strncmp(buffer, ".", 1) != 0); + data_length--; // the dot should not be copied + } + + // do the recursive call - the last command is the one we need to execute at first + const State child = applyFile(ed_cmds, in_file, out_file, line, buffer, hash); + if (child != ED_OK) { + return child; + } + + // change and delete are working on "line" - add is done after "line" + if (mode != MODE_ADDED) + line++; + + // first wind to the current position and copy over all unchanged lines + if (line < startline) { + copyLinesFromFileToFile(in_file, out_file, (startline - line), hash, buffer); + line = startline; + } -int RredMethod::ed_file(FILE *ed_cmds, FILE *in_file, FILE *out_file, - Hashes *hash) { + if (mode != MODE_ADDED) + line--; + + // include data from ed script + if (mode == MODE_CHANGED || mode == MODE_ADDED) { + fseek(ed_cmds, pos, SEEK_SET); + copyLinesFromFileToFile(ed_cmds, out_file, data_length, hash, buffer); + } + + // ignore the corresponding number of lines from input + if (mode == MODE_CHANGED || mode == MODE_DELETED) { + while (line < stopline) { + ignoreLineInFile(in_file, buffer); + line++; + } + } + return ED_OK; +} + /*}}}*/ +void RredMethod::copyLinesFromFileToFile(FILE *fin, FILE *fout, unsigned int lines,/*{{{*/ + Hashes *hash, char *buffer) const { + while (0 < lines--) { + do { + fgets(buffer, BUF_SIZE, fin); + size_t const written = fwrite(buffer, 1, strlen(buffer), fout); + hash->Add((unsigned char*)buffer, written); + } while (strlen(buffer) == (BUF_SIZE - 1) && + buffer[BUF_SIZE - 2] != '\n'); + } +} + /*}}}*/ +void RredMethod::ignoreLineInFile(FILE *fin, char *buffer) const { /*{{{*/ + fgets(buffer, BUF_SIZE, fin); + while (strlen(buffer) == (BUF_SIZE - 1) && + buffer[BUF_SIZE - 2] != '\n') { + fgets(buffer, BUF_SIZE, fin); + buffer[0] = ' '; + } +} + /*}}}*/ +RredMethod::State RredMethod::patchFile(FileFd &Patch, FileFd &From, /*{{{*/ + FileFd &out_file, Hashes *hash) const { char buffer[BUF_SIZE]; - int result; - int written; - + FILE* fFrom = fdopen(From.Fd(), "r"); + FILE* fPatch = fdopen(Patch.Fd(), "r"); + FILE* fTo = fdopen(out_file.Fd(), "w"); + /* we do a tail recursion to read the commands in the right order */ - result = ed_rec(ed_cmds, in_file, out_file, 0, buffer, BUF_SIZE, - hash); + unsigned long line = -1; // assign highest possible value + State const result = applyFile(fPatch, fFrom, fTo, line, buffer, hash); /* read the rest from infile */ - if (result >= 0) { - while (fgets(buffer, BUF_SIZE, in_file) != NULL) { - written = fwrite(buffer, 1, strlen(buffer), out_file); + if (result == ED_OK) { + while (fgets(buffer, BUF_SIZE, fFrom) != NULL) { + size_t const written = fwrite(buffer, 1, strlen(buffer), fTo); hash->Add((unsigned char*)buffer, written); } + fflush(fTo); } - else { - return ED_FAILURE; - } - return ED_OK; + return result; } + /*}}}*/ +struct EdCommand { /*{{{*/ + size_t data_start; + size_t data_end; + size_t data_lines; + size_t first_line; + size_t last_line; + char type; +}; +#define IOV_COUNT 1024 /* Don't really want IOV_MAX since it can be arbitrarily large */ + /*}}}*/ +RredMethod::State RredMethod::patchMMap(FileFd &Patch, FileFd &From, /*{{{*/ + FileFd &out_file, Hashes *hash) const { +#ifdef _POSIX_MAPPED_FILES + MMap ed_cmds(Patch, MMap::ReadOnly); + MMap in_file(From, MMap::ReadOnly); + + if (ed_cmds.Size() == 0 || in_file.Size() == 0) + return MMAP_FAILED; + + EdCommand* commands = 0; + size_t command_count = 0; + size_t command_alloc = 0; + + const char* begin = (char*) ed_cmds.Data(); + const char* end = begin; + const char* ed_end = (char*) ed_cmds.Data() + ed_cmds.Size(); + + const char* input = (char*) in_file.Data(); + const char* input_end = (char*) in_file.Data() + in_file.Size(); + + size_t i; + + /* 1. Parse entire script. It is executed in reverse order, so we cather it + * in the `commands' buffer first + */ + + for(;;) { + EdCommand cmd; + cmd.data_start = 0; + cmd.data_end = 0; + + while(begin != ed_end && *begin == '\n') + ++begin; + while(end != ed_end && *end != '\n') + ++end; + if(end == ed_end && begin == end) + break; + + /* Determine command range */ + const char* tmp = begin; + + for(;;) { + /* atoll is safe despite lacking NUL-termination; we know there's an + * alphabetic character at end[-1] + */ + if(tmp == end) { + cmd.first_line = atol(begin); + cmd.last_line = cmd.first_line; + break; + } + if(*tmp == ',') { + cmd.first_line = atol(begin); + cmd.last_line = atol(tmp + 1); + break; + } + ++tmp; + } + + // which command to execute on this line(s)? + switch (end[-1]) { + case MODE_CHANGED: + if (Debug == true) + std::clog << "Change from line " << cmd.first_line << " to " << cmd.last_line << std::endl; + break; + case MODE_ADDED: + if (Debug == true) + std::clog << "Insert after line " << cmd.first_line << std::endl; + break; + case MODE_DELETED: + if (Debug == true) + std::clog << "Delete from line " << cmd.first_line << " to " << cmd.last_line << std::endl; + break; + default: + _error->Error("rred: Unknown ed command '%c'. Abort.", end[-1]); + free(commands); + return ED_PARSER; + } + cmd.type = end[-1]; + + /* Determine the size of the inserted text, so we don't have to scan this + * text again later. + */ + begin = end + 1; + end = begin; + cmd.data_lines = 0; + + if(cmd.type == MODE_ADDED || cmd.type == MODE_CHANGED) { + cmd.data_start = begin - (char*) ed_cmds.Data(); + while(end != ed_end) { + if(*end == '\n') { + if(end[-1] == '.' && end[-2] == '\n') + break; + ++cmd.data_lines; + } + ++end; + } + cmd.data_end = end - (char*) ed_cmds.Data() - 1; + begin = end + 1; + end = begin; + } + if(command_count == command_alloc) { + command_alloc = (command_alloc + 64) * 3 / 2; + commands = (EdCommand*) realloc(commands, command_alloc * sizeof(EdCommand)); + } + commands[command_count++] = cmd; + } + + struct iovec* iov = new struct iovec[IOV_COUNT]; + size_t iov_size = 0; + + size_t amount, remaining; + size_t line = 1; + EdCommand* cmd; + + /* 2. Execute script. We gather writes in a `struct iov' array, and flush + * using writev to minimize the number of system calls. Data is read + * directly from the memory mappings of the input file and the script. + */ + + for(i = command_count; i-- > 0; ) { + cmd = &commands[i]; + if(cmd->type == MODE_ADDED) + amount = cmd->first_line + 1; + else + amount = cmd->first_line; + + if(line < amount) { + begin = input; + while(line != amount) { + input = (const char*) memchr(input, '\n', input_end - input); + if(!input) + break; + ++line; + ++input; + } + iov[iov_size].iov_base = (void*) begin; + iov[iov_size].iov_len = input - begin; + hash->Add((const unsigned char*) begin, input - begin); -bool RredMethod::Fetch(FetchItem *Itm) + if(++iov_size == IOV_COUNT) { + writev(out_file.Fd(), iov, IOV_COUNT); + iov_size = 0; + } + } + + if(cmd->type == MODE_DELETED || cmd->type == MODE_CHANGED) { + remaining = (cmd->last_line - cmd->first_line) + 1; + line += remaining; + while(remaining) { + input = (const char*) memchr(input, '\n', input_end - input); + if(!input) + break; + --remaining; + ++input; + } + } + + if(cmd->type == MODE_CHANGED || cmd->type == MODE_ADDED) { + if(cmd->data_end != cmd->data_start) { + iov[iov_size].iov_base = (void*) ((char*)ed_cmds.Data() + cmd->data_start); + iov[iov_size].iov_len = cmd->data_end - cmd->data_start; + hash->Add((const unsigned char*) ((char*)ed_cmds.Data() + cmd->data_start), + iov[iov_size].iov_len); + + if(++iov_size == IOV_COUNT) { + writev(out_file.Fd(), iov, IOV_COUNT); + iov_size = 0; + } + } + } + } + + if(input != input_end) { + iov[iov_size].iov_base = (void*) input; + iov[iov_size].iov_len = input_end - input; + hash->Add((const unsigned char*) input, input_end - input); + ++iov_size; + } + + if(iov_size) { + writev(out_file.Fd(), iov, iov_size); + iov_size = 0; + } + + for(i = 0; i < iov_size; i += IOV_COUNT) { + if(iov_size - i < IOV_COUNT) + writev(out_file.Fd(), iov + i, iov_size - i); + else + writev(out_file.Fd(), iov + i, IOV_COUNT); + } + + delete [] iov; + free(commands); + + return ED_OK; +#else + return MMAP_FAILED; +#endif +} + /*}}}*/ +bool RredMethod::Fetch(FetchItem *Itm) /*{{{*/ { - Debug = _config->FindB("Debug::pkgAcquire::RRed",false); + Debug = _config->FindB("Debug::pkgAcquire::RRed", false); URI Get = Itm->Uri; string Path = Get.Host + Get.Path; // To account for relative paths - // Path contains the filename to patch + FetchResult Res; Res.Filename = Itm->DestFile; - URIStart(Res); - // Res.Filename the destination filename + if (Itm->Uri.empty() == true) { + Path = Itm->DestFile; + Itm->DestFile.append(".result"); + } else + URIStart(Res); if (Debug == true) std::clog << "Patching " << Path << " with " << Path @@ -211,19 +452,27 @@ bool RredMethod::Fetch(FetchItem *Itm) return false; Hashes Hash; - FILE* fFrom = fdopen(From.Fd(), "r"); - FILE* fPatch = fdopen(Patch.Fd(), "r"); - FILE* fTo = fdopen(To.Fd(), "w"); // now do the actual patching - if (ed_file(fPatch, fFrom, fTo, &Hash) != ED_OK) { - _error->Errno("rred", _("Could not patch file")); - return false; + State const result = patchMMap(Patch, From, To, &Hash); + if (result == MMAP_FAILED) { + // retry with patchFile + lseek(Patch.Fd(), 0, SEEK_SET); + lseek(From.Fd(), 0, SEEK_SET); + To.Open(Itm->DestFile,FileFd::WriteEmpty); + if (_error->PendingError() == true) + return false; + if (patchFile(Patch, From, To, &Hash) != ED_OK) { + return _error->WarningE("rred", _("Could not patch %s with mmap and with file operation usage - the patch seems to be corrupt."), Path.c_str()); + } else if (Debug == true) { + std::clog << "rred: finished file patching of " << Path << " after mmap failed." << std::endl; + } + } else if (result != ED_OK) { + return _error->Errno("rred", _("Could not patch %s with mmap (but no mmap specific fail) - the patch seems to be corrupt."), Path.c_str()); + } else if (Debug == true) { + std::clog << "rred: finished mmap patching of " << Path << std::endl; } // write out the result - fflush(fFrom); - fflush(fPatch); - fflush(fTo); From.Close(); Patch.Close(); To.Close(); @@ -250,13 +499,44 @@ bool RredMethod::Fetch(FetchItem *Itm) return true; } - -int main(int argc, char *argv[]) -{ - RredMethod Mth; - - Prog = strrchr(argv[0],'/'); - Prog++; - - return Mth.Run(); + /*}}}*/ +/** \brief Wrapper class for testing rred */ /*{{{*/ +class TestRredMethod : public RredMethod { +public: + /** \brief Run rred in debug test mode + * + * This method can be used to run the rred method outside + * of the "normal" acquire environment for easier testing. + * + * \param base basename of all files involved in this rred test + */ + bool Run(char const *base) { + _config->CndSet("Debug::pkgAcquire::RRed", "true"); + FetchItem *test = new FetchItem; + test->DestFile = base; + return Fetch(test); + } +}; + /*}}}*/ +/** \brief Starter for the rred method (or its test method) {{{ + * + * Used without parameters is the normal behavior for methods for + * the APT acquire system. While this works great for the acquire system + * it is very hard to test the method and therefore the method also + * accepts one parameter which will switch it directly to debug test mode: + * The test mode expects that if "Testfile" is given as parameter + * the file "Testfile" should be ed-style patched with "Testfile.ed" + * and will write the result to "Testfile.result". + */ +int main(int argc, char *argv[]) { + if (argc <= 1) { + RredMethod Mth; + return Mth.Run(); + } else { + TestRredMethod Mth; + bool result = Mth.Run(argv[1]); + _error->DumpErrors(); + return result; + } } + /*}}}*/ -- cgit v1.2.3-70-g09d2 From 9f542bae2b3620887345ebc3e61970f8903123a0 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Fri, 11 Dec 2009 00:32:01 +0100 Subject: add config setting for User-Agent in http and https to the Acquire group, thanks Timothy J. Miller! (Closes: #355782) --- debian/changelog | 3 +++ doc/apt.conf.5.xml | 7 ++++++- doc/examples/configure-index | 3 +++ methods/http.cc | 3 ++- methods/https.cc | 5 ++++- 5 files changed, 18 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index c54fb431b..0cfd36c00 100644 --- a/debian/changelog +++ b/debian/changelog @@ -94,6 +94,9 @@ apt (0.7.25) UNRELEASED; urgency=low - 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! + * methods/http{,s}.cc + - add config setting for User-Agent to the Acquire group, + thanks Timothy J. Miller! (Closes: #355782) [ Chris Leick ] * doc/ various manpages: diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index e2db9defb..726bca2cc 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -275,7 +275,12 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; <para>The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</literal> which accepts integer values in kilobyte. The default value is 0 which deactivates the limit and tries uses as much as possible of the bandwidth (Note that this option implicit - deactivates the download from multiple servers at the same time.)</para></listitem> + deactivates the download from multiple servers at the same time.)</para> + + <para><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.</para> + </listitem> </varlistentry> <varlistentry><term>https</term> diff --git a/doc/examples/configure-index b/doc/examples/configure-index index f5f996460..333c8df7e 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -191,6 +191,7 @@ Acquire Max-Age "86400"; // 1 Day age on index files No-Store "false"; // Prevent the cache from storing archives Dl-Limit "7"; // 7Kb/sec maximum download rate + User-Agent "Debian APT-HTTP/1.3"; }; // HTTPS method configuration: @@ -204,6 +205,8 @@ Acquire CaPath "/etc/ssl/certs"; Verify-Host" "true"; AllowRedirect "true"; + + User-Agent "Debian APT-CURL/1.0"; }; ftp diff --git a/methods/http.cc b/methods/http.cc index 3b210f6b6..2dae87a02 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -731,7 +731,8 @@ void HttpMethod::SendReq(FetchItem *Itm,CircleBuf &Out) Req += string("Authorization: Basic ") + Base64Encode(Uri.User + ":" + Uri.Password) + "\r\n"; } - Req += "User-Agent: Debian APT-HTTP/1.3 ("VERSION")\r\n\r\n"; + Req += "User-Agent: " + _config->Find("Acquire::http::User-Agent", + "Debian APT-HTTP/1.3 ("VERSION")") + "\r\n\r\n"; if (Debug == true) cerr << Req << endl; diff --git a/methods/https.cc b/methods/https.cc index 86d7f3a6b..a4f39c379 100644 --- a/methods/https.cc +++ b/methods/https.cc @@ -211,7 +211,10 @@ bool HttpsMethod::Fetch(FetchItem *Itm) curl_easy_setopt(curl, CURLOPT_MAX_RECV_SPEED_LARGE, dlLimit); // set header - curl_easy_setopt(curl, CURLOPT_USERAGENT,"Debian APT-CURL/1.0 ("VERSION")"); + curl_easy_setopt(curl, CURLOPT_USERAGENT, + _config->Find("Acquire::https::User-Agent", + _config->Find("Acquire::http::User-Agent", + "Debian APT-CURL/1.0 ("VERSION")"))); // set timeout int timeout = _config->FindI("Acquire::http::Timeout",120); -- cgit v1.2.3-70-g09d2 From b9e9a44b3377cae2fb9aca3210f379ae1cb802ba Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Fri, 11 Dec 2009 00:38:13 +0100 Subject: add https options which default to the ones from http for the https method as this is more sane than using only the http options without a possibility to override these for https. --- debian/changelog | 2 + doc/apt.conf.5.xml | 8 ++-- doc/examples/configure-index | 33 ++++++++++---- methods/https.cc | 100 +++++++++++++++++++------------------------ 4 files changed, 76 insertions(+), 67 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0cfd36c00..e930de0dd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -56,6 +56,7 @@ apt (0.7.25) UNRELEASED; urgency=low * doc/po4a.conf: activate translation of guide.sgml and offline.sgml * doc/apt.conf.5.xml: - provide a few more details about APT::Immediate-Configure + - briefly document the behaviour of the new https options * doc/sources.list.5.xml: - add note about additional apt-transport-methods * doc/apt-mark.8.xml: @@ -97,6 +98,7 @@ apt (0.7.25) UNRELEASED; urgency=low * methods/http{,s}.cc - add config setting for User-Agent to the Acquire group, thanks Timothy J. Miller! (Closes: #355782) + - add https options which default to http ones (Closes: #557085) [ Chris Leick ] * doc/ various manpages: diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index 726bca2cc..d7ad51cfb 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -284,9 +284,11 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; </varlistentry> <varlistentry><term>https</term> - <listitem><para>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.</para> + <listitem><para>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.</para> <para><literal>CaInfo</literal> suboption specifies place of file that holds info about trusted certificates. diff --git a/doc/examples/configure-index b/doc/examples/configure-index index 333c8df7e..ced390447 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -194,19 +194,34 @@ Acquire User-Agent "Debian APT-HTTP/1.3"; }; - // HTTPS method configuration: - // - uses the http proxy config - // - uses the http cache-control values - // - uses the http Dl-Limit values - https + + + // HTTPS method configuration: uses the http + // - proxy config + // - cache-control values + // - Dl-Limit, Timout, ... values + // if not set explicit for https + // + // see /usr/share/doc/apt/examples/apt-https-method-example.conf.gz + // for more examples + https { Verify-Peer "false"; SslCert "/etc/apt/some.pem"; - CaPath "/etc/ssl/certs"; - Verify-Host" "true"; - AllowRedirect "true"; + CaPath "/etc/ssl/certs"; + Verify-Host" "true"; + AllowRedirect "true"; + + Timeout "120"; + AllowRedirect "true"; + + // Cache Control. Note these do not work with Squid 2.0.2 + No-Cache "false"; + Max-Age "86400"; // 1 Day age on index files + No-Store "false"; // Prevent the cache from storing archives + Dl-Limit "7"; // 7Kb/sec maximum download rate - User-Agent "Debian APT-CURL/1.0"; + User-Agent "Debian APT-CURL/1.0"; }; ftp diff --git a/methods/https.cc b/methods/https.cc index a4f39c379..ed1f18150 100644 --- a/methods/https.cc +++ b/methods/https.cc @@ -1,4 +1,4 @@ -// -*- mode: cpp; mode: fold -*- +//-*- mode: cpp; mode: fold -*- // Description /*{{{*/ // $Id: http.cc,v 1.59 2004/05/08 19:42:35 mdz Exp $ /* ###################################################################### @@ -57,54 +57,38 @@ HttpsMethod::progress_callback(void *clientp, double dltotal, double dlnow, return 0; } -void HttpsMethod::SetupProxy() -{ - URI ServerName = Queue->Uri; - - // Determine the proxy setting - string SpecificProxy = _config->Find("Acquire::http::Proxy::" + ServerName.Host); - if (!SpecificProxy.empty()) - { - if (SpecificProxy == "DIRECT") - Proxy = ""; - else - Proxy = SpecificProxy; - } - else - { - string DefProxy = _config->Find("Acquire::http::Proxy"); - if (!DefProxy.empty()) - { - Proxy = DefProxy; - } - else - { - char* result = getenv("http_proxy"); - Proxy = result ? result : ""; - } - } - - // Parse no_proxy, a , separated list of domains - if (getenv("no_proxy") != 0) - { - if (CheckDomainList(ServerName.Host,getenv("no_proxy")) == true) - Proxy = ""; - } - - // Determine what host and port to use based on the proxy settings - string Host; - if (Proxy.empty() == true || Proxy.Host.empty() == true) - { - } - else - { - if (Proxy.Port != 0) - curl_easy_setopt(curl, CURLOPT_PROXYPORT, Proxy.Port); - curl_easy_setopt(curl, CURLOPT_PROXY, Proxy.Host.c_str()); - } -} - - +void HttpsMethod::SetupProxy() { /*{{{*/ + URI ServerName = Queue->Uri; + + // Determine the proxy setting - try https first, fallback to http and use env at last + string UseProxy = _config->Find("Acquire::https::Proxy::" + ServerName.Host, + _config->Find("Acquire::http::Proxy::" + ServerName.Host)); + + if (UseProxy.empty() == true) + UseProxy = _config->Find("Acquire::https::Proxy", _config->Find("Acquire::http::Proxy")); + + // User want to use NO proxy, so nothing to setup + if (UseProxy == "DIRECT") + return; + + if (UseProxy.empty() == false) { + // Parse no_proxy, a comma (,) separated list of domains we don't want to use + // a proxy for so we stop right here if it is in the list + if (getenv("no_proxy") != 0 && CheckDomainList(ServerName.Host,getenv("no_proxy")) == true) + return; + } else { + const char* result = getenv("http_proxy"); + UseProxy = result == NULL ? "" : result; + } + + // Determine what host and port to use based on the proxy settings + if (UseProxy.empty() == false) { + Proxy = UseProxy; + if (Proxy.Port != 1) + curl_easy_setopt(curl, CURLOPT_PROXYPORT, Proxy.Port); + curl_easy_setopt(curl, CURLOPT_PROXY, Proxy.Host.c_str()); + } +} /*}}}*/ // HttpsMethod::Fetch - Fetch an item /*{{{*/ // --------------------------------------------------------------------- /* This adds an item to the pipeline. We keep the pipeline at a fixed @@ -191,12 +175,15 @@ bool HttpsMethod::Fetch(FetchItem *Itm) curl_easy_setopt(curl, CURLOPT_SSLVERSION, final_version); // cache-control - if(_config->FindB("Acquire::http::No-Cache",false) == false) + if(_config->FindB("Acquire::https::No-Cache", + _config->FindB("Acquire::http::No-Cache",false)) == false) { // cache enabled - if (_config->FindB("Acquire::http::No-Store",false) == true) + if (_config->FindB("Acquire::https::No-Store", + _config->FindB("Acquire::http::No-Store",false)) == true) headers = curl_slist_append(headers,"Cache-Control: no-store"); - ioprintf(ss, "Cache-Control: max-age=%u", _config->FindI("Acquire::http::Max-Age",0)); + ioprintf(ss, "Cache-Control: max-age=%u", _config->FindI("Acquire::https::Max-Age", + _config->FindI("Acquire::http::Max-Age",0))); headers = curl_slist_append(headers, ss.str().c_str()); } else { // cache disabled by user @@ -206,7 +193,8 @@ bool HttpsMethod::Fetch(FetchItem *Itm) curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers); // speed limit - int dlLimit = _config->FindI("Acquire::http::Dl-Limit",0)*1024; + int dlLimit = _config->FindI("Acquire::https::Dl-Limit", + _config->FindI("Acquire::http::Dl-Limit",0))*1024; if (dlLimit > 0) curl_easy_setopt(curl, CURLOPT_MAX_RECV_SPEED_LARGE, dlLimit); @@ -217,14 +205,16 @@ bool HttpsMethod::Fetch(FetchItem *Itm) "Debian APT-CURL/1.0 ("VERSION")"))); // set timeout - int timeout = _config->FindI("Acquire::http::Timeout",120); + int timeout = _config->FindI("Acquire::https::Timeout", + _config->FindI("Acquire::http::Timeout",120)); curl_easy_setopt(curl, CURLOPT_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); -- cgit v1.2.3-70-g09d2 From d746ad6e049c472339003396f934e8ee93a0a378 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Fri, 11 Dec 2009 00:42:43 +0100 Subject: add AI_ADDRCONFIG to ai_flags in connect.cc as suggested by Aurelien Jarno in his response to Bernhard R. Link's patch, thanks! (Closes: #505020) --- debian/changelog | 2 ++ methods/connect.cc | 1 + 2 files changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index e930de0dd..b8e435330 100644 --- a/debian/changelog +++ b/debian/changelog @@ -69,6 +69,8 @@ apt (0.7.25) UNRELEASED; urgency=low - add --debian-only as alias for --diff-only * methods/connect.cc: - display also strerror of "wicked" getaddrinfo errors + - add AI_ADDRCONFIG to ai_flags as suggested by Aurelien Jarno + in response to Bernhard R. Link, thanks! (Closes: #505020) * buildlib/configure.mak, buildlib/config.{sub,guess}: - remove (outdated) config.{sub,guess} and use the ones provided by the new added build-dependency autotools-dev instead diff --git a/methods/connect.cc b/methods/connect.cc index 74e670ebd..adb16a199 100644 --- a/methods/connect.cc +++ b/methods/connect.cc @@ -158,6 +158,7 @@ bool Connect(string Host,int Port,const char *Service,int DefPort,int &Fd, struct addrinfo Hints; memset(&Hints,0,sizeof(Hints)); Hints.ai_socktype = SOCK_STREAM; + Hints.ai_flags = AI_ADDRCONFIG; Hints.ai_protocol = 0; // if we couldn't resolve the host before, we don't try now -- cgit v1.2.3-70-g09d2 From 879cbcc8685781ba6f89a9123acd50c794490f2c Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Fri, 11 Dec 2009 00:44:32 +0100 Subject: check cache size even if we do nothing else otherwise in apt.cron.daily, thanks Francesco Poli for patch(s) and patience! (Closes: #459344) --- debian/apt.cron.daily | 6 +++++- debian/changelog | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index b6099ee75..e59b05ee4 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -401,12 +401,16 @@ eval $(apt-config shell BackupArchiveInterval APT::Periodic::BackupArchiveInterv Debdelta=1 eval $(apt-config shell Debdelta APT::Periodic::Download-Upgradeable-Packages-Debdelta) -# check if we actually have to do anything +# check if we actually have to do anything that requires locking the cache if [ $UpdateInterval -eq 0 ] && [ $DownloadUpgradeableInterval -eq 0 ] && [ $UnattendedUpgradeInterval -eq 0 ] && [ $BackupArchiveInterval -eq 0 ] && [ $AutocleanInterval -eq 0 ]; then + + # check cache size + check_size_constraints + exit 0 fi diff --git a/debian/changelog b/debian/changelog index b8e435330..7fa06e02c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -101,6 +101,9 @@ apt (0.7.25) UNRELEASED; urgency=low - add config setting for User-Agent to the Acquire group, thanks Timothy J. Miller! (Closes: #355782) - add https options which default to http ones (Closes: #557085) + * debian/apt.cron.daily: + - check cache size even if we do nothing else otherwise, thanks + Francesco Poli for patch(s) and patience! (Closes: #459344) [ Chris Leick ] * doc/ various manpages: -- cgit v1.2.3-70-g09d2 From ca4907db7c8ec2d409a9ca32aeb2ccb4c3cd40aa Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Fri, 11 Dec 2009 00:48:52 +0100 Subject: fix a few typos in strings, comments and manpage of apt-ftparchive thanks Karl Goetz! (Closes: #558757) --- debian/changelog | 3 +++ doc/apt-ftparchive.1.xml | 2 +- ftparchive/apt-ftparchive.cc | 4 ++-- ftparchive/cachedb.cc | 6 +++--- ftparchive/contents.cc | 2 +- ftparchive/multicompress.cc | 2 +- ftparchive/writer.cc | 2 +- 7 files changed, 12 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7fa06e02c..af68b8ec2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -104,6 +104,9 @@ apt (0.7.25) UNRELEASED; urgency=low * debian/apt.cron.daily: - check cache size even if we do nothing else otherwise, thanks Francesco Poli for patch(s) and patience! (Closes: #459344) + * ftparchive/*: + - fix a few typos in strings, comments and manpage, + thanks Karl Goetz! (Closes: #558757) [ Chris Leick ] * doc/ various manpages: diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml index d47df957a..fb1b10adc 100644 --- a/doc/apt-ftparchive.1.xml +++ b/doc/apt-ftparchive.1.xml @@ -285,7 +285,7 @@ <varlistentry><term>Sources</term> <listitem><para> - Sets the output Packages file. Defaults to + Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/source/Sources</filename></para></listitem> </varlistentry> diff --git a/ftparchive/apt-ftparchive.cc b/ftparchive/apt-ftparchive.cc index d0dea7768..5b6b3940c 100644 --- a/ftparchive/apt-ftparchive.cc +++ b/ftparchive/apt-ftparchive.cc @@ -3,7 +3,7 @@ // $Id: apt-ftparchive.cc,v 1.8.2.3 2004/01/02 22:01:48 mdz Exp $ /* ###################################################################### - apt-scanpackages - Efficient work-alike for dpkg-scanpackages + apt-ftparchive - Efficient work-alike for dpkg-scanpackages Let contents be disabled from the conf @@ -792,7 +792,7 @@ bool Generate(CommandLine &CmdL) if (_config->FindB("APT::FTPArchive::Contents",true) == false) return true; - c1out << "Done Packages, Starting contents." << endl; + c1out << "Packages done, Starting contents." << endl; // Sort the contents file list by date string ArchiveDir = Setup.FindDir("Dir::ArchiveDir"); diff --git a/ftparchive/cachedb.cc b/ftparchive/cachedb.cc index dfda827b6..e02f0e1b6 100644 --- a/ftparchive/cachedb.cc +++ b/ftparchive/cachedb.cc @@ -69,7 +69,7 @@ bool CacheDB::ReadyDB(string DB) // apt 0.6.44 if (err == EINVAL) { - _error->Error(_("DB format is invalid. If you upgraded from a older version of apt, please remove and re-create the database.")); + _error->Error(_("DB format is invalid. If you upgraded from an older version of apt, please remove and re-create the database.")); } if (err) { @@ -83,7 +83,7 @@ bool CacheDB::ReadyDB(string DB) return true; } /*}}}*/ -// CacheDB::OpenFile - Open the filei /*{{{*/ +// CacheDB::OpenFile - Open the file /*{{{*/ // --------------------------------------------------------------------- /* */ bool CacheDB::OpenFile() @@ -139,7 +139,7 @@ bool CacheDB::GetCurStat() if (DBLoaded) { - /* First see if thre is anything about it + /* First see if there is anything about it in the database */ /* Get the flags (and mtime) */ diff --git a/ftparchive/contents.cc b/ftparchive/contents.cc index 1f2cbcc3d..fb1438f74 100644 --- a/ftparchive/contents.cc +++ b/ftparchive/contents.cc @@ -13,7 +13,7 @@ removing the massive sort time overhead. By breaking all the pathnames into components and storing them - separately a space savings is realized by not duplicating the string + separately a space saving is realized by not duplicating the string over and over again. Ultimately this saving is sacrificed to storage of the tree structure itself but the tree structure yields a speed gain in the sorting and processing. Ultimately it takes about 5 seconds to diff --git a/ftparchive/multicompress.cc b/ftparchive/multicompress.cc index 2fc8efcbf..16cef9769 100644 --- a/ftparchive/multicompress.cc +++ b/ftparchive/multicompress.cc @@ -365,7 +365,7 @@ bool MultiCompress::CloseOld(int Fd,pid_t Proc) // MultiCompress::Child - The writer child /*{{{*/ // --------------------------------------------------------------------- /* The child process forks a bunch of compression children and takes - input on FD and passes it to all the compressor childer. On the way it + input on FD and passes it to all the compressor child. On the way it computes the MD5 of the raw data. After this the raw data in the original files is compared to see if this data is new. If the data is new then the temp files are renamed, otherwise they are erased. */ diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc index b2ebdca8a..4e6c9a77d 100644 --- a/ftparchive/writer.cc +++ b/ftparchive/writer.cc @@ -463,7 +463,7 @@ bool PackagesWriter::DoPackage(string FileName) SetTFRewriteData(Changes[End++], "Maintainer", NewMaint.c_str()); /* Get rid of the Optional tag. This is an ugly, ugly, ugly hack that - dpkg-scanpackages does.. Well sort of. dpkg-scanpackages just does renaming + dpkg-scanpackages does. Well sort of. dpkg-scanpackages just does renaming but dpkg does this append bit. So we do the append bit, at least that way the status file and package file will remain similar. There are other transforms but optional is the only legacy one still in use for some lazy reason. */ -- cgit v1.2.3-70-g09d2 From e4c2981b6ecb3c506d8470d4ce39fb8af29339c7 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Fri, 11 Dec 2009 12:45:04 +0100 Subject: fix the backport of the https methods as they would require an ABI break otherwise in the Configuration class. --- methods/https.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/methods/https.cc b/methods/https.cc index ed1f18150..ad21ef0d3 100644 --- a/methods/https.cc +++ b/methods/https.cc @@ -62,10 +62,10 @@ void HttpsMethod::SetupProxy() { /*{{{*/ // 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)); + _config->Find("Acquire::http::Proxy::" + ServerName.Host).c_str()); if (UseProxy.empty() == true) - UseProxy = _config->Find("Acquire::https::Proxy", _config->Find("Acquire::http::Proxy")); + UseProxy = _config->Find("Acquire::https::Proxy", _config->Find("Acquire::http::Proxy").c_str()); // User want to use NO proxy, so nothing to setup if (UseProxy == "DIRECT") @@ -202,7 +202,7 @@ bool HttpsMethod::Fetch(FetchItem *Itm) curl_easy_setopt(curl, CURLOPT_USERAGENT, _config->Find("Acquire::https::User-Agent", _config->Find("Acquire::http::User-Agent", - "Debian APT-CURL/1.0 ("VERSION")"))); + "Debian APT-CURL/1.0 ("VERSION")").c_str()).c_str()); // set timeout int timeout = _config->FindI("Acquire::https::Timeout", -- cgit v1.2.3-70-g09d2 From c0a73937424fa427972835342f12f5fbaa6d0c88 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 12 Dec 2009 01:54:33 +0100 Subject: revert this commit as fast as possible (aka next ABI break) This commit sets up our faked library extension to trick the build system into building the packages with libc6.9-6 while we are actually already at libc6.10-6. Oh dear... --- apt-pkg/init.h | 2 +- buildlib/library.mak | 14 +++++++------- buildlib/libversion.mak | 7 +++++++ debian/rules | 14 +++++++------- 4 files changed, 22 insertions(+), 15 deletions(-) diff --git a/apt-pkg/init.h b/apt-pkg/init.h index dde4cf679..b1ed5922b 100644 --- a/apt-pkg/init.h +++ b/apt-pkg/init.h @@ -23,7 +23,7 @@ // See also buildlib/libversion.mak // FIXME: this needs to be changed to "4" (without quotes) on the next // ABI break -#define APT_PKG_MAJOR libc6.10-6-4 +#define APT_PKG_MAJOR 4 #define APT_PKG_MINOR 8 #define APT_PKG_RELEASE 0 diff --git a/buildlib/library.mak b/buildlib/library.mak index 029e87463..2a4bb782a 100644 --- a/buildlib/library.mak +++ b/buildlib/library.mak @@ -16,11 +16,11 @@ # See defaults.mak for information about LOCAL # Some local definitions -LOCAL := lib$(LIBRARY).so.$(MAJOR).$(MINOR) +LOCAL := lib$(LIBRARY)$(LIBEXT).so.$(MAJOR).$(MINOR) $(LOCAL)-OBJS := $(addprefix $(OBJ)/,$(addsuffix .opic,$(notdir $(basename $(SOURCE))))) $(LOCAL)-DEP := $(addprefix $(DEP)/,$(addsuffix .opic.d,$(notdir $(basename $(SOURCE))))) $(LOCAL)-HEADERS := $(addprefix $(INCLUDE)/,$(HEADERS)) -$(LOCAL)-SONAME := lib$(LIBRARY).so.$(MAJOR) +$(LOCAL)-SONAME := lib$(LIBRARY)$(LIBEXT).so.$(MAJOR) $(LOCAL)-SLIBS := $(SLIBS) $(LOCAL)-LIBRARY := $(LIBRARY) @@ -29,7 +29,7 @@ include $(PODOMAIN_H) # Install the command hooks headers: $($(LOCAL)-HEADERS) -library: $(LIB)/lib$(LIBRARY).so $(LIB)/lib$(LIBRARY).so.$(MAJOR) +library: $(LIB)/lib$(LIBRARY).so $(LIB)/lib$(LIBRARY)$(LIBEXT).so.$(MAJOR) clean: clean/$(LOCAL) veryclean: veryclean/$(LOCAL) @@ -44,14 +44,14 @@ veryclean/$(LOCAL): clean/$(LOCAL) -rm -f $($(@F)-HEADERS) $(LIB)/lib$($(@F)-LIBRARY)*.so* # Build rules for the two symlinks -.PHONY: $(LIB)/lib$(LIBRARY).so.$(MAJOR) $(LIB)/lib$(LIBRARY).so -$(LIB)/lib$(LIBRARY).so.$(MAJOR): $(LIB)/lib$(LIBRARY).so.$(MAJOR).$(MINOR) +.PHONY: $(LIB)/lib$(LIBRARY)$(LIBEXT).so.$(MAJOR) $(LIB)/lib$(LIBRARY).so +$(LIB)/lib$(LIBRARY)$(LIBEXT).so.$(MAJOR): $(LIB)/lib$(LIBRARY)$(LIBEXT).so.$(MAJOR).$(MINOR) ln -sf $(<F) $@ -$(LIB)/lib$(LIBRARY).so: $(LIB)/lib$(LIBRARY).so.$(MAJOR).$(MINOR) +$(LIB)/lib$(LIBRARY).so: $(LIB)/lib$(LIBRARY)$(LIBEXT).so.$(MAJOR).$(MINOR) ln -sf $(<F) $@ # The binary build rule -$(LIB)/lib$(LIBRARY).so.$(MAJOR).$(MINOR): $($(LOCAL)-HEADERS) $($(LOCAL)-OBJS) +$(LIB)/lib$(LIBRARY)$(LIBEXT).so.$(MAJOR).$(MINOR): $($(LOCAL)-HEADERS) $($(LOCAL)-OBJS) -rm -f $(LIB)/lib$($(@F)-LIBRARY)*.so* 2> /dev/null echo Building shared library $@ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(PICFLAGS) $(LFLAGS) $(LFLAGS_SO)\ diff --git a/buildlib/libversion.mak b/buildlib/libversion.mak index 796c956e7..26ca86ced 100644 --- a/buildlib/libversion.mak +++ b/buildlib/libversion.mak @@ -12,3 +12,10 @@ LIBAPTPKG_RELEASE=$(shell grep -E '^\#define APT_PKG_RELEASE' $(BASE)/apt-pkg/in # The versionnumber is extracted from apt-inst/makefile - see also there. LIBAPTINST_MAJOR=$(shell egrep '^MAJOR=' $(BASE)/apt-inst/makefile |cut -d '=' -f 2) LIBAPTINST_MINOR=$(shell egrep '^MINOR=' $(BASE)/apt-inst/makefile |cut -d '=' -f 2) + +# FIXME: In previous releases this lovely variable includes +# the detected libc and libdc++ version. As this is bogus we +# want to drop this, but this a ABI break. +# And we don't want to do this now. So we hardcode a value here, +# and drop it later on (hopefully as fast as possible). +LIBEXT=-libc6.9-6 diff --git a/debian/rules b/debian/rules index f69c0cffb..d01b57cd6 100755 --- a/debian/rules +++ b/debian/rules @@ -78,21 +78,21 @@ APT_UTILS=ftparchive sortpkgs extracttemplates include buildlib/libversion.mak # Determine which package we should provide in the control files -LIBAPTPKG_PROVIDE=libapt-pkg-$(LIBAPTPKG_MAJOR) -LIBAPTINST_PROVIDE=libapt-inst-$(LIBAPTINST_MAJOR) +LIBAPTPKG_PROVIDE=libapt-pkg$(LIBEXT)-$(LIBAPTPKG_MAJOR) +LIBAPTINST_PROVIDE=libapt-inst$(LIBEXT)-$(LIBAPTINST_MAJOR) debian/shlibs.local: apt-pkg/makefile # We have 3 shlibs.local files.. One for 'apt', one for 'apt-utils' and # one for the rest of the packages. This ensures that each package gets # the right overrides.. rm -rf $@ $@.apt $@.apt-utils - echo "libapt-pkg $(LIBAPTPKG_MAJOR)" > $@.apt + echo "libapt-pkg$(LIBEXT) $(LIBAPTPKG_MAJOR)" > $@.apt - echo "libapt-pkg $(LIBAPTPKG_MAJOR) $(LIBAPTPKG_PROVIDE)" > $@.apt-utils - echo "libapt-inst $(LIBAPTINST_MAJOR)" >> $@.apt-utils + echo "libapt-pkg$(LIBEXT) $(LIBAPTPKG_MAJOR) $(LIBAPTPKG_PROVIDE)" > $@.apt-utils + echo "libapt-inst$(LIBEXT) $(LIBAPTINST_MAJOR)" >> $@.apt-utils - echo "libapt-pkg $(LIBAPTPKG_MAJOR) $(LIBAPTPKG_PROVIDE)" > $@ - echo "libapt-inst $(LIBAPTINST_MAJOR) $(LIBAPTINST_PROVIDE)" >> $@ + echo "libapt-pkg$(LIBEXT) $(LIBAPTPKG_MAJOR) $(LIBAPTPKG_PROVIDE)" > $@ + echo "libapt-inst$(LIBEXT) $(LIBAPTINST_MAJOR) $(LIBAPTINST_PROVIDE)" >> $@ build: build/build-stamp build-doc: build/build-doc-stamp -- cgit v1.2.3-70-g09d2 From d4d9f5399244f5c7e698cc4860d1d9ab8f63992f Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Sat, 12 Dec 2009 14:51:16 +0100 Subject: French translation update --- doc/po/fr.po | 109 ++++++++++++++++++++++++++++------------------------------- 1 file changed, 51 insertions(+), 58 deletions(-) diff --git a/doc/po/fr.po b/doc/po/fr.po index 49dc38f7f..324e883a2 100644 --- a/doc/po/fr.po +++ b/doc/po/fr.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2009-11-27 00:05+0100\n" -"PO-Revision-Date: 2009-09-26 19:25+0200\n" +"POT-Creation-Date: 2009-12-01 19:13+0100\n" +"PO-Revision-Date: 2009-12-12 14:46+0100\n" "Last-Translator: Christian Perrier <bubulle@debian.org>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" "MIME-Version: 1.0\n" @@ -1080,7 +1080,7 @@ msgstr "" " </varlistentry>\n" "\">\n" -#. The last update date +#. The last update date #. type: Content of: <refentry><refentryinfo> #: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13 #: apt-sortpkgs.1.xml:13 sources.list.5.xml:13 @@ -2601,8 +2601,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:82 apt-ftparchive.1.xml:106 -msgid "" -"The option <option>--db</option> can be used to specify a binary caching DB." +msgid "The option <option>--db</option> can be used to specify a binary caching DB." msgstr "" "On peut se servir de l'option <option>--db</option> pour demander un cache " "binaire." @@ -2757,10 +2756,8 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt-ftparchive.1.xml:155 -msgid "" -"The generate configuration has 4 separate sections, each described below." -msgstr "" -"Ce fichier de configuration possède quatre sections, décrites ci-dessous." +msgid "The generate configuration has 4 separate sections, each described below." +msgstr "Ce fichier de configuration possède quatre sections, décrites ci-dessous." #. type: Content of: <refentry><refsect1><refsect2><title> #: apt-ftparchive.1.xml:157 @@ -3626,7 +3623,7 @@ msgstr "" "<command>apt-ftparchive</command> retourne zéro si tout se passe bien, le " "nombre 100 en cas d'erreur." -#. The last update date +#. The last update date #. type: Content of: <refentry><refentryinfo> #: apt-get.8.xml:13 msgid "" @@ -4020,7 +4017,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:259 -#, fuzzy msgid "" "Source packages are tracked separately from binary packages via <literal>deb-" "src</literal> type lines in the &sources-list; file. This means that you " @@ -4029,13 +4025,12 @@ msgid "" "none) source version than the one you have installed or could install." msgstr "" "Les paquets source sont gérés indépendamment des paquets binaires, via les " -"lignes de type <literal>deb-src</literal> dans le fichier &sources-list;. On " -"n'obtiendra probablement pas les mêmes sources que celles du paquet installé " -"ou celles du paquet qu'on pourrait installer." +"lignes de type <literal>deb-src</literal> dans le fichier &sources-list;. Il est donc nécessaire d'ajouter une telle ligne pour chaque dépôt pour lequel vous souhaitez " +"pouvoir obtenir les sources. Dans le cas contraite, vous risquez de ne pas obtenir les mêmes sources que celles du paquet installé " +"ou celles du paquet installable." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:266 -#, fuzzy msgid "" "If the <option>--compile</option> option is specified then the package will " "be compiled to a binary .deb using <command>dpkg-buildpackage</command>, if " @@ -4781,6 +4776,8 @@ msgid "" "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; " "&file-statelists;" msgstr "" +"&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; " +"&file-statelists;" #. type: Content of: <refentry><refsect1><para> #: apt-get.8.xml:570 @@ -4955,8 +4952,7 @@ msgstr "<filename>/etc/apt/trusted.gpg</filename>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:141 msgid "Keyring of local trusted keys, new keys will be added here." -msgstr "" -"Trousseau de clés locales fiables : les nouvelles clés y seront ajoutées." +msgstr "Trousseau de clés locales fiables : les nouvelles clés y seront ajoutées." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:144 @@ -4980,10 +4976,8 @@ msgstr "Trousseau des clés fiables de l'archive Debian." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:152 -msgid "" -"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" -msgstr "" -"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" +msgid "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" +msgstr "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:153 @@ -4995,7 +4989,7 @@ msgstr "Trousseau des clés fiables supprimées de l'archive Debian." msgid "&apt-get;, &apt-secure;" msgstr "&apt-get;, &apt-secure;" -#. The last update date +#. The last update date #. type: Content of: <refentry><refentryinfo> #: apt-mark.8.xml:13 #, fuzzy @@ -5006,8 +5000,8 @@ msgid "" "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 " "August 2009</date>" msgstr "" -"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>2 " -"Novembre 2007</date>" +"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 " +"août 2009</date>" #. type: Content of: <refentry><refnamediv><refname> #: apt-mark.8.xml:22 apt-mark.8.xml:29 @@ -5035,10 +5029,12 @@ msgid "" "choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </" "arg> <arg choice=\"plain\">showauto</arg> </group>" msgstr "" -"<command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-" -"f=<replaceable>FICHIER</replaceable></option></arg> <group choice=\"req" -"\"><arg>markauto</arg><arg>unmarkauto</arg></group> <arg choice=\"plain\" " -"rep=\"repeat\"><replaceable>paquet</replaceable></arg>" +" <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-" +"f=<replaceable>FICHIER</replaceable></option></arg> <group choice=\"plain" +"\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain" +"\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </group> <arg " +"choice=\"plain\" rep=\"repeat\"><replaceable>paquet</replaceable></arg> </" +"arg> <arg choice=\"plain\">showauto</arg> </group>" #. type: Content of: <refentry><refsect1><para> #: apt-mark.8.xml:53 @@ -5067,7 +5063,7 @@ msgid "" msgstr "" "Lorsque l'installation d'un paquet est demandée et que d'autres paquets dont " "il dépend sont installés, ces paquets sont marqués comme ayant été " -"automatiquement installés. De tels paquets sont supprimés dès que plus aucun " +"automatiquement installés. De tels paquets sont supprimés par <command>apt-get</command> ou <command>aptitude</command> dès que plus aucun " "paquet, installé manuellement, qui dépend d'eux ne subsiste sur le système." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> @@ -5105,7 +5101,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-mark.8.xml:81 msgid "showauto" -msgstr "" +msgstr "showauto" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-mark.8.xml:82 @@ -5118,26 +5114,23 @@ msgid "" "<literal>showauto</literal> is used to print a list of automatically " "installed packages with each package on a new line." msgstr "" -"Avec la commande <literal>autoremove</literal>, apt-get supprime les paquets " -"installés dans le but de satisfaire les dépendances d'un paquet donné et qui " -"ne sont plus nécessaires." +"<literal>showauto</literal>, affiche les paquets " +"installés manuellement, un par ligne." #. 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>" +msgid "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>" +msgstr "<option>-f=<filename><replaceable>FICHIER</replaceable></filename></option>" + #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-mark.8.xml:94 -#, fuzzy -#| msgid "<option>--file=<filename>FILENAME</filename></option>" msgid "" "<option>--file=<filename><replaceable>FILENAME</replaceable></filename></" "option>" -msgstr "<option>--file=<filename>FICHIER</filename></option>" +msgstr "" +"<option>--file=<filename><replaceable>FICHIER</replaceable></filename></" +"option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-mark.8.xml:97 @@ -5153,7 +5146,7 @@ msgid "" "<filename>extended_status</filename> in the directory defined by the " "Configuration Item: <literal>Dir::State</literal>." msgstr "" -"Lire/écrire les statistiques sur les paquets depuis <filename>FICHIER</" +"Lire/écrire les statistiques sur les paquets depuis <filename><replaceable>FICHIER</replaceable></" "filename> au lieu de l'emplacement par défaut (<filename>extended_status</" "filename> dans le répertoire défini par l'option de configuration " "<literal>Dir::State</literal>." @@ -5193,7 +5186,7 @@ msgstr "Afficher la version du programme." #, fuzzy #| msgid "<filename>/etc/apt/preferences</filename>" msgid "<filename>/var/lib/apt/extended_states</filename>" -msgstr "<filename>/etc/apt/preferences</filename>" +msgstr "<filename>/var/lib/apt/extended_states</filename>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-mark.8.xml:125 @@ -5202,13 +5195,15 @@ msgid "" "State</literal> sets the path to the <filename>extended_states</filename> " "file." msgstr "" +"Liste d'état des paquets auto-installés. L'élément de configuration <literal>Dir::" +"State</literal> définit le chemin d'accès au fichier <filename>extended_states</filename>." #. 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;" +msgstr "&apt-get;,&aptitude;,&apt-conf;" #. type: Content of: <refentry><refsect1><para> #: apt-mark.8.xml:138 @@ -5626,7 +5621,7 @@ msgstr "" "<command>apt-sortpkgs</command> retourne zéro si tout se passe bien ou 100 " "en cas d'erreur." -#. The last update date +#. The last update date #. type: Content of: <refentry><refentryinfo> #: apt.conf.5.xml:13 #, fuzzy @@ -5644,7 +5639,7 @@ msgstr "" "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</" "firstname> <surname>Burrows</surname> <contrib>Documentation d'origine de " "Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-email; " -"&apt-product; <date>10 décembre 2008</date>" +"&apt-product; <date>18 septembre 2009</date>" #. type: Content of: <refentry><refnamediv><refname> #: apt.conf.5.xml:28 apt.conf.5.xml:35 @@ -5739,7 +5734,9 @@ msgstr "" "literal> et <literal>*/</literal>, tout comme les commentaires C/C++. " "Chaque ligne est de la forme : <literal>APT::Get::Assume-Yes \"true\";</" "literal> Le point-virgule final est obligatoire et les guillemets sont " -"optionnels. On peut déclarer un nouveau champ d'action avec des accolades, " +"optionnels. La valeur doit tenir sur une seule ligne et il n'existe pas de fusion de chaînes. Elle ne doit pas comporter de guillemets . Le comportement du caractère " +"barre oblique inversée \"\\\" et les caractères utilisés avec séquence d'échappement dans ue valeur ne sont pas déterministes et devraient être évités. Le nom d'une option " +"peut contenir des caractères alphanumériques et « /-:._+ ». On peut déclarer un nouveau champ d'action avec des accolades, " "comme suit :" #. type: Content of: <refentry><refsect1><informalexample><programlisting> @@ -7179,7 +7176,7 @@ msgstr "" #. TODO: provide a #. motivating example, except I haven't a clue why you'd want -#. to do this. +#. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> #: apt.conf.5.xml:674 msgid "" @@ -7215,8 +7212,7 @@ msgstr "<literal>Debug::Acquire::ftp</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:704 msgid "Print information related to downloading packages using FTP." -msgstr "" -"Affiche les informations concernant le téléchargement de paquets par FTP." +msgstr "Affiche les informations concernant le téléchargement de paquets par FTP." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:711 @@ -7226,8 +7222,7 @@ msgstr "<literal>Debug::Acquire::http</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:715 msgid "Print information related to downloading packages using HTTP." -msgstr "" -"Affiche les informations concernant le téléchargement de paquets par HTTP." +msgstr "Affiche les informations concernant le téléchargement de paquets par HTTP." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:722 @@ -7604,13 +7599,13 @@ msgstr "" msgid "&file-aptconf;" msgstr "&apt-conf;" -#. ? reading apt.conf +#. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:1024 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-cache;, &apt-config;, &apt-preferences;." -#. The last update date +#. The last update date #. type: Content of: <refentry><refentryinfo> #: apt_preferences.5.xml:13 msgid "&apt-author.team; &apt-email; &apt-product; <date>04 May 2009</date>" @@ -7752,8 +7747,7 @@ msgstr "une priorité égale à 990" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #: apt_preferences.5.xml:94 -msgid "" -"to the versions that are not installed and belong to the target release." +msgid "to the versions that are not installed and belong to the target release." msgstr "" "est affectée aux versions qui ne sont pas installées et qui appartiennent à " "la distribution par défaut." @@ -8238,8 +8232,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> #: apt_preferences.5.xml:306 msgid "Determination of Package Version and Distribution Properties" -msgstr "" -"Détermination de la version des paquets et des propriétés des distributions" +msgstr "Détermination de la version des paquets et des propriétés des distributions" #. type: Content of: <refentry><refsect1><refsect2><para> #: apt_preferences.5.xml:308 -- cgit v1.2.3-70-g09d2 From c42d68057cf711b53e9da0217a0ec54cffef4036 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 12 Dec 2009 16:28:25 +0100 Subject: refactor the current changelog a bit --- debian/changelog | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index af68b8ec2..d60bdb51f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,8 +13,6 @@ apt (0.7.25) UNRELEASED; urgency=low Closes: #548571 * German translation update by Holger Wansing Closes: #551534 - * German translation of manpages by Chris Leick - Closes: #552606 * Italian translation update by Milo Casagrande Closes: #555797 * Simplified Chinese translation update by Aron Xu @@ -37,7 +35,7 @@ apt (0.7.25) UNRELEASED; urgency=low * apt-pkg/deb/dpkgpm.cc: - add "purge" to list of known actions * apt-pkg/init.h: - - add compatibilty with old ABI name until the next ABI break + - add compatibility with old ABI name until the next ABI break [ Brian Murray ] * apt-pkg/depcache.cc, apt-pkg/indexcopy.cc: @@ -62,7 +60,7 @@ apt (0.7.25) UNRELEASED; urgency=low * doc/apt-mark.8.xml: - correct showauto synopsis, thanks Andrew Schulman (Closes: #551440) * cmdline/apt-get.cc: - - source should displays his final pkg pick (Closes: #249383, #550952) + - source should display his final pkg pick (Closes: #249383, #550952) - source doesn't need the complete version for match (Closes: #245250) - source ignores versions/releases if not available (Closes: #377424) - only warn if (free) space overflows (Closes: #522238) @@ -84,11 +82,6 @@ apt (0.7.25) UNRELEASED; urgency=low - 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) - * 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) * ftparchive/writer.{cc,h}: - add APT::FTPArchive::LongDescription to be able to disable them * apt-pkg/deb/debsrcrecords.cc: @@ -108,7 +101,14 @@ apt (0.7.25) UNRELEASED; urgency=low - fix a few typos in strings, comments and manpage, thanks Karl Goetz! (Closes: #558757) + [ Carl Chenet ] + * cmdline/apt-mark: + - print an error if a new state file can't be created + (Closes: #521289) and + - exit nicely if python-apt is not installed (Closes: #521284) + [ Chris Leick ] + * doc/de: German translation of manpages (Closes: #552606) * doc/ various manpages: - correct various errors, typos and oddities (Closes: #552535) * doc/apt-secure.8.xml: -- cgit v1.2.3-70-g09d2 From f8b832bdbe85ca315404edcf1159fb1225fddfbf Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 12 Dec 2009 16:32:18 +0100 Subject: remove informalexample tag which hides the programlisting in the tree section of the apt-ftparchive manpage, thanks Chris Leick for noticing it! --- debian/changelog | 2 ++ doc/apt-ftparchive.1.xml | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index d60bdb51f..2b09c9b68 100644 --- a/debian/changelog +++ b/debian/changelog @@ -113,6 +113,8 @@ apt (0.7.25) UNRELEASED; urgency=low - correct various errors, typos and oddities (Closes: #552535) * doc/apt-secure.8.xml: - replace literal with emphasis tags in Archive configuration + * doc/apt-ftparchive.1.xml: + - remove informalexample tag which hides the programlisting [ Eugene V. Lyubimkin ] * apt-pkg/contib/strutl.h diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml index fb1b10adc..c56ff235a 100644 --- a/doc/apt-ftparchive.1.xml +++ b/doc/apt-ftparchive.1.xml @@ -350,11 +350,11 @@ <para> When processing a <literal>Tree</literal> section <command>apt-ftparchive</command> performs an operation similar to: -<informalexample><programlisting> + <programlisting> for i in Sections do for j in Architectures do Generate for DIST=scope SECTION=i ARCH=j -</programlisting></informalexample></para> + </programlisting></para> <variablelist> <varlistentry><term>Sections</term> -- cgit v1.2.3-70-g09d2 From ba56f25a059122d193e9fda612079326751d5c65 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 12 Dec 2009 16:52:17 +0100 Subject: decrease the libapt-inst major version again to 1.1 as the increase was a backport error and is not needed (and destroys our non-abi-break hack) --- apt-inst/makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apt-inst/makefile b/apt-inst/makefile index c0ff3d886..18637d749 100644 --- a/apt-inst/makefile +++ b/apt-inst/makefile @@ -11,7 +11,7 @@ include ../buildlib/defaults.mak # The library name LIBRARY=apt-inst -MAJOR=1.2 +MAJOR=1.1 MINOR=0 SLIBS=$(PTHREADLIB) -lapt-pkg APT_DOMAIN:=libapt-inst$(MAJOR) -- cgit v1.2.3-70-g09d2 From 5d70f74c114450f001d415eea101610eedaee05b Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 12 Dec 2009 19:06:01 +0100 Subject: fix to other oddities observed by Chris Leick while translating in doc/apt-get.8.xml, namely: - change equivalent "for" to "to the" (purge command) - clarify --fix-broken sentence about specifying packages --- debian/changelog | 3 +++ doc/apt-get.8.xml | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2b09c9b68..cd4573468 100644 --- a/debian/changelog +++ b/debian/changelog @@ -115,6 +115,9 @@ apt (0.7.25) UNRELEASED; urgency=low - replace literal with emphasis tags in Archive configuration * doc/apt-ftparchive.1.xml: - remove informalexample tag which hides the programlisting + * doc/apt-get.8.xml: + - change equivalent "for" to "to the" (purge command) + - clarify --fix-broken sentence about specifying packages [ Eugene V. Lyubimkin ] * apt-pkg/contib/strutl.h diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index d3c3772bd..3d22f262c 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -333,8 +333,8 @@ <varlistentry><term><option>-f</option></term><term><option>--fix-broken</option></term> <listitem><para>Fix; attempt to correct a system with broken dependencies in place. This option, when used with install/remove, can omit any packages - to permit APT to deduce a likely solution. Any Package that are specified - must completely correct the problem. The option is sometimes necessary when + to permit APT to deduce a likely solution. If packages are specified, + these have to completely correct the problem. The option is sometimes necessary when running APT for the first time; APT itself does not allow broken package dependencies to exist on a system. It is possible that a system's dependency structure can be so corrupt as to require manual intervention @@ -466,7 +466,7 @@ <varlistentry><term><option>--purge</option></term> <listitem><para>Use purge instead of remove for anything that would be removed. An asterisk ("*") will be displayed next to packages which are - scheduled to be purged. <option>remove --purge</option> is equivalent for + scheduled to be purged. <option>remove --purge</option> is equivalent to the <option>purge</option> command. Configuration Item: <literal>APT::Get::Purge</literal>.</para></listitem> </varlistentry> -- cgit v1.2.3-70-g09d2 From a72d66d1787ecc92bd00c11b0a9590f495f9d436 Mon Sep 17 00:00:00 2001 From: Michael Vogt <michael.vogt@ubuntu.com> Date: Mon, 14 Dec 2009 10:08:27 +0100 Subject: apt-inst/makefile: include libversion.mak --- apt-inst/makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/apt-inst/makefile b/apt-inst/makefile index 18637d749..abc8c3fd9 100644 --- a/apt-inst/makefile +++ b/apt-inst/makefile @@ -9,6 +9,9 @@ HEADER_TARGETDIRS = apt-pkg # Bring in the default rules include ../buildlib/defaults.mak +# The library name and version (indirectly used from init.h) +include ../buildlib/libversion.mak + # The library name LIBRARY=apt-inst MAJOR=1.1 -- cgit v1.2.3-70-g09d2 From f124331728521aac777f284fcb451381899236ef Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Mon, 14 Dec 2009 12:44:17 +0100 Subject: fix two other typos - this time in sources.list.5.xml: * recongnizable --> recognizable * maintain --> maintains --- doc/sources.list.5.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml index 0f788aca1..e2993db2c 100644 --- a/doc/sources.list.5.xml +++ b/doc/sources.list.5.xml @@ -175,11 +175,11 @@ deb http://http.us.debian.org/debian dists/stable-updates/ commands to perform the file transfers from the remote.</para></listitem> </varlistentry> - <varlistentry><term>more recongnizable URI types</term> + <varlistentry><term>more recognizable URI types</term> <listitem><para> APT can be extended with more methods shipped in other optional packages which should follow the nameing scheme <literal>apt-transport-<replaceable>method</replaceable></literal>. - The APT team e.g. maintain also the <literal>apt-transport-https</literal> package which + The APT team e.g. maintains also the <literal>apt-transport-https</literal> package which provides access methods for https-URIs with features similiar to the http method, but other methods for using e.g. debtorrent are also available, see <citerefentry> <refentrytitle><filename>apt-transport-debtorrent</filename></refentrytitle> -- cgit v1.2.3-70-g09d2 From 6847d275374c198f787c4978a49e7056f65a0a3d Mon Sep 17 00:00:00 2001 From: Michael Vogt <michael.vogt@ubuntu.com> Date: Mon, 14 Dec 2009 17:45:51 +0100 Subject: merge segfault fix from Mario Sanchez Prada, many thanks (closes: #561109) --- apt-pkg/deb/dpkgpm.cc | 3 ++- debian/changelog | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 6eb3b40ac..d1a275a47 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -879,7 +879,8 @@ bool pkgDPkgPM::Go(int OutStatusFd) const char *s = _("Can not write log, openpty() " "failed (/dev/pts not mounted?)\n"); fprintf(stderr, "%s",s); - fprintf(term_out, "%s",s); + if(term_out) + fprintf(term_out, "%s",s); master = slave = -1; } else { struct termios rtt; diff --git a/debian/changelog b/debian/changelog index cd4573468..c2a253484 100644 --- a/debian/changelog +++ b/debian/changelog @@ -36,6 +36,8 @@ apt (0.7.25) UNRELEASED; urgency=low - add "purge" to list of known actions * apt-pkg/init.h: - add compatibility with old ABI name until the next ABI break + * merge segfault fix from Mario Sanchez Prada, many thanks + (closes: #561109) [ Brian Murray ] * apt-pkg/depcache.cc, apt-pkg/indexcopy.cc: -- cgit v1.2.3-70-g09d2 From 82c9bbffa2a8c9d614514d24eff0842961212486 Mon Sep 17 00:00:00 2001 From: Michael Vogt <mvo@debian.org> Date: Tue, 15 Dec 2009 13:49:21 +0100 Subject: releasing version 0.7.25 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index c2a253484..53dfcce12 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (0.7.25) UNRELEASED; urgency=low +apt (0.7.25) unstable; urgency=low [ Christian Perrier ] * Fix apt-ftparchive(1) wrt description of the "-o" option. @@ -139,7 +139,7 @@ apt (0.7.25) UNRELEASED; urgency=low * debian/apt.conf.autoremove: - Add kfreebsd-image-* to the list (Closes: #558803) - -- Michael Vogt <mvo@debian.org> Thu, 10 Dec 2009 22:02:38 +0100 + -- Michael Vogt <mvo@debian.org> Tue, 15 Dec 2009 09:21:55 +0100 apt (0.7.24) unstable; urgency=low -- cgit v1.2.3-70-g09d2 From d0cf6da810b2ad898c0eb75ac8815ab5e56cf015 Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Wed, 16 Dec 2009 23:00:06 +0100 Subject: French translation update --- doc/po/fr.po | 96 ++++++++++++++++++++++-------------------------------------- 1 file changed, 35 insertions(+), 61 deletions(-) diff --git a/doc/po/fr.po b/doc/po/fr.po index 324e883a2..6aa64d20a 100644 --- a/doc/po/fr.po +++ b/doc/po/fr.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "POT-Creation-Date: 2009-12-01 19:13+0100\n" -"PO-Revision-Date: 2009-12-12 14:46+0100\n" +"PO-Revision-Date: 2009-12-16 07:51+0100\n" "Last-Translator: Christian Perrier <bubulle@debian.org>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" "MIME-Version: 1.0\n" @@ -358,7 +358,7 @@ msgstr "" #. type: Plain text #: apt.ent:84 -#, fuzzy, no-wrap +#, no-wrap #| msgid "" #| "<!ENTITY dpkg \"<citerefentry>\n" #| " <refentrytitle><command>dpkg</command></refentrytitle>\n" @@ -374,7 +374,7 @@ msgid "" msgstr "" "<!ENTITY dpkg \"<citerefentry>\n" " <refentrytitle><command>dpkg</command></refentrytitle>\n" -" <manvolnum>8</manvolnum>\n" +" <manvolnum>1</manvolnum>\n" " </citerefentry>\"\n" ">\n" @@ -412,7 +412,7 @@ msgstr "" #. type: Plain text #: apt.ent:102 -#, fuzzy, no-wrap +#, no-wrap #| msgid "" #| "<!ENTITY dpkg-scanpackages \"<citerefentry>\n" #| " <refentrytitle><command>dpkg-scanpackages</command></refentrytitle>\n" @@ -428,13 +428,13 @@ msgid "" msgstr "" "<!ENTITY dpkg-scanpackages \"<citerefentry>\n" " <refentrytitle><command>dpkg-scanpackages</command></refentrytitle>\n" -" <manvolnum>8</manvolnum>\n" +" <manvolnum>1</manvolnum>\n" " </citerefentry>\"\n" ">\n" #. type: Plain text #: apt.ent:108 -#, fuzzy, no-wrap +#, no-wrap #| msgid "" #| "<!ENTITY dpkg-scansources \"<citerefentry>\n" #| " <refentrytitle><command>dpkg-scansources</command></refentrytitle>\n" @@ -450,13 +450,13 @@ msgid "" msgstr "" "<!ENTITY dpkg-scansources \"<citerefentry>\n" " <refentrytitle><command>dpkg-scansources</command></refentrytitle>\n" -" <manvolnum>8</manvolnum>\n" +" <manvolnum>1</manvolnum>\n" " </citerefentry>\"\n" ">\n" #. type: Plain text #: apt.ent:114 -#, fuzzy, no-wrap +#, no-wrap #| msgid "" #| "<!ENTITY dselect \"<citerefentry>\n" #| " <refentrytitle><command>dselect</command></refentrytitle>\n" @@ -472,7 +472,7 @@ msgid "" msgstr "" "<!ENTITY dselect \"<citerefentry>\n" " <refentrytitle><command>dselect</command></refentrytitle>\n" -" <manvolnum>8</manvolnum>\n" +" <manvolnum>1</manvolnum>\n" " </citerefentry>\"\n" ">\n" @@ -1379,7 +1379,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> #: apt-cache.8.xml:152 -#, fuzzy #| msgid "" #| "<literal>Missing</literal> is the number of package names that were " #| "referenced in a dependency but were not provided by any package. Missing " @@ -1397,7 +1396,7 @@ msgstr "" "dépendance mais qui ne sont fournis par aucun paquet. Les paquets manquants " "peuvent être mis en évidence quand on n'accède pas à une distribution " "complète ou si un paquet (réel ou virtuel) a été sorti d'une distribution. " -"Habituellement on les trouve dans les champs « Conflicts »." +"Habituellement on les trouve dans les champs « Conflicts » ou « Breaks »." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> #: apt-cache.8.xml:159 @@ -1585,7 +1584,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 " @@ -1597,7 +1595,7 @@ msgid "" msgstr "" "Veuillez noter qu'un paquet connu par APT n'est pas forcément disponible, " "installable ou installé. Par exemple, les paquets virtuels sont également " -"affichés dans la liste." +"affichés dans la liste créée." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:239 @@ -2450,7 +2448,6 @@ msgstr "<option>--tempdir</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-extracttemplates.1.xml:62 -#, fuzzy #| msgid "" #| "Temporary directory in which to write extracted debconf template files " #| "and config scripts Configuration Item: <literal>APT::ExtractTemplates::" @@ -2460,8 +2457,7 @@ msgid "" "config scripts. Configuration Item: <literal>APT::ExtractTemplates::" "TempDir</literal>" msgstr "" -"Répertoire temporaire dans lequel écrire les scripts et guides de " -"configuration pour Debconf. Élément de configuration : <literal>APT::" +"Répertoire temporaire dans lequel écrire les scripts de configuration et modèles d'écrans pour Debconf. Élément de configuration : <literal>APT::" "ExtractTemplates::TempDir</literal>." #. type: Content of: <refentry><refsect1><para> @@ -2473,19 +2469,16 @@ msgstr "" "<command>apt-extracttemplates</command> retourne zéro si tout se passe bien, " "le nombre 100 en cas d'erreur." -#. The last update date +#. The last update date #. type: Content of: <refentry><refentryinfo> #: apt-ftparchive.1.xml:13 -#, 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>" -msgstr "" -"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>2 " -"Novembre 2007</date>" +msgstr "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>17 août 2009</date>" #. type: Content of: <refentry><refnamediv><refname> #: apt-ftparchive.1.xml:22 apt-ftparchive.1.xml:29 @@ -2766,7 +2759,6 @@ msgstr "La section Dir" #. type: Content of: <refentry><refsect1><refsect2><para> #: apt-ftparchive.1.xml:159 -#, fuzzy #| msgid "" #| "The <literal>Dir</literal> section defines the standard directories " #| "needed to locate the files required during the generation process. These " @@ -3578,10 +3570,9 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-ftparchive.1.xml:547 -#, fuzzy #| msgid "<option>--version</option>" msgid "<option>APT::FTPArchive::LongDescription</option>" -msgstr "<option>--version</option>" +msgstr "<option>APT::FTPArchive::LongDescription</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:549 @@ -3592,6 +3583,10 @@ msgid "" "that it is currently not possible to create these files with <command>apt-" "ftparchive</command>." msgstr "" +"Cette option de configuration a « <literal>true</literal> » comme valeur par défaut et ne devrait être placée sur « <literal>false</literal> » que si l'archive créée avec " +"&apt-ftparchive; fournit également des fichiers <filename>Translation</filename>. Veuillez noter qu'il n'est actuellement pas possible de créer ces fichiers avec <command>" +"apt-" +"ftparchive</command>." #. type: Content of: <refentry><refsect1><title> #: apt-ftparchive.1.xml:561 apt.conf.5.xml:1011 apt_preferences.5.xml:462 @@ -3989,7 +3984,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 " @@ -4309,7 +4303,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 " @@ -4337,7 +4330,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:392 -#, fuzzy #| msgid "" #| "Simulate prints out a series of lines each one representing a dpkg " #| "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square " @@ -4992,7 +4984,6 @@ msgstr "&apt-get;, &apt-secure;" #. The last update date #. 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>" @@ -5015,7 +5006,6 @@ msgstr "marquer/démarquer un paquet comme ayant été installé automatiquement #. 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" @@ -5047,7 +5037,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 " @@ -5105,7 +5094,6 @@ msgstr "showauto" #. 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 " @@ -5122,7 +5110,6 @@ msgstr "" msgid "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>" msgstr "<option>-f=<filename><replaceable>FICHIER</replaceable></filename></option>" - #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-mark.8.xml:94 msgid "" @@ -5134,7 +5121,6 @@ msgstr "" #. 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 " @@ -5149,7 +5135,7 @@ msgstr "" "Lire/écrire les statistiques sur les paquets depuis <filename><replaceable>FICHIER</replaceable></" "filename> au lieu de l'emplacement par défaut (<filename>extended_status</" "filename> dans le répertoire défini par l'option de configuration " -"<literal>Dir::State</literal>." +"<literal>Dir::State</literal>)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-mark.8.xml:103 @@ -5183,7 +5169,6 @@ msgstr "Afficher la version du programme." #. 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>/var/lib/apt/extended_states</filename>" @@ -5200,7 +5185,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-get;,&aptitude;,&apt-conf;" @@ -5269,7 +5253,6 @@ msgstr "Trusted archives" #. type: Content of: <refentry><refsect1><para> #: apt-secure.8.xml:67 -#, fuzzy #| msgid "" #| "The chain of trust from an apt archive to the end user is made up of " #| "different steps. <command>apt-secure</command> is the last step in this " @@ -5325,7 +5308,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt-secure.8.xml:92 -#, fuzzy #| msgid "" #| "Once the uploaded package is verified and included in the archive, the " #| "maintainer signature is stripped off, an MD5 sum of the package is " @@ -5342,11 +5324,11 @@ msgid "" "by the archive key (which is created once a year) and distributed through " "the FTP server. This key is also on the Debian keyring." msgstr "" -"Une fois le paquet vérifié et archivé, la signature du responsable est " +"Une fois que le paquet envoyé a été vérifié et inclus dans l'archive, la signature du responsable est " "enlevée, une somme MD5 du paquet est calculée et mise dans le fichier " "Packages. Une somme MD5 de tous les paquets est ensuite calculée et mise " "dans le fichier Release. Ce fichier est signé par la clé de l'archive. Cette " -"clé qui est créée chaque année et distribuée par le serveur FTP se trouve " +"clé, qui est recréée chaque année, est distribuée par le serveur FTP. Elle se trouve " "aussi dans le trousseau Debian." #. type: Content of: <refentry><refsect1><para> @@ -5462,7 +5444,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para> #: apt-secure.8.xml:160 -#, fuzzy #| msgid "" #| "<literal>Create a toplevel Release file</literal>. if it does not exist " #| "already. You can do this by running <command>apt-ftparchive release</" @@ -5472,13 +5453,12 @@ msgid "" "already. You can do this by running <command>apt-ftparchive release</" "command> (provided in apt-utils)." msgstr "" -"<literal>créer un fichier Release à la racine de l'archive</literal>, s'il " +"<emphasis>créer un fichier Release à la racine de l'archive</emphasis>, s'il " "n'existe pas déjà. Vous pouvez le créer avec la commande <command>apt-" -"ftparchive release</command> (fournie dans le paquet apt-utils) ;" +"ftparchive release</command> (fournie dans le paquet apt-utils)." #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para> #: apt-secure.8.xml:165 -#, fuzzy #| msgid "" #| "<literal>Sign it</literal>. You can do this by running <command>gpg -abs -" #| "o Release.gpg Release</command>." @@ -5486,12 +5466,11 @@ msgid "" "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg -abs -" "o Release.gpg Release</command>." msgstr "" -"<literal>le signer</literal>, avec la commande <command>gpg -abs -o Release." -"gpg Release</command> ;" +"<emphasis>le signer</emphasis>, avec la commande <command>gpg -abs -o Release." +"gpg Release</command>." #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para> #: apt-secure.8.xml:168 -#, fuzzy #| msgid "" #| "<literal>Publish the key fingerprint</literal>, that way your users will " #| "know what key they need to import in order to authenticate the files in " @@ -5501,7 +5480,7 @@ msgid "" "know what key they need to import in order to authenticate the files in the " "archive." msgstr "" -"<literal>publier l'empreinte de la clé</literal>. Ainsi les utilisateurs de " +"<emphasis>publier l'empreinte de la clé</emphasis>. Ainsi les utilisateurs de " "votre archive connaîtront la clé qu'ils doivent importer pour authentifier " "les fichiers de l'archive." @@ -5624,7 +5603,6 @@ msgstr "" #. The last update date #. type: Content of: <refentry><refentryinfo> #: apt.conf.5.xml:13 -#, fuzzy #| msgid "" #| "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</" #| "firstname> <surname>Burrows</surname> <contrib>Initial documentation of " @@ -5683,7 +5661,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:50 -#, fuzzy #| msgid "" #| "The configuration file is organized in a tree with options organized into " #| "functional groups. option specification is given with a double colon " @@ -5705,7 +5682,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>//</" @@ -5803,6 +5779,9 @@ msgid "" "list. If you specify a name you can override the option as every other " "option by reassigning a new value to the option." msgstr "" +"Les noms des éléments de configuration sont optionnels si une liste est définie, comme cela peut se voir avec l'exemple <literal>DPkg::Pre-Install-Pkgs</literal> précédent." +" Si vous n'indiquez pas de nom, une nouvelle entrée ajoutera une nouvelle option à la liste. Dans le cas contraire, l'option correspondante peut être remplacée, comme " +"toute autre option, en lui réaffectant une valeur." #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:98 @@ -7198,8 +7177,7 @@ msgstr "<literal>Debug::Acquire::cdrom</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:693 -msgid "" -"Print information related to accessing <literal>cdrom://</literal> sources." +msgid "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" "Affiche les informations concernant les sources de type <literal>cdrom://</" "literal>" @@ -7383,8 +7361,7 @@ msgstr "<literal>Debug::pkgAcquire::Worker</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:844 -msgid "" -"Log all interactions with the sub-processes that actually perform downloads." +msgid "Log all interactions with the sub-processes that actually perform downloads." msgstr "" "Affiche toutes les interactions avec les processus enfants qui se chargent " "effectivement des téléchargements." @@ -7525,8 +7502,7 @@ msgstr "<literal>Debug::pkgPackageManager</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:945 -msgid "" -"Output status messages tracing the steps performed when invoking &dpkg;." +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> @@ -9361,8 +9337,7 @@ msgstr "" #. type: <abstract></abstract> #: guide.sgml:11 -msgid "" -"This document provides an overview of how to use the the APT package manager." +msgid "This document provides an overview of how to use the the APT package manager." msgstr "" #. type: <copyrightsummary></copyrightsummary> @@ -9966,8 +9941,7 @@ msgstr "" #. type: <p></p> #: guide.sgml:447 -msgid "" -"Finally, APT will print out a summary of all the changes that will occur." +msgid "Finally, APT will print out a summary of all the changes that will occur." msgstr "" #. type: <example></example> -- cgit v1.2.3-70-g09d2