summaryrefslogtreecommitdiff
path: root/doc/po
diff options
context:
space:
mode:
Diffstat (limited to 'doc/po')
-rw-r--r--doc/po/apt-doc.pot291
-rw-r--r--doc/po/de.po361
-rw-r--r--doc/po/es.po325
-rw-r--r--doc/po/fr.po327
-rw-r--r--doc/po/it.po314
-rw-r--r--doc/po/ja.po322
-rw-r--r--doc/po/pl.po308
-rw-r--r--doc/po/pt.po335
-rw-r--r--doc/po/pt_BR.po308
9 files changed, 1459 insertions, 1432 deletions
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index b20761bf9..43c184106 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: apt-doc 0.9.7.9~exp3ubuntu1\n"
+"Project-Id-Version: apt-doc 0.9.8.1\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-30 10:29+0300\n"
+"POT-Creation-Date: 2013-06-13 13:46+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1105,12 +1105,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:518 apt-cache.8.xml:343 apt-key.8.xml:174 apt-mark.8.xml:125 apt.conf.5.xml:1168 apt_preferences.5.xml:698
+#: apt-get.8.xml:518 apt-cache.8.xml:343 apt-key.8.xml:174 apt-mark.8.xml:125 apt.conf.5.xml:1167 apt_preferences.5.xml:698
msgid "Files"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131 apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109 apt.conf.5.xml:1174 apt_preferences.5.xml:705 sources.list.5.xml:252 apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63 apt-ftparchive.1.xml:607
+#: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131 apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109 apt.conf.5.xml:1173 apt_preferences.5.xml:705 sources.list.5.xml:252 apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63 apt-ftparchive.1.xml:607
msgid "See Also"
msgstr ""
@@ -1620,8 +1620,8 @@ msgid ""
"Update the local keyring with the archive keyring and remove from the local "
"keyring the archive keys which are no longer valid. The archive keyring is "
"shipped in the <literal>archive-keyring</literal> package of your "
-"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in "
-"Ubuntu."
+"distribution, e.g. the <literal>debian-archive-keyring</literal> package in "
+"Debian."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -1670,22 +1670,22 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:183
-msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>"
+msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:184
-msgid "Keyring of Ubuntu archive trusted keys."
+msgid "Keyring of Debian archive trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:187
-msgid "<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>"
+msgid "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:188
-msgid "Keyring of Ubuntu archive removed trusted keys."
+msgid "Keyring of Debian archive removed trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
@@ -2332,20 +2332,19 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt.conf.5.xml:101
msgid ""
-"In general the sample configuration file in "
-"<filename>&docdir;examples/apt.conf</filename> &configureindex; is a good "
-"guide for how it should look."
+"In general the sample configuration file &configureindex; is a good guide "
+"for how it should look."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:105
+#: apt.conf.5.xml:104
msgid ""
"Case is not significant in names of configuration items, so in the previous "
"example you could use <literal>dpkg::pre-install-pkgs</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:108
+#: apt.conf.5.xml:107
msgid ""
"Names for the configuration items are optional if a list is defined as can "
"be seen in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. If "
@@ -2355,7 +2354,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:113
+#: apt.conf.5.xml:112
msgid ""
"Two special commands are defined: <literal>#include</literal> (which is "
"deprecated and not supported by alternative implementations) and "
@@ -2367,7 +2366,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:123
+#: apt.conf.5.xml:122
msgid ""
"The <literal>#clear</literal> command is the only way to delete a list or a "
"complete scope. Reopening a scope (or using the syntax described below with "
@@ -2377,7 +2376,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:131
+#: apt.conf.5.xml:130
msgid ""
"All of the APT tools take an -o option which allows an arbitrary "
"configuration directive to be specified on the command line. The syntax is a "
@@ -2389,7 +2388,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:139
+#: apt.conf.5.xml:138
msgid ""
"Note that appending items to a list using <literal>::</literal> only works "
"for one item per line, and that you should not use it in combination with "
@@ -2406,19 +2405,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:154
+#: apt.conf.5.xml:153
msgid "The APT Group"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:155
+#: apt.conf.5.xml:154
msgid ""
"This group of options controls general APT behavior as well as holding the "
"options for all of the tools."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:160
+#: apt.conf.5.xml:159
msgid ""
"System Architecture; sets the architecture to use when fetching files and "
"parsing package lists. The internal default is the architecture apt was "
@@ -2426,7 +2425,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:167
+#: apt.conf.5.xml:166
msgid ""
"All Architectures the system supports. For instance, CPUs implementing the "
"<literal>amd64</literal> (also called <literal>x86-64</literal>) "
@@ -2440,7 +2439,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:180
+#: apt.conf.5.xml:179
msgid ""
"Default release to install packages from if more than one version is "
"available. Contains release name, codename or release version. Examples: "
@@ -2449,14 +2448,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:186
+#: apt.conf.5.xml:185
msgid ""
"Ignore held packages; this global option causes the problem resolver to "
"ignore held packages in its decision making."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:191
+#: apt.conf.5.xml:190
msgid ""
"Defaults to on. When turned on the autoclean feature will remove any "
"packages which can no longer be downloaded from the cache. If turned off "
@@ -2465,7 +2464,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:199
+#: apt.conf.5.xml:198
msgid ""
"Defaults to on, which will cause APT to install essential and important "
"packages as soon as possible in an install/upgrade operation, in order to "
@@ -2480,7 +2479,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:211
+#: apt.conf.5.xml:210
msgid ""
"The immediate configuration marker is also applied in the potentially "
"problematic case of circular dependencies, since a dependency with the "
@@ -2497,7 +2496,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:224
+#: apt.conf.5.xml:223
msgid ""
"Before a big operation like <literal>dist-upgrade</literal> is run with this "
"option disabled you should try to explicitly <literal>install</literal> the "
@@ -2508,7 +2507,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:235
+#: apt.conf.5.xml:234
msgid ""
"Never enable this option unless you <emphasis>really</emphasis> know what "
"you are doing. It permits APT to temporarily remove an essential package to "
@@ -2521,7 +2520,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:247
+#: apt.conf.5.xml:246
msgid ""
"APT uses since version 0.7.26 a resizable memory mapped cache file to store "
"the available information. <literal>Cache-Start</literal> acts as a hint of "
@@ -2542,38 +2541,38 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:263
+#: apt.conf.5.xml:262
msgid "Defines which packages are considered essential build dependencies."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:267
+#: apt.conf.5.xml:266
msgid ""
"The Get subsection controls the &apt-get; tool; please see its documentation "
"for more information about the options here."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:272
+#: apt.conf.5.xml:271
msgid ""
"The Cache subsection controls the &apt-cache; tool; please see its "
"documentation for more information about the options here."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:277
+#: apt.conf.5.xml:276
msgid ""
"The CDROM subsection controls the &apt-cdrom; tool; please see its "
"documentation for more information about the options here."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:283
+#: apt.conf.5.xml:282
msgid "The Acquire Group"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:284
+#: apt.conf.5.xml:283
msgid ""
"The <literal>Acquire</literal> group of options controls the download of "
"packages as well as the various \"acquire methods\" responsible for the "
@@ -2581,7 +2580,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:291
+#: apt.conf.5.xml:290
msgid ""
"Security related option defaulting to true, as giving a Release file's "
"validation an expiration date prevents replay attacks over a long timescale, "
@@ -2594,7 +2593,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:304
+#: apt.conf.5.xml:303
msgid ""
"Maximum time (in seconds) after its creation (as indicated by the "
"<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -2606,7 +2605,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:316
+#: apt.conf.5.xml:315
msgid ""
"Minimum time (in seconds) after its creation (as indicated by the "
"<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -2618,7 +2617,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:328
+#: apt.conf.5.xml:327
msgid ""
"Try to download deltas called <literal>PDiffs</literal> for indexes (like "
"<filename>Packages</filename> files) instead of downloading whole ones. True "
@@ -2626,7 +2625,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:331
+#: apt.conf.5.xml:330
msgid ""
"Two sub-options to limit the use of PDiffs are also available: "
"<literal>FileLimit</literal> can be used to specify a maximum number of "
@@ -2638,7 +2637,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:341
+#: apt.conf.5.xml:340
msgid ""
"Queuing mode; <literal>Queue-Mode</literal> can be one of "
"<literal>host</literal> or <literal>access</literal> which determines how "
@@ -2648,21 +2647,21 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:349
+#: apt.conf.5.xml:348
msgid ""
"Number of retries to perform. If this is non-zero APT will retry failed "
"files the given number of times."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:354
+#: apt.conf.5.xml:353
msgid ""
"Use symlinks for source archives. If set to true then source archives will "
"be symlinked when possible instead of copying. True is the default."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:359
+#: apt.conf.5.xml:358
msgid ""
"<literal>http::Proxy</literal> sets the default proxy to use for HTTP "
"URIs. It is in the standard form of "
@@ -2675,7 +2674,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:367
+#: apt.conf.5.xml:366
msgid ""
"Three settings are provided for cache control with HTTP/1.1 compliant proxy "
"caches. <literal>No-Cache</literal> tells the proxy not to use its cached "
@@ -2687,14 +2686,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:377 apt.conf.5.xml:449
+#: apt.conf.5.xml:376 apt.conf.5.xml:448
msgid ""
"The option <literal>timeout</literal> sets the timeout timer used by the "
"method; this value applies to the connection as well as the data timeout."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:380
+#: apt.conf.5.xml:379
msgid ""
"The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
"enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial "
@@ -2706,14 +2705,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:387
+#: apt.conf.5.xml:386
msgid ""
"<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
"follow redirects, which is enabled by default."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:390
+#: apt.conf.5.xml:389
msgid ""
"The used bandwidth can be limited with "
"<literal>Acquire::http::Dl-Limit</literal> which accepts integer values in "
@@ -2723,7 +2722,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:395
+#: apt.conf.5.xml:394
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 "
@@ -2731,7 +2730,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:403
+#: apt.conf.5.xml:402
msgid ""
"The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
"<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
@@ -2742,7 +2741,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:411
+#: apt.conf.5.xml:410
msgid ""
"<literal>CaInfo</literal> suboption specifies place of file that holds info "
"about trusted certificates. <literal>&lt;host&gt;::CaInfo</literal> is the "
@@ -2766,7 +2765,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:432
+#: apt.conf.5.xml:431
msgid ""
"<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs. "
"It is in the standard form of "
@@ -2787,7 +2786,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:452
+#: apt.conf.5.xml:451
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, "
@@ -2797,7 +2796,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:459
+#: apt.conf.5.xml:458
msgid ""
"It is possible to proxy FTP over HTTP by setting the "
"<envar>ftp_proxy</envar> environment variable to an HTTP URL - see the "
@@ -2807,7 +2806,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:464
+#: apt.conf.5.xml:463
msgid ""
"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -2817,13 +2816,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:478
+#: apt.conf.5.xml:477
#, no-wrap
msgid "/cdrom/::Mount \"foo\";"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:473
+#: apt.conf.5.xml:472
msgid ""
"For URIs using the <literal>cdrom</literal> method, the only configurable "
"option is the mount point, <literal>cdrom::Mount</literal>, which must be "
@@ -2836,7 +2835,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:486
+#: apt.conf.5.xml:485
msgid ""
"For GPGV URIs the only configurable option is "
"<literal>gpgv::Options</literal>, which passes additional parameters to "
@@ -2844,7 +2843,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:497
+#: apt.conf.5.xml:496
#, no-wrap
msgid ""
"Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> "
@@ -2852,7 +2851,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:492
+#: apt.conf.5.xml:491
msgid ""
"List of compression types which are understood by the acquire methods. "
"Files like <filename>Packages</filename> can be available in various "
@@ -2864,19 +2863,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:502
+#: apt.conf.5.xml:501
#, no-wrap
msgid "Acquire::CompressionTypes::Order:: \"gz\";"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:505
+#: apt.conf.5.xml:504
#, no-wrap
msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:498
+#: apt.conf.5.xml:497
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 "
@@ -2894,13 +2893,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:511
#, no-wrap
msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:507
+#: apt.conf.5.xml:506
msgid ""
"Note that the "
"<literal>Dir::Bin::<replaceable>Methodname</replaceable></literal> will be "
@@ -2916,7 +2915,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:517
+#: apt.conf.5.xml:516
msgid ""
"The special type <literal>uncompressed</literal> can be used to give "
"uncompressed files a preference, but note that most archives don't provide "
@@ -2924,7 +2923,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:524
+#: apt.conf.5.xml:523
msgid ""
"When downloading <literal>gzip</literal> compressed indexes (Packages, "
"Sources, or Translations), keep them gzip compressed locally instead of "
@@ -2933,7 +2932,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:532
+#: apt.conf.5.xml:531
msgid ""
"The Languages subsection controls which <filename>Translation</filename> "
"files are downloaded and in which order APT tries to display the "
@@ -2945,13 +2944,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:549
+#: apt.conf.5.xml:548
#, no-wrap
msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:537
+#: apt.conf.5.xml:536
msgid ""
"The default list includes \"environment\" and "
"\"en\". \"<literal>environment</literal>\" has a special meaning here: it "
@@ -2973,7 +2972,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:550
+#: apt.conf.5.xml:549
msgid ""
"Note: To prevent problems resulting from APT being executed in different "
"environments (e.g. by different users or by other programs) all Translation "
@@ -2983,22 +2982,22 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:559
+#: apt.conf.5.xml:558
msgid "When downloading, force to use only the IPv4 protocol."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:565
+#: apt.conf.5.xml:564
msgid "When downloading, force to use only the IPv6 protocol."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:572
+#: apt.conf.5.xml:571
msgid "Directories"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:574
+#: apt.conf.5.xml:573
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
"local state information. <literal>lists</literal> is the directory to place "
@@ -3010,7 +3009,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:581
+#: apt.conf.5.xml:580
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -3023,7 +3022,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:590
+#: apt.conf.5.xml:589
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
"<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -3033,7 +3032,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:596
+#: apt.conf.5.xml:595
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 "
@@ -3041,7 +3040,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:600
+#: apt.conf.5.xml:599
msgid ""
"Binary programs are pointed to by "
"<literal>Dir::Bin</literal>. <literal>Dir::Bin::Methods</literal> specifies "
@@ -3053,7 +3052,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:608
+#: apt.conf.5.xml:607
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
"set, all paths in <literal>Dir::</literal> will be relative to "
@@ -3066,7 +3065,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:621
+#: apt.conf.5.xml:620
msgid ""
"The <literal>Ignore-Files-Silently</literal> list can be used to specify "
"which files APT should silently ignore while parsing the files in the "
@@ -3077,12 +3076,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:630
+#: apt.conf.5.xml:629
msgid "APT in DSelect"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:632
+#: apt.conf.5.xml:631
msgid ""
"When APT is used as a &dselect; method several configuration directives "
"control the default behavior. These are in the <literal>DSelect</literal> "
@@ -3090,7 +3089,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:637
+#: apt.conf.5.xml:636
msgid ""
"Cache Clean mode; this value may be one of <literal>always</literal>, "
"<literal>prompt</literal>, <literal>auto</literal>, "
@@ -3104,40 +3103,40 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:651
+#: apt.conf.5.xml:650
msgid ""
"The contents of this variable are passed to &apt-get; as command line "
"options when it is run for the install phase."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:656
+#: apt.conf.5.xml:655
msgid ""
"The contents of this variable are passed to &apt-get; as command line "
"options when it is run for the update phase."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:661
+#: apt.conf.5.xml:660
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:667
+#: apt.conf.5.xml:666
msgid "How APT calls &dpkg;"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:668
+#: apt.conf.5.xml:667
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:673
+#: apt.conf.5.xml:672
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 "
@@ -3145,7 +3144,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:679
+#: apt.conf.5.xml:678
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 "
@@ -3154,7 +3153,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:686
+#: apt.conf.5.xml:685
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 "
@@ -3164,7 +3163,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:692
+#: apt.conf.5.xml:691
msgid ""
"Version 2 of this protocol dumps more information, including the protocol "
"version, the APT configuration space and the packages, files and versions "
@@ -3175,26 +3174,26 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:700
+#: apt.conf.5.xml:699
msgid ""
"APT chdirs to this directory before invoking &dpkg;, the default is "
"<filename>/</filename>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:705
+#: apt.conf.5.xml:704
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:710
+#: apt.conf.5.xml:709
msgid "dpkg trigger usage (and related options)"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:711
+#: apt.conf.5.xml:710
msgid ""
"APT can call &dpkg; in such a way as to let it make aggressive use of "
"triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
@@ -3209,7 +3208,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:726
+#: apt.conf.5.xml:725
#, no-wrap
msgid ""
"DPkg::NoTriggers \"true\";\n"
@@ -3219,7 +3218,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:720
+#: apt.conf.5.xml:719
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 "
@@ -3233,7 +3232,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:733
+#: apt.conf.5.xml:732
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 "
@@ -3246,7 +3245,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:741
+#: apt.conf.5.xml:740
msgid ""
"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
"and \"<literal>no</literal>\". The default value is "
@@ -3264,7 +3263,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:756
+#: apt.conf.5.xml:755
msgid ""
"If this option is set APT will call <command>dpkg --configure "
"--pending</command> to let &dpkg; handle all required configurations and "
@@ -3276,7 +3275,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:763
+#: apt.conf.5.xml:762
msgid ""
"Useful for the <literal>smart</literal> configuration as a package which has "
"pending triggers is not considered as <literal>installed</literal>, and "
@@ -3287,7 +3286,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:776
+#: apt.conf.5.xml:775
#, no-wrap
msgid ""
"OrderList::Score {\n"
@@ -3299,7 +3298,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:769
+#: apt.conf.5.xml:768
msgid ""
"Essential packages (and their dependencies) should be configured immediately "
"after unpacking. It is a good idea to do this quite early in the upgrade "
@@ -3313,12 +3312,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:789
+#: apt.conf.5.xml:788
msgid "Periodic and Archives options"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:790
+#: apt.conf.5.xml:789
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by the "
@@ -3327,12 +3326,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:798
+#: apt.conf.5.xml:797
msgid "Debug options"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:800
+#: apt.conf.5.xml:799
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -3343,7 +3342,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:811
+#: apt.conf.5.xml:810
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, "
@@ -3351,7 +3350,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:819
+#: apt.conf.5.xml:818
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s "
@@ -3359,7 +3358,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:828
+#: apt.conf.5.xml:827
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -3369,65 +3368,65 @@ 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:836
+#: apt.conf.5.xml:835
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
"in CD-ROM IDs."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:846
+#: apt.conf.5.xml:845
msgid "A full list of debugging options to apt follows."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:855
+#: apt.conf.5.xml:854
msgid "Print information related to accessing <literal>cdrom://</literal> sources."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:866
+#: apt.conf.5.xml:865
msgid "Print information related to downloading packages using FTP."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:877
+#: apt.conf.5.xml:876
msgid "Print information related to downloading packages using HTTP."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:888
+#: apt.conf.5.xml:887
msgid "Print information related to downloading packages using HTTPS."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:899
+#: apt.conf.5.xml:898
msgid ""
"Print information related to verifying cryptographic signatures using "
"<literal>gpg</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:910
+#: apt.conf.5.xml:909
msgid ""
"Output information about the process of accessing collections of packages "
"stored on CD-ROMs."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:920
+#: apt.conf.5.xml:919
msgid "Describes the process of resolving build-dependencies in &apt-get;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:930
+#: apt.conf.5.xml:929
msgid ""
"Output each cryptographic hash that is generated by the "
"<literal>apt</literal> libraries."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:940
+#: apt.conf.5.xml:939
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 "
@@ -3435,52 +3434,52 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:951
+#: apt.conf.5.xml:950
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><listitem><para>
-#: apt.conf.5.xml:963
+#: apt.conf.5.xml:962
msgid "Log when items are added to or removed from the global download queue."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:973
+#: apt.conf.5.xml:972
msgid ""
"Output status messages and errors related to verifying checksums and "
"cryptographic signatures of downloaded files."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:983
+#: apt.conf.5.xml:982
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><listitem><para>
-#: apt.conf.5.xml:995
+#: apt.conf.5.xml:994
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><listitem><para>
-#: apt.conf.5.xml:1006
+#: apt.conf.5.xml:1005
msgid "Log all interactions with the sub-processes that actually perform downloads."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1017
+#: apt.conf.5.xml:1016
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><listitem><para>
-#: apt.conf.5.xml:1027
+#: apt.conf.5.xml:1026
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial "
@@ -3490,7 +3489,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1041
+#: apt.conf.5.xml:1040
msgid ""
"Generate debug messages describing which packages are marked as "
"keep/install/remove while the ProblemResolver does his work. Each addition "
@@ -3508,45 +3507,45 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1062
+#: apt.conf.5.xml:1061
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><listitem><para>
-#: apt.conf.5.xml:1073
+#: apt.conf.5.xml:1072
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><listitem><para>
-#: apt.conf.5.xml:1084
+#: apt.conf.5.xml:1083
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><listitem><para>
-#: apt.conf.5.xml:1096
+#: apt.conf.5.xml:1095
msgid "Output status messages tracing the steps performed when invoking &dpkg;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1107
+#: apt.conf.5.xml:1106
msgid "Output the priority of each package list on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1117
+#: apt.conf.5.xml:1116
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><listitem><para>
-#: apt.conf.5.xml:1128
+#: apt.conf.5.xml:1127
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 "
@@ -3554,19 +3553,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1140
+#: apt.conf.5.xml:1139
msgid ""
"Print information about the vendors read from "
"<filename>/etc/apt/vendors.list</filename>."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1162 apt_preferences.5.xml:545 sources.list.5.xml:211 apt-ftparchive.1.xml:596
+#: apt.conf.5.xml:1161 apt_preferences.5.xml:545 sources.list.5.xml:211 apt-ftparchive.1.xml:596
msgid "Examples"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1163
+#: apt.conf.5.xml:1162
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
@@ -3574,7 +3573,7 @@ msgstr ""
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1175
+#: apt.conf.5.xml:1174
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr ""
diff --git a/doc/po/de.po b/doc/po/de.po
index e2052297f..7ef5d39c0 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -7,7 +7,11 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-doc 0.9.7\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
+<<<<<<< HEAD
"POT-Creation-Date: 2013-04-30 10:29+0300\n"
+=======
+"POT-Creation-Date: 2013-06-13 13:46+0300\n"
+>>>>>>> upstream/debian/sid
"PO-Revision-Date: 2012-06-25 22:49+0100\n"
"Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -763,9 +767,9 @@ msgid ""
"installation or upgrading. Each package is a package name, not a fully "
"qualified filename (for instance, in a Debian system, <package>apt-utils</"
"package> would be the argument provided, not <filename>apt-utils_&apt-"
-"product-version;_amd64.deb</filename>). All packages required by the package"
-"(s) specified for installation will also be retrieved and installed. The "
-"<filename>/etc/apt/sources.list</filename> file is used to locate the "
+"product-version;_amd64.deb</filename>). All packages required by the "
+"package(s) specified for installation will also be retrieved and installed. "
+"The <filename>/etc/apt/sources.list</filename> file is used to locate the "
"desired packages. If a hyphen is appended to the package name (with no "
"intervening space), the identified package will be removed if it is "
"installed. Similarly a plus sign can be used to designate a package to "
@@ -1543,14 +1547,14 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:518 apt-cache.8.xml:343 apt-key.8.xml:174 apt-mark.8.xml:125
-#: apt.conf.5.xml:1168 apt_preferences.5.xml:698
+#: apt.conf.5.xml:1167 apt_preferences.5.xml:698
msgid "Files"
msgstr "Dateien"
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131
#: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109
-#: apt.conf.5.xml:1174 apt_preferences.5.xml:705 sources.list.5.xml:252
+#: apt.conf.5.xml:1173 apt_preferences.5.xml:705 sources.list.5.xml:252
#: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63
#: apt-ftparchive.1.xml:607
msgid "See Also"
@@ -3274,15 +3278,14 @@ msgstr "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
#. type: Content of: <refentry><refsect1><para>
#: apt.conf.5.xml:101
msgid ""
-"In general the sample configuration file in <filename>&docdir;examples/apt."
-"conf</filename> &configureindex; is a good guide for how it should look."
+"In general the sample configuration file &configureindex; is a good guide "
+"for how it should look."
msgstr ""
-"Im Allgemeinen bietet die Beispielkonfigurationsdatei in <filename>&docdir;"
-"examples/apt.conf</filename> &configureindex; eine gute Anleitung, wie dies "
-"aussehen könnte."
+"Im Allgemeinen bietet die Beispielkonfigurationsdatei &configureindex; eine "
+"gute Anleitung, wie dies aussehen könnte."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:105
+#: apt.conf.5.xml:104
msgid ""
"Case is not significant in names of configuration items, so in the previous "
"example you could use <literal>dpkg::pre-install-pkgs</literal>."
@@ -3292,7 +3295,7 @@ msgstr ""
"<literal>dpkg::pre-install-pkgs</literal> benutzen."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:108
+#: apt.conf.5.xml:107
msgid ""
"Names for the configuration items are optional if a list is defined as can "
"be seen in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. If "
@@ -3308,7 +3311,7 @@ msgstr ""
"überschreiben, indem Sie der Option erneut einen neuen Wert zuweisen."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:113
+#: apt.conf.5.xml:112
msgid ""
"Two special commands are defined: <literal>#include</literal> (which is "
"deprecated and not supported by alternative implementations) and "
@@ -3328,7 +3331,7 @@ msgstr ""
"(Beachten Sie, dass diese Zeilen auch mit einem Schrägstrich enden müssen.)"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:123
+#: apt.conf.5.xml:122
msgid ""
"The <literal>#clear</literal> command is the only way to delete a list or a "
"complete scope. Reopening a scope (or using the syntax described below with "
@@ -3345,7 +3348,7 @@ msgstr ""
"nicht außer Kraft gesetzt, sondern nur bereinigt werden."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:131
+#: apt.conf.5.xml:130
msgid ""
"All of the APT tools take an -o option which allows an arbitrary "
"configuration directive to be specified on the command line. The syntax is a "
@@ -3365,7 +3368,7 @@ msgstr ""
"Befehlszeile benutzt werden.)"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:139
+#: apt.conf.5.xml:138
msgid ""
"Note that appending items to a list using <literal>::</literal> only works "
"for one item per line, and that you should not use it in combination with "
@@ -3397,12 +3400,12 @@ msgstr ""
"beklagt."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:154
+#: apt.conf.5.xml:153
msgid "The APT Group"
msgstr "Die APT-Gruppe"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:155
+#: apt.conf.5.xml:154
msgid ""
"This group of options controls general APT behavior as well as holding the "
"options for all of the tools."
@@ -3411,7 +3414,7 @@ msgstr ""
"wie es die Optionen für alle Werkzeuge enthält."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:160
+#: apt.conf.5.xml:159
msgid ""
"System Architecture; sets the architecture to use when fetching files and "
"parsing package lists. The internal default is the architecture apt was "
@@ -3422,7 +3425,7 @@ msgstr ""
"die Architektur für die APT kompiliert wurde."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:167
+#: apt.conf.5.xml:166
msgid ""
"All Architectures the system supports. For instance, CPUs implementing the "
"<literal>amd64</literal> (also called <literal>x86-64</literal>) "
@@ -3444,7 +3447,7 @@ msgstr ""
"print-architectures</command> registriert werden."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:180
+#: apt.conf.5.xml:179
msgid ""
"Default release to install packages from if more than one version is "
"available. Contains release name, codename or release version. Examples: "
@@ -3457,7 +3460,7 @@ msgstr ""
"codename;«, »4.0«, »5.0*«. Siehe auch &apt-preferences;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:186
+#: apt.conf.5.xml:185
msgid ""
"Ignore held packages; this global option causes the problem resolver to "
"ignore held packages in its decision making."
@@ -3466,7 +3469,7 @@ msgstr ""
"Problemlöser, gehaltene Pakete beim Treffen von Entscheidungen zu ignorieren."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:191
+#: apt.conf.5.xml:190
msgid ""
"Defaults to on. When turned on the autoclean feature will remove any "
"packages which can no longer be downloaded from the cache. If turned off "
@@ -3481,7 +3484,7 @@ msgstr ""
"Möglichkeiten bereitstellt, um sie erneut zu installieren."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:199
+#: apt.conf.5.xml:198
msgid ""
"Defaults to on, which will cause APT to install essential and important "
"packages as soon as possible in an install/upgrade operation, in order to "
@@ -3509,7 +3512,7 @@ msgstr ""
"Abhängigkeit von A nicht länger erfüllt wird."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:211
+#: apt.conf.5.xml:210
msgid ""
"The immediate configuration marker is also applied in the potentially "
"problematic case of circular dependencies, since a dependency with the "
@@ -3539,7 +3542,7 @@ msgstr ""
"Stelle verhindern kann."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:224
+#: apt.conf.5.xml:223
msgid ""
"Before a big operation like <literal>dist-upgrade</literal> is run with this "
"option disabled you should try to explicitly <literal>install</literal> the "
@@ -3557,7 +3560,7 @@ msgstr ""
"des Upgrade-Prozesses arbeiten können."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:235
+#: apt.conf.5.xml:234
msgid ""
"Never enable this option unless you <emphasis>really</emphasis> know what "
"you are doing. It permits APT to temporarily remove an essential package to "
@@ -3579,7 +3582,7 @@ msgstr ""
"davon abhängt, sind."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:247
+#: apt.conf.5.xml:246
msgid ""
"APT uses since version 0.7.26 a resizable memory mapped cache file to store "
"the available information. <literal>Cache-Start</literal> acts as a hint of "
@@ -3616,13 +3619,13 @@ msgstr ""
"auf 0 gesetzt ist, kann der Zwischenspeicher nicht automatisch wachsen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:263
+#: apt.conf.5.xml:262
msgid "Defines which packages are considered essential build dependencies."
msgstr ""
"definiert, welche Pakete als essentielle Bauabhängigkeiten betrachtet werden."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:267
+#: apt.conf.5.xml:266
msgid ""
"The Get subsection controls the &apt-get; tool; please see its documentation "
"for more information about the options here."
@@ -3632,7 +3635,7 @@ msgstr ""
"erhalten."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:272
+#: apt.conf.5.xml:271
msgid ""
"The Cache subsection controls the &apt-cache; tool; please see its "
"documentation for more information about the options here."
@@ -3642,7 +3645,7 @@ msgstr ""
"erhalten."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:277
+#: apt.conf.5.xml:276
msgid ""
"The CDROM subsection controls the &apt-cdrom; tool; please see its "
"documentation for more information about the options here."
@@ -3652,12 +3655,12 @@ msgstr ""
"erhalten."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:283
+#: apt.conf.5.xml:282
msgid "The Acquire Group"
msgstr "Die Erwerbgruppe"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:284
+#: apt.conf.5.xml:283
msgid ""
"The <literal>Acquire</literal> group of options controls the download of "
"packages as well as the various \"acquire methods\" responsible for the "
@@ -3668,7 +3671,7 @@ msgstr ""
"Herunterladen selbst zuständig sind (siehe auch &sources-list;)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:291
+#: apt.conf.5.xml:290
msgid ""
"Security related option defaulting to true, as giving a Release file's "
"validation an expiration date prevents replay attacks over a long timescale, "
@@ -3690,7 +3693,7 @@ msgstr ""
"ValidTime</literal> unten benutzt werden."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:304
+#: apt.conf.5.xml:303
msgid ""
"Maximum time (in seconds) after its creation (as indicated by the "
"<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3709,7 +3712,7 @@ msgstr ""
"Anhängen der Archivbezeichnung an den Optionsnamen vorgenommen werden."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:316
+#: apt.conf.5.xml:315
msgid ""
"Minimum time (in seconds) after its creation (as indicated by the "
"<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3729,7 +3732,7 @@ msgstr ""
"Optionsnamen vorgenommen werden."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:328
+#: apt.conf.5.xml:327
msgid ""
"Try to download deltas called <literal>PDiffs</literal> for indexes (like "
"<filename>Packages</filename> files) instead of downloading whole ones. True "
@@ -3740,7 +3743,7 @@ msgstr ""
"der kompletten Dateien. Vorgabe ist True."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:331
+#: apt.conf.5.xml:330
msgid ""
"Two sub-options to limit the use of PDiffs are also available: "
"<literal>FileLimit</literal> can be used to specify a maximum number of "
@@ -3758,7 +3761,7 @@ msgstr ""
"komplette Datei anstelle der Patche heruntergeladen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:341
+#: apt.conf.5.xml:340
msgid ""
"Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
"literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -3774,7 +3777,7 @@ msgstr ""
"URI-Art geöffnet wird."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:349
+#: apt.conf.5.xml:348
msgid ""
"Number of retries to perform. If this is non-zero APT will retry failed "
"files the given number of times."
@@ -3783,7 +3786,7 @@ msgstr ""
"APT fehlgeschlagene Dateien in der angegebenen Zahl erneut versuchen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:354
+#: apt.conf.5.xml:353
msgid ""
"Use symlinks for source archives. If set to true then source archives will "
"be symlinked when possible instead of copying. True is the default."
@@ -3793,7 +3796,7 @@ msgstr ""
"kopiert zu werden. True ist die Vorgabe."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:359
+#: apt.conf.5.xml:358
msgid ""
"<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. "
"It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</"
@@ -3804,15 +3807,15 @@ msgid ""
"be used."
msgstr ""
"<literal>http::Proxy</literal> ist der zu benutzende Standard-HTTP-Proxy. Er "
-"wird standardmäßig in der Form <literal>http://[[Anwender][:Passwort]@]"
-"Rechner[:Port]/</literal> angegeben. Durch Rechner-Proxies kann außerdem in "
-"der Form <literal>http::Proxy::&lt;host&gt;</literal> mit dem speziellen "
-"Schlüsselwort <literal>DIRECT</literal> angegeben werden, dass keine Proxies "
-"benutzt werden. Falls keine der obigen Einstellungen angegeben wurde, wird "
-"die Umgebungsvariable <envar>http_proxy</envar> benutzt."
+"wird standardmäßig in der Form <literal>http://[[Anwender][:"
+"Passwort]@]Rechner[:Port]/</literal> angegeben. Durch Rechner-Proxies kann "
+"außerdem in der Form <literal>http::Proxy::&lt;host&gt;</literal> mit dem "
+"speziellen Schlüsselwort <literal>DIRECT</literal> angegeben werden, dass "
+"keine Proxies benutzt werden. Falls keine der obigen Einstellungen angegeben "
+"wurde, wird die Umgebungsvariable <envar>http_proxy</envar> benutzt."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:367
+#: apt.conf.5.xml:366
msgid ""
"Three settings are provided for cache control with HTTP/1.1 compliant proxy "
"caches. <literal>No-Cache</literal> tells the proxy not to use its cached "
@@ -3833,7 +3836,7 @@ msgstr ""
"Zwischenspeicher mit (großen) .deb-Dateien verunreinigt."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:377 apt.conf.5.xml:449
+#: apt.conf.5.xml:376 apt.conf.5.xml:448
msgid ""
"The option <literal>timeout</literal> sets the timeout timer used by the "
"method; this value applies to the connection as well as the data timeout."
@@ -3843,7 +3846,7 @@ msgstr ""
"Datenzeitüberschreitungen angewandt."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:380
+#: apt.conf.5.xml:379
msgid ""
"The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
"enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e."
@@ -3863,7 +3866,7 @@ msgstr ""
"HTTP/1.1-Spezifikation entsprechen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:387
+#: apt.conf.5.xml:386
msgid ""
"<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
"follow redirects, which is enabled by default."
@@ -3872,7 +3875,7 @@ msgstr ""
"folgen wird, was standardmäßig aktiviert ist."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:390
+#: apt.conf.5.xml:389
msgid ""
"The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
"literal> which accepts integer values in kilobytes. The default value is 0 "
@@ -3888,7 +3891,7 @@ msgstr ""
"deaktiviert.)"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:395
+#: apt.conf.5.xml:394
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 "
@@ -3900,7 +3903,7 @@ msgstr ""
"bekannten Bezeichner verwendet."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:403
+#: apt.conf.5.xml:402
msgid ""
"The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
"<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
@@ -3917,7 +3920,7 @@ msgstr ""
"<literal>Pipeline-Depth</literal> wird noch nicht unterstützt."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:411
+#: apt.conf.5.xml:410
msgid ""
"<literal>CaInfo</literal> suboption specifies place of file that holds info "
"about trusted certificates. <literal>&lt;host&gt;::CaInfo</literal> is the "
@@ -3958,7 +3961,7 @@ msgstr ""
"Rechner ist <literal>&lt;host&gt;::SslForceVersion</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:432
+#: apt.conf.5.xml:431
msgid ""
"<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs. "
"It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</"
@@ -3993,7 +3996,7 @@ msgstr ""
"literal> und <literal>$(SITE_PORT)</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:452
+#: apt.conf.5.xml:451
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, "
@@ -4010,7 +4013,7 @@ msgstr ""
"Musterkonfigurationsdatei)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:459
+#: apt.conf.5.xml:458
msgid ""
"It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
"envar> environment variable to an HTTP URL - see the discussion of the http "
@@ -4024,7 +4027,7 @@ msgstr ""
"Effizienz nicht empfohlen FTP über HTTP zu benutzen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:464
+#: apt.conf.5.xml:463
msgid ""
"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -4040,13 +4043,13 @@ msgstr ""
"Server RFC2428 unterstützen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:478
+#: apt.conf.5.xml:477
#, no-wrap
msgid "/cdrom/::Mount \"foo\";"
msgstr "/cdrom/::Mount \"foo\";"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:473
+#: apt.conf.5.xml:472
msgid ""
"For URIs using the <literal>cdrom</literal> method, the only configurable "
"option is the mount point, <literal>cdrom::Mount</literal>, which must be "
@@ -4068,7 +4071,7 @@ msgstr ""
"Aushängebefehle können per UMount angegeben werden."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:486
+#: apt.conf.5.xml:485
msgid ""
"For GPGV URIs the only configurable option is <literal>gpgv::Options</"
"literal>, which passes additional parameters to gpgv."
@@ -4077,13 +4080,13 @@ msgstr ""
"literal>, um zusätzliche Parameter an Gpgv weiterzuleiten."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:497
+#: apt.conf.5.xml:496
#, 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><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:492
+#: apt.conf.5.xml:491
msgid ""
"List of compression types which are understood by the acquire methods. "
"Files like <filename>Packages</filename> can be available in various "
@@ -4103,19 +4106,19 @@ msgstr ""
"\"synopsis\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:502
+#: apt.conf.5.xml:501
#, no-wrap
msgid "Acquire::CompressionTypes::Order:: \"gz\";"
msgstr "Acquire::CompressionTypes::Order:: \"gz\";"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:505
+#: apt.conf.5.xml:504
#, no-wrap
msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:498
+#: apt.conf.5.xml:497
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 "
@@ -4147,13 +4150,13 @@ msgstr ""
"explizit zur Liste hinzuzufügen, da es automatisch hinzufügt wird."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:511
#, no-wrap
msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:507
+#: apt.conf.5.xml:506
msgid ""
"Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></"
"literal> will be checked at run time. If this option has been set, the "
@@ -4179,7 +4182,7 @@ msgstr ""
"nicht überschreiben, es wird diesen Typ nur vor die Liste setzen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:517
+#: apt.conf.5.xml:516
msgid ""
"The special type <literal>uncompressed</literal> can be used to give "
"uncompressed files a preference, but note that most archives don't provide "
@@ -4191,7 +4194,7 @@ msgstr ""
"dies meist nur für lokale Spiegel benutzt werden kann."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:524
+#: apt.conf.5.xml:523
msgid ""
"When downloading <literal>gzip</literal> compressed indexes (Packages, "
"Sources, or Translations), keep them gzip compressed locally instead of "
@@ -4205,7 +4208,7 @@ msgstr ""
"False."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:532
+#: apt.conf.5.xml:531
msgid ""
"The Languages subsection controls which <filename>Translation</filename> "
"files are downloaded and in which order APT tries to display the description-"
@@ -4225,13 +4228,13 @@ msgstr ""
"langen Sprachcodes selten."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:549
+#: apt.conf.5.xml:548
#, no-wrap
msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:537
+#: apt.conf.5.xml:536
msgid ""
"The default list includes \"environment\" and \"en\". "
"\"<literal>environment</literal>\" has a special meaning here: it will be "
@@ -4272,7 +4275,7 @@ msgstr ""
"\"0\"/>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:550
+#: apt.conf.5.xml:549
msgid ""
"Note: To prevent problems resulting from APT being executed in different "
"environments (e.g. by different users or by other programs) all Translation "
@@ -4286,22 +4289,22 @@ msgstr ""
"Liste hinzugefügt (nach einem impliziten »<literal>none</literal>«)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:559
+#: apt.conf.5.xml:558
msgid "When downloading, force to use only the IPv4 protocol."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:565
+#: apt.conf.5.xml:564
msgid "When downloading, force to use only the IPv6 protocol."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:572
+#: apt.conf.5.xml:571
msgid "Directories"
msgstr "Verzeichnisse"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:574
+#: apt.conf.5.xml:573
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
"local state information. <literal>lists</literal> is the directory to place "
@@ -4321,7 +4324,7 @@ msgstr ""
"nicht mit <filename>/</filename> oder <filename>./</filename> beginnen."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:581
+#: apt.conf.5.xml:580
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -4344,7 +4347,7 @@ msgstr ""
"Standardverzeichnis in <literal>Dir::Cache</literal> enthalten."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:590
+#: apt.conf.5.xml:589
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
"<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4359,7 +4362,7 @@ msgstr ""
"Konfigurationsdatei erfolgt)."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:596
+#: apt.conf.5.xml:595
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 "
@@ -4371,7 +4374,7 @@ msgstr ""
"geladen."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:600
+#: apt.conf.5.xml:599
msgid ""
"Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
"Bin::Methods</literal> specifies the location of the method handlers and "
@@ -4389,7 +4392,7 @@ msgstr ""
"Programms an."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:608
+#: apt.conf.5.xml:607
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
"set, all paths in <literal>Dir::</literal> will be relative to "
@@ -4409,7 +4412,7 @@ msgstr ""
"<filename>/tmp/staging/var/lib/dpkg/status</filename> nachgesehen."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:621
+#: apt.conf.5.xml:620
msgid ""
"The <literal>Ignore-Files-Silently</literal> list can be used to specify "
"which files APT should silently ignore while parsing the files in the "
@@ -4427,12 +4430,12 @@ msgstr ""
"diese Muster verwandt werden."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:630
+#: apt.conf.5.xml:629
msgid "APT in DSelect"
msgstr "APT in DSelect"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:632
+#: apt.conf.5.xml:631
msgid ""
"When APT is used as a &dselect; method several configuration directives "
"control the default behavior. These are in the <literal>DSelect</literal> "
@@ -4443,7 +4446,7 @@ msgstr ""
"<literal>DSelect</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:637
+#: apt.conf.5.xml:636
msgid ""
"Cache Clean mode; this value may be one of <literal>always</literal>, "
"<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
@@ -4466,7 +4469,7 @@ msgstr ""
"vor dem Herunterladen neuer Pakete durch."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:651
+#: apt.conf.5.xml:650
msgid ""
"The contents of this variable are passed to &apt-get; as command line "
"options when it is run for the install phase."
@@ -4475,7 +4478,7 @@ msgstr ""
"übermittelt, wenn es für die Installationsphase durchlaufen wird."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:656
+#: apt.conf.5.xml:655
msgid ""
"The contents of this variable are passed to &apt-get; as command line "
"options when it is run for the update phase."
@@ -4484,7 +4487,7 @@ msgstr ""
"übermittelt, wenn es für die Aktualisierungsphase durchlaufen wird."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:661
+#: apt.conf.5.xml:660
msgid ""
"If true the [U]pdate operation in &dselect; will always prompt to continue. "
"The default is to prompt only on error."
@@ -4493,12 +4496,12 @@ msgstr ""
"nachfragen, um fortzufahren. Vorgabe ist es, nur bei Fehlern nachzufragen."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:667
+#: apt.conf.5.xml:666
msgid "How APT calls &dpkg;"
msgstr "Wie APT &dpkg; aufruft"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:668
+#: apt.conf.5.xml:667
msgid ""
"Several configuration directives control how APT invokes &dpkg;. These are "
"in the <literal>DPkg</literal> section."
@@ -4507,7 +4510,7 @@ msgstr ""
"stehen im Abschnitt <literal>DPkg</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:673
+#: apt.conf.5.xml:672
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 "
@@ -4518,7 +4521,7 @@ msgstr ""
"jedes Listenelement wird als einzelnes Argument an &dpkg; übermittelt."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:679
+#: apt.conf.5.xml:678
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 "
@@ -4532,7 +4535,7 @@ msgstr ""
"APT abgebrochen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:686
+#: apt.conf.5.xml:685
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 "
@@ -4548,7 +4551,7 @@ msgstr ""
"die es installieren wird, auf der Standardeingabe übergeben, einen pro Zeile."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:692
+#: apt.conf.5.xml:691
msgid ""
"Version 2 of this protocol dumps more information, including the protocol "
"version, the APT configuration space and the packages, files and versions "
@@ -4564,7 +4567,7 @@ msgstr ""
"literal> gegeben wird."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:700
+#: apt.conf.5.xml:699
msgid ""
"APT chdirs to this directory before invoking &dpkg;, the default is "
"<filename>/</filename>."
@@ -4573,7 +4576,7 @@ msgstr ""
"die Vorgabe ist <filename>/</filename>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:705
+#: apt.conf.5.xml:704
msgid ""
"These options are passed to &dpkg-buildpackage; when compiling packages; the "
"default is to disable signing and produce all binaries."
@@ -4583,12 +4586,12 @@ msgstr ""
"Programme werden erstellt."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:710
+#: apt.conf.5.xml:709
msgid "dpkg trigger usage (and related options)"
msgstr "Dpkd-Trigger-Benutzung (und zugehörige Optionen)"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:711
+#: apt.conf.5.xml:710
msgid ""
"APT can call &dpkg; in such a way as to let it make aggressive use of "
"triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
@@ -4615,7 +4618,7 @@ msgstr ""
"Pakete konfiguriert werden."
#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:726
+#: apt.conf.5.xml:725
#, no-wrap
msgid ""
"DPkg::NoTriggers \"true\";\n"
@@ -4629,7 +4632,7 @@ msgstr ""
"DPkg::TriggersPending \"true\";"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:720
+#: apt.conf.5.xml:719
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 "
@@ -4654,7 +4657,7 @@ msgstr ""
"Optionenkombination wäre <placeholder type=\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:733
+#: apt.conf.5.xml:732
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 "
@@ -4677,7 +4680,7 @@ msgstr ""
"anhängen."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:741
+#: apt.conf.5.xml:740
msgid ""
"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
"and \"<literal>no</literal>\". The default value is \"<literal>all</literal>"
@@ -4707,7 +4710,7 @@ msgstr ""
"enden könnte und möglicherweise nicht mehr startbar ist."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:756
+#: apt.conf.5.xml:755
msgid ""
"If this option is set APT will call <command>dpkg --configure --pending</"
"command> to let &dpkg; handle all required configurations and triggers. This "
@@ -4726,7 +4729,7 @@ msgstr ""
"deaktivieren."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:763
+#: apt.conf.5.xml:762
msgid ""
"Useful for the <literal>smart</literal> configuration as a package which has "
"pending triggers is not considered as <literal>installed</literal>, and "
@@ -4742,7 +4745,7 @@ msgstr ""
"benötigt werden."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:776
+#: apt.conf.5.xml:775
#, no-wrap
msgid ""
"OrderList::Score {\n"
@@ -4760,7 +4763,7 @@ msgstr ""
"};"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:769
+#: apt.conf.5.xml:768
msgid ""
"Essential packages (and their dependencies) should be configured immediately "
"after unpacking. It is a good idea to do this quite early in the upgrade "
@@ -4784,12 +4787,12 @@ msgstr ""
"mit ihren Vorgabewerten. <placeholder type=\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:789
+#: apt.conf.5.xml:788
msgid "Periodic and Archives options"
msgstr "Periodische- und Archivoptionen"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:790
+#: apt.conf.5.xml:789
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by the "
@@ -4803,12 +4806,12 @@ msgstr ""
"Dokumentation dieser Optionen zu erhalten."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:798
+#: apt.conf.5.xml:797
msgid "Debug options"
msgstr "Fehlersuchoptionen"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:800
+#: apt.conf.5.xml:799
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -4826,7 +4829,7 @@ msgstr ""
"könnten es sein:"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:811
+#: apt.conf.5.xml:810
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -4837,7 +4840,7 @@ msgstr ""
"getroffenen Entscheidungen ein."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:819
+#: apt.conf.5.xml:818
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s install</"
@@ -4848,7 +4851,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:828
+#: apt.conf.5.xml:827
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -4860,7 +4863,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:836
+#: apt.conf.5.xml:835
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
"in CD-ROM IDs."
@@ -4869,12 +4872,12 @@ msgstr ""
"Daten in CD-ROM-IDs aus."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:846
+#: apt.conf.5.xml:845
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><listitem><para>
-#: apt.conf.5.xml:855
+#: apt.conf.5.xml:854
msgid ""
"Print information related to accessing <literal>cdrom://</literal> sources."
msgstr ""
@@ -4882,28 +4885,28 @@ msgstr ""
"literal>-Quellen beziehen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:866
+#: apt.conf.5.xml:865
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><listitem><para>
-#: apt.conf.5.xml:877
+#: apt.conf.5.xml:876
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><listitem><para>
-#: apt.conf.5.xml:888
+#: apt.conf.5.xml:887
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><listitem><para>
-#: apt.conf.5.xml:899
+#: apt.conf.5.xml:898
msgid ""
"Print information related to verifying cryptographic signatures using "
"<literal>gpg</literal>."
@@ -4912,7 +4915,7 @@ msgstr ""
"mittels <literal>gpg</literal> beziehen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:910
+#: apt.conf.5.xml:909
msgid ""
"Output information about the process of accessing collections of packages "
"stored on CD-ROMs."
@@ -4921,13 +4924,13 @@ msgstr ""
"CD-ROMs gespeichert sind."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:920
+#: apt.conf.5.xml:919
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><listitem><para>
-#: apt.conf.5.xml:930
+#: apt.conf.5.xml:929
msgid ""
"Output each cryptographic hash that is generated by the <literal>apt</"
"literal> libraries."
@@ -4936,7 +4939,7 @@ msgstr ""
"Bibliotheken generiert wurde."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:940
+#: apt.conf.5.xml:939
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 "
@@ -4947,7 +4950,7 @@ msgstr ""
"ID für eine CD-ROM generiert wird."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:951
+#: apt.conf.5.xml:950
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."
@@ -4957,14 +4960,14 @@ msgstr ""
"gleichen Zeit laufen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:963
+#: apt.conf.5.xml:962
msgid "Log when items are added to or removed from the global download queue."
msgstr ""
"protokolliert, wenn Elemente aus der globalen Warteschlange zum "
"Herunterladen hinzugefügt oder entfernt werden."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:973
+#: apt.conf.5.xml:972
msgid ""
"Output status messages and errors related to verifying checksums and "
"cryptographic signatures of downloaded files."
@@ -4973,7 +4976,7 @@ msgstr ""
"und kryptografischen Signaturen von heruntergeladenen Dateien beziehen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:983
+#: apt.conf.5.xml:982
msgid ""
"Output information about downloading and applying package index list diffs, "
"and errors relating to package index list diffs."
@@ -4982,7 +4985,7 @@ msgstr ""
"Diffs und Fehler, die die Paketindexlisten-Diffs betreffen, aus."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:995
+#: apt.conf.5.xml:994
msgid ""
"Output information related to patching apt package lists when downloading "
"index diffs instead of full indices."
@@ -4992,7 +4995,7 @@ msgstr ""
"werden."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1006
+#: apt.conf.5.xml:1005
msgid ""
"Log all interactions with the sub-processes that actually perform downloads."
msgstr ""
@@ -5000,7 +5003,7 @@ msgstr ""
"durchführen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1017
+#: apt.conf.5.xml:1016
msgid ""
"Log events related to the automatically-installed status of packages and to "
"the removal of unused packages."
@@ -5010,7 +5013,7 @@ msgstr ""
"beziehen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1027
+#: apt.conf.5.xml:1026
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial auto-"
@@ -5026,7 +5029,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1041
+#: apt.conf.5.xml:1040
msgid ""
"Generate debug messages describing which packages are marked as keep/install/"
"remove while the ProblemResolver does his work. Each addition or deletion "
@@ -5048,18 +5051,18 @@ msgstr ""
"auslösen. Sie werden nach zwei eingerückten Leerzeichen unter dem "
"Originaleintrag angezeigt. Jede Zeile hat das Format <literal>MarkKeep</"
"literal>, <literal>MarkDelete</literal> oder <literal>MarkInstall</literal> "
-"gefolgt von <literal>Paketname &lt;a.b.c -&gt; d.e.f | x.y.z&gt; (Abschnitt)"
-"</literal> wobei <literal>a.b.c</literal> die aktuelle Version des Paketes "
-"ist, <literal>d.e.f</literal> die Version ist, die zur Installation "
-"vorgesehen ist und <literal>x.y.z</literal> eine neuere Version ist, die "
-"aber nicht zur Installation vorgesehen ist (aufgrund einer niedrigen Pinning-"
-"Bewertung). Die letzten beiden können weggelassen werden, wenn es keine gibt "
-"oder wenn sie die gleiche Version haben, wie die, die installiert ist. "
-"<literal>section</literal> ist der Name des Abschnitts, in dem das Paket "
-"erscheint."
+"gefolgt von <literal>Paketname &lt;a.b.c -&gt; d.e.f | x.y.z&gt; "
+"(Abschnitt)</literal> wobei <literal>a.b.c</literal> die aktuelle Version "
+"des Paketes ist, <literal>d.e.f</literal> die Version ist, die zur "
+"Installation vorgesehen ist und <literal>x.y.z</literal> eine neuere Version "
+"ist, die aber nicht zur Installation vorgesehen ist (aufgrund einer "
+"niedrigen Pinning-Bewertung). Die letzten beiden können weggelassen werden, "
+"wenn es keine gibt oder wenn sie die gleiche Version haben, wie die, die "
+"installiert ist. <literal>section</literal> ist der Name des Abschnitts, in "
+"dem das Paket erscheint."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1062
+#: apt.conf.5.xml:1061
msgid ""
"When invoking &dpkg;, output the precise command line with which it is being "
"invoked, with arguments separated by a single space character."
@@ -5069,7 +5072,7 @@ msgstr ""
"sind, aus."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1073
+#: apt.conf.5.xml:1072
msgid ""
"Output all the data received from &dpkg; on the status file descriptor and "
"any errors encountered while parsing it."
@@ -5078,7 +5081,7 @@ msgstr ""
"und alle während deren Auswertung gefundenen Fehler aus."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1084
+#: apt.conf.5.xml:1083
msgid ""
"Generate a trace of the algorithm that decides the order in which "
"<literal>apt</literal> should pass packages to &dpkg;."
@@ -5088,7 +5091,7 @@ msgstr ""
"soll."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1096
+#: apt.conf.5.xml:1095
msgid ""
"Output status messages tracing the steps performed when invoking &dpkg;."
msgstr ""
@@ -5096,12 +5099,12 @@ msgstr ""
"von &dpkg; ausgeführt werden."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1107
+#: apt.conf.5.xml:1106
msgid "Output the priority of each package list on startup."
msgstr "gibt die Priorität jeder Paketliste beim Start aus."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1117
+#: apt.conf.5.xml:1116
msgid ""
"Trace the execution of the dependency resolver (this applies only to what "
"happens when a complex dependency problem is encountered)."
@@ -5111,7 +5114,7 @@ msgstr ""
"aufgetreten ist)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1128
+#: apt.conf.5.xml:1127
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 "
@@ -5123,7 +5126,7 @@ msgstr ""
"Marker</literal> beschrieben."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1140
+#: apt.conf.5.xml:1139
msgid ""
"Print information about the vendors read from <filename>/etc/apt/vendors."
"list</filename>."
@@ -5132,13 +5135,13 @@ msgstr ""
"filename> gelesenen Anbieter aus."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1162 apt_preferences.5.xml:545 sources.list.5.xml:211
+#: apt.conf.5.xml:1161 apt_preferences.5.xml:545 sources.list.5.xml:211
#: apt-ftparchive.1.xml:596
msgid "Examples"
msgstr "Beispiele"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1163
+#: apt.conf.5.xml:1162
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
@@ -5148,7 +5151,7 @@ msgstr ""
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1175
+#: apt.conf.5.xml:1174
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
@@ -6301,9 +6304,9 @@ msgid ""
"id=\"0\"/>"
msgstr ""
"Mit einer geeigneten &sources-list;-Datei und der obigen Einstellungsdatei "
-"wird jeder der folgenden Befehle APT veranlassen, ein Upgrade auf die neuste"
-"(n) <literal>stable</literal>-Version(en) durchzuführen. <placeholder type="
-"\"programlisting\" id=\"0\"/>"
+"wird jeder der folgenden Befehle APT veranlassen, ein Upgrade auf die "
+"neuste(n) <literal>stable</literal>-Version(en) durchzuführen. <placeholder "
+"type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#: apt_preferences.5.xml:584
@@ -6384,9 +6387,9 @@ msgid ""
"id=\"0\"/>"
msgstr ""
"Mit einer geeigneten &sources-list;-Datei und der obigen Einstellungsdatei "
-"wird jeder der folgenden Befehle APT veranlassen, ein Upgrade auf die neuste"
-"(n) <literal>testing</literal>-Version(en) durchzuführen. <placeholder type="
-"\"programlisting\" id=\"0\"/>"
+"wird jeder der folgenden Befehle APT veranlassen, ein Upgrade auf die "
+"neuste(n) <literal>testing</literal>-Version(en) durchzuführen. <placeholder "
+"type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#: apt_preferences.5.xml:633
@@ -6489,8 +6492,8 @@ msgid ""
"<placeholder type=\"programlisting\" id=\"0\"/>"
msgstr ""
"Mit einer geeigneten &sources-list;-Datei und der obigen Einstellungsdatei "
-"wird jeder der folgenden Befehle APT veranlassen, ein Upgrade auf die letzte"
-"(n) Version(en) im Release mit Codenamen <literal>&testing-codename;</"
+"wird jeder der folgenden Befehle APT veranlassen, ein Upgrade auf die "
+"letzte(n) Version(en) im Release mit Codenamen <literal>&testing-codename;</"
"literal> durchzuführen. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
@@ -6658,13 +6661,13 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:92
msgid ""
-"<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)"
-"</literal> which expands to the Debian architecture (such as <literal>amd64</"
-"literal> or <literal>armel</literal>) used on the system. This permits "
-"architecture-independent <filename>sources.list</filename> files to be used. "
-"In general this is only of interest when specifying an exact path, "
-"<literal>APT</literal> will automatically generate a URI with the current "
-"architecture otherwise."
+"<literal>distribution</literal> may also contain a variable, <literal>"
+"$(ARCH)</literal> which expands to the Debian architecture (such as "
+"<literal>amd64</literal> or <literal>armel</literal>) used on the system. "
+"This permits architecture-independent <filename>sources.list</filename> "
+"files to be used. In general this is only of interest when specifying an "
+"exact path, <literal>APT</literal> will automatically generate a URI with "
+"the current architecture otherwise."
msgstr ""
"<literal>distribution</literal> könnte außerdem eine Variable, <literal>"
"$(ARCH)</literal>, enthalten, die zur Debian-Architektur (wie "
@@ -8183,9 +8186,9 @@ msgstr "BESCHREIBUNG"
#: apt.8:31
msgid ""
"APT is a management system for software packages. For normal day to day "
-"package management there are several frontends available, such as B<aptitude>"
-"(8) for the command line or B<synaptic>(8) for the X Window System. Some "
-"options are only implemented in B<apt-get>(8) though."
+"package management there are several frontends available, such as "
+"B<aptitude>(8) for the command line or B<synaptic>(8) for the X Window "
+"System. Some options are only implemented in B<apt-get>(8) though."
msgstr ""
"APT ist ein Verwaltungssystem für Softwarepakete. Für normale alltägliche "
"Paketverwaltung sind mehrere Oberflächen, wie B<aptitude>(8) für die "
@@ -8770,9 +8773,9 @@ msgstr ""
"Bevor sie beginnen, <prgn>dselect</prgn> zu benutzen, ist es notwendig, die "
"Verfügbarkeitsliste zu aktualisieren, indem sie aus dem Menü [E]rneuern "
"auswählen. Dies ist eine Obermenge von <tt>apt-get update</tt>, das "
-"<prgn>dselect</prgn> heruntergeladene Informationen zur Verfügung stellt. [E]"
-"rneuern muss auch dann durchgeführt werden, wenn vorher <tt>apt-get update</"
-"tt> ausgeführt wurde."
+"<prgn>dselect</prgn> heruntergeladene Informationen zur Verfügung stellt. "
+"[E]rneuern muss auch dann durchgeführt werden, wenn vorher <tt>apt-get "
+"update</tt> ausgeführt wurde."
#. type: <p></p>
#: guide.sgml:253
diff --git a/doc/po/es.po b/doc/po/es.po
index bfdfd6372..a6fbc5da2 100644
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -38,7 +38,11 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.9.7.1\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
+<<<<<<< HEAD
"POT-Creation-Date: 2013-04-30 10:29+0300\n"
+=======
+"POT-Creation-Date: 2013-06-13 13:46+0300\n"
+>>>>>>> upstream/debian/sid
"PO-Revision-Date: 2012-07-14 12:21+0200\n"
"Last-Translator: Omar Campagne <ocampagne@gmail.com>\n"
"Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -848,9 +852,9 @@ msgid ""
"installation or upgrading. Each package is a package name, not a fully "
"qualified filename (for instance, in a Debian system, <package>apt-utils</"
"package> would be the argument provided, not <filename>apt-utils_&apt-"
-"product-version;_amd64.deb</filename>). All packages required by the package"
-"(s) specified for installation will also be retrieved and installed. The "
-"<filename>/etc/apt/sources.list</filename> file is used to locate the "
+"product-version;_amd64.deb</filename>). All packages required by the "
+"package(s) specified for installation will also be retrieved and installed. "
+"The <filename>/etc/apt/sources.list</filename> file is used to locate the "
"desired packages. If a hyphen is appended to the package name (with no "
"intervening space), the identified package will be removed if it is "
"installed. Similarly a plus sign can be used to designate a package to "
@@ -1619,14 +1623,14 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:518 apt-cache.8.xml:343 apt-key.8.xml:174 apt-mark.8.xml:125
-#: apt.conf.5.xml:1168 apt_preferences.5.xml:698
+#: apt.conf.5.xml:1167 apt_preferences.5.xml:698
msgid "Files"
msgstr "Ficheros"
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131
#: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109
-#: apt.conf.5.xml:1174 apt_preferences.5.xml:705 sources.list.5.xml:252
+#: apt.conf.5.xml:1173 apt_preferences.5.xml:705 sources.list.5.xml:252
#: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63
#: apt-ftparchive.1.xml:607
msgid "See Also"
@@ -3335,15 +3339,14 @@ msgstr "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
#. type: Content of: <refentry><refsect1><para>
#: apt.conf.5.xml:101
msgid ""
-"In general the sample configuration file in <filename>&docdir;examples/apt."
-"conf</filename> &configureindex; is a good guide for how it should look."
+"In general the sample configuration file &configureindex; is a good guide "
+"for how it should look."
msgstr ""
-"En general, el fichero de configuración de ejemplo <filename>&docdir;"
-"examples/apt.conf</filename> &configureindex; es una buena guía para "
-"entender su aspecto."
+"En general, el fichero de configuración de ejemplo &configureindex; es una "
+"buena guía para entender su aspecto."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:105
+#: apt.conf.5.xml:104
msgid ""
"Case is not significant in names of configuration items, so in the previous "
"example you could use <literal>dpkg::pre-install-pkgs</literal>."
@@ -3353,7 +3356,7 @@ msgstr ""
"<literal>dpkg::pre-install-pkgs</literal>."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:108
+#: apt.conf.5.xml:107
msgid ""
"Names for the configuration items are optional if a list is defined as can "
"be seen in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. If "
@@ -3368,7 +3371,7 @@ msgstr ""
"cualquier otra opción reasignando un nuevo valor a la opción."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:113
+#: apt.conf.5.xml:112
msgid ""
"Two special commands are defined: <literal>#include</literal> (which is "
"deprecated and not supported by alternative implementations) and "
@@ -3388,7 +3391,7 @@ msgstr ""
"acabar con punto y coma)."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:123
+#: apt.conf.5.xml:122
msgid ""
"The <literal>#clear</literal> command is the only way to delete a list or a "
"complete scope. Reopening a scope (or using the syntax described below with "
@@ -3404,7 +3407,7 @@ msgstr ""
"los ámbitos no se pueden redefinir, sólo eliminar."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:131
+#: apt.conf.5.xml:130
msgid ""
"All of the APT tools take an -o option which allows an arbitrary "
"configuration directive to be specified on the command line. The syntax is a "
@@ -3423,7 +3426,7 @@ msgstr ""
"sintaxis de ámbitos en la línea de órdenes)."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:139
+#: apt.conf.5.xml:138
msgid ""
"Note that appending items to a list using <literal>::</literal> only works "
"for one item per line, and that you should not use it in combination with "
@@ -3453,12 +3456,12 @@ msgstr ""
"declaraciones ahora que APT no muestra fallos de forma explícita."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:154
+#: apt.conf.5.xml:153
msgid "The APT Group"
msgstr "El grupo APT"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:155
+#: apt.conf.5.xml:154
msgid ""
"This group of options controls general APT behavior as well as holding the "
"options for all of the tools."
@@ -3467,7 +3470,7 @@ msgstr ""
"mantiene las opciones para todas las herramientas."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:160
+#: apt.conf.5.xml:159
msgid ""
"System Architecture; sets the architecture to use when fetching files and "
"parsing package lists. The internal default is the architecture apt was "
@@ -3478,7 +3481,7 @@ msgstr ""
"arquitectura para la que apt se compiló."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:167
+#: apt.conf.5.xml:166
msgid ""
"All Architectures the system supports. For instance, CPUs implementing the "
"<literal>amd64</literal> (also called <literal>x86-64</literal>) "
@@ -3500,7 +3503,7 @@ msgstr ""
"add-architecture</command>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:180
+#: apt.conf.5.xml:179
msgid ""
"Default release to install packages from if more than one version is "
"available. Contains release name, codename or release version. Examples: "
@@ -3514,7 +3517,7 @@ msgstr ""
"«5.0*». Consulte también &apt-preferences;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:186
+#: apt.conf.5.xml:185
msgid ""
"Ignore held packages; this global option causes the problem resolver to "
"ignore held packages in its decision making."
@@ -3523,7 +3526,7 @@ msgstr ""
"problemas ignore los paquetes retenidos en la toma de decisiones."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:191
+#: apt.conf.5.xml:190
msgid ""
"Defaults to on. When turned on the autoclean feature will remove any "
"packages which can no longer be downloaded from the cache. If turned off "
@@ -3537,7 +3540,7 @@ msgstr ""
"mecanismo directo para reinstalarlos."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:199
+#: apt.conf.5.xml:198
msgid ""
"Defaults to on, which will cause APT to install essential and important "
"packages as soon as possible in an install/upgrade operation, in order to "
@@ -3564,7 +3567,7 @@ msgstr ""
"del paquete A, ya que no se satisface la dependencia sobre éste."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:211
+#: apt.conf.5.xml:210
msgid ""
"The immediate configuration marker is also applied in the potentially "
"problematic case of circular dependencies, since a dependency with the "
@@ -3593,7 +3596,7 @@ msgstr ""
"anteriormente."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:224
+#: apt.conf.5.xml:223
msgid ""
"Before a big operation like <literal>dist-upgrade</literal> is run with this "
"option disabled you should try to explicitly <literal>install</literal> the "
@@ -3610,7 +3613,7 @@ msgstr ""
"para que así pueden mejorar y corregir el proceso de actualización."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:235
+#: apt.conf.5.xml:234
msgid ""
"Never enable this option unless you <emphasis>really</emphasis> know what "
"you are doing. It permits APT to temporarily remove an essential package to "
@@ -3631,7 +3634,7 @@ msgstr ""
"sobre la que estos paquetes dependen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:247
+#: apt.conf.5.xml:246
msgid ""
"APT uses since version 0.7.26 a resizable memory mapped cache file to store "
"the available information. <literal>Cache-Start</literal> acts as a hint of "
@@ -3668,14 +3671,14 @@ msgstr ""
"desactiva el crecimiento automático de la caché."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:263
+#: apt.conf.5.xml:262
msgid "Defines which packages are considered essential build dependencies."
msgstr ""
"Define los paquetes que se consideran dependencias de construcción "
"esenciales."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:267
+#: apt.conf.5.xml:266
msgid ""
"The Get subsection controls the &apt-get; tool; please see its documentation "
"for more information about the options here."
@@ -3684,7 +3687,7 @@ msgstr ""
"documentación para más información sobre esta opción."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:272
+#: apt.conf.5.xml:271
msgid ""
"The Cache subsection controls the &apt-cache; tool; please see its "
"documentation for more information about the options here."
@@ -3693,7 +3696,7 @@ msgstr ""
"documentación para más información sobre esta opción."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:277
+#: apt.conf.5.xml:276
msgid ""
"The CDROM subsection controls the &apt-cdrom; tool; please see its "
"documentation for more information about the options here."
@@ -3702,12 +3705,12 @@ msgstr ""
"documentación para más información sobre esta opción."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:283
+#: apt.conf.5.xml:282
msgid "The Acquire Group"
msgstr "El grupo Acquire"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:284
+#: apt.conf.5.xml:283
msgid ""
"The <literal>Acquire</literal> group of options controls the download of "
"packages as well as the various \"acquire methods\" responsible for the "
@@ -3718,7 +3721,7 @@ msgstr ""
"sí mismo (consulte también &sources-list;)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:291
+#: apt.conf.5.xml:290
msgid ""
"Security related option defaulting to true, as giving a Release file's "
"validation an expiration date prevents replay attacks over a long timescale, "
@@ -3739,7 +3742,7 @@ msgstr ""
"utilizar la opción <literal>Max-ValidTime</literal> a continuación."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:304
+#: apt.conf.5.xml:303
msgid ""
"Maximum time (in seconds) after its creation (as indicated by the "
"<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3758,7 +3761,7 @@ msgstr ""
"se pueden realizar añadiendo la etiqueta del archivo al nombre de opción."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:316
+#: apt.conf.5.xml:315
msgid ""
"Minimum time (in seconds) after its creation (as indicated by the "
"<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3778,7 +3781,7 @@ msgstr ""
"y deben utilizar añadiendo la etiqueta del archivo al nombre de opción."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:328
+#: apt.conf.5.xml:327
msgid ""
"Try to download deltas called <literal>PDiffs</literal> for indexes (like "
"<filename>Packages</filename> files) instead of downloading whole ones. True "
@@ -3789,7 +3792,7 @@ msgstr ""
"enteros. Su valor predeterminado es «true»."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:331
+#: apt.conf.5.xml:330
msgid ""
"Two sub-options to limit the use of PDiffs are also available: "
"<literal>FileLimit</literal> can be used to specify a maximum number of "
@@ -3807,7 +3810,7 @@ msgstr ""
"parches."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:341
+#: apt.conf.5.xml:340
msgid ""
"Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
"literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -3822,7 +3825,7 @@ msgstr ""
"se abrirá una conexión por cada tipo de URI."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:349
+#: apt.conf.5.xml:348
msgid ""
"Number of retries to perform. If this is non-zero APT will retry failed "
"files the given number of times."
@@ -3831,7 +3834,7 @@ msgstr ""
"intentar obtener los ficheros fallidos el número de veces proporcionado."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:354
+#: apt.conf.5.xml:353
msgid ""
"Use symlinks for source archives. If set to true then source archives will "
"be symlinked when possible instead of copying. True is the default."
@@ -3841,7 +3844,7 @@ msgstr ""
"«true» de forma predeterminada."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:359
+#: apt.conf.5.xml:358
msgid ""
"<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. "
"It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</"
@@ -3861,7 +3864,7 @@ msgstr ""
"opciones anteriores."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:367
+#: apt.conf.5.xml:366
msgid ""
"Three settings are provided for cache control with HTTP/1.1 compliant proxy "
"caches. <literal>No-Cache</literal> tells the proxy not to use its cached "
@@ -3880,7 +3883,7 @@ msgstr ""
"impedir que el proxy contamine la caché con ficheros «.deb» (de gran tamaño)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:377 apt.conf.5.xml:449
+#: apt.conf.5.xml:376 apt.conf.5.xml:448
msgid ""
"The option <literal>timeout</literal> sets the timeout timer used by the "
"method; this value applies to the connection as well as the data timeout."
@@ -3890,7 +3893,7 @@ msgstr ""
"y a la recepción de datos."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:380
+#: apt.conf.5.xml:379
msgid ""
"The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
"enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e."
@@ -3910,7 +3913,7 @@ msgstr ""
"cumplir la especificación HTTP/1.1."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:387
+#: apt.conf.5.xml:386
msgid ""
"<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
"follow redirects, which is enabled by default."
@@ -3919,7 +3922,7 @@ msgstr ""
"redirección; activado por omisión."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:390
+#: apt.conf.5.xml:389
msgid ""
"The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
"literal> which accepts integer values in kilobytes. The default value is 0 "
@@ -3934,7 +3937,7 @@ msgstr ""
"implícitamente la descarga simultánea desde varios servidores)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:395
+#: apt.conf.5.xml:394
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 "
@@ -3945,7 +3948,7 @@ msgstr ""
"permiten el acceso para clientes que usan un identificador conocido."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:403
+#: apt.conf.5.xml:402
msgid ""
"The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
"<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
@@ -3962,7 +3965,7 @@ msgstr ""
"<literal>Pipeline-Depth</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:411
+#: apt.conf.5.xml:410
msgid ""
"<literal>CaInfo</literal> suboption specifies place of file that holds info "
"about trusted certificates. <literal>&lt;host&gt;::CaInfo</literal> is the "
@@ -4002,7 +4005,7 @@ msgstr ""
"SslForceVersion</literal> es la opción correspondiente para cada servidor."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:432
+#: apt.conf.5.xml:431
msgid ""
"<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs. "
"It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</"
@@ -4035,7 +4038,7 @@ msgstr ""
"<literal>$(SITE)</literal> y <literal>$(SITE_PORT)</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:452
+#: apt.conf.5.xml:451
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, "
@@ -4052,7 +4055,7 @@ msgstr ""
"ejemplos)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:459
+#: apt.conf.5.xml:458
msgid ""
"It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
"envar> environment variable to an HTTP URL - see the discussion of the http "
@@ -4066,7 +4069,7 @@ msgstr ""
"a su poca eficiencia."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:464
+#: apt.conf.5.xml:463
msgid ""
"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -4082,13 +4085,13 @@ msgstr ""
"compatibles con la RFC 2428."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:478
+#: apt.conf.5.xml:477
#, no-wrap
msgid "/cdrom/::Mount \"foo\";"
msgstr "/cdrom/::Mount \"algo\";"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:473
+#: apt.conf.5.xml:472
msgid ""
"For URIs using the <literal>cdrom</literal> method, the only configurable "
"option is the mount point, <literal>cdrom::Mount</literal>, which must be "
@@ -4110,7 +4113,7 @@ msgstr ""
"especificar órdenes para desmontar mediante UMount."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:486
+#: apt.conf.5.xml:485
msgid ""
"For GPGV URIs the only configurable option is <literal>gpgv::Options</"
"literal>, which passes additional parameters to gpgv."
@@ -4119,13 +4122,13 @@ msgstr ""
"Options</literal>, que introduce parámetros adicionales a gpgv."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:497
+#: apt.conf.5.xml:496
#, no-wrap
msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
msgstr "Acquire::CompressionTypes::<replaceable>extensión-del-fichero</replaceable> \"<replaceable>nombre-del-método</replaceable>\";"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:492
+#: apt.conf.5.xml:491
msgid ""
"List of compression types which are understood by the acquire methods. "
"Files like <filename>Packages</filename> can be available in various "
@@ -4145,19 +4148,19 @@ msgstr ""
"\"0\"/>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:502
+#: apt.conf.5.xml:501
#, no-wrap
msgid "Acquire::CompressionTypes::Order:: \"gz\";"
msgstr "Acquire::CompressionTypes::Order:: \"gz\";"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:505
+#: apt.conf.5.xml:504
#, no-wrap
msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:498
+#: apt.conf.5.xml:497
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 "
@@ -4189,13 +4192,13 @@ msgstr ""
"explícita ya que se añadirá de forma automática."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:511
#, no-wrap
msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:507
+#: apt.conf.5.xml:506
msgid ""
"Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></"
"literal> will be checked at run time. If this option has been set, the "
@@ -4220,7 +4223,7 @@ msgstr ""
"omite la lista definida, simplemente prefija la lista con este tipo."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:517
+#: apt.conf.5.xml:516
msgid ""
"The special type <literal>uncompressed</literal> can be used to give "
"uncompressed files a preference, but note that most archives don't provide "
@@ -4232,7 +4235,7 @@ msgstr ""
"así que habitualmente esto solo sirve con réplicas locales."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:524
+#: apt.conf.5.xml:523
msgid ""
"When downloading <literal>gzip</literal> compressed indexes (Packages, "
"Sources, or Translations), keep them gzip compressed locally instead of "
@@ -4246,7 +4249,7 @@ msgstr ""
"paquetes locales. El valor predeterminado es «false»."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:532
+#: apt.conf.5.xml:531
msgid ""
"The Languages subsection controls which <filename>Translation</filename> "
"files are downloaded and in which order APT tries to display the description-"
@@ -4265,13 +4268,13 @@ msgstr ""
"idioma (especialmente para los códigos de idioma largos)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:549
+#: apt.conf.5.xml:548
#, no-wrap
msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; }"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:537
+#: apt.conf.5.xml:536
msgid ""
"The default list includes \"environment\" and \"en\". "
"\"<literal>environment</literal>\" has a special meaning here: it will be "
@@ -4310,7 +4313,7 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:550
+#: apt.conf.5.xml:549
msgid ""
"Note: To prevent problems resulting from APT being executed in different "
"environments (e.g. by different users or by other programs) all Translation "
@@ -4324,22 +4327,22 @@ msgstr ""
"implícito)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:559
+#: apt.conf.5.xml:558
msgid "When downloading, force to use only the IPv4 protocol."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:565
+#: apt.conf.5.xml:564
msgid "When downloading, force to use only the IPv6 protocol."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:572
+#: apt.conf.5.xml:571
msgid "Directories"
msgstr "Directorios"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:574
+#: apt.conf.5.xml:573
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
"local state information. <literal>lists</literal> is the directory to place "
@@ -4360,7 +4363,7 @@ msgstr ""
"filename> ó <filename>./</filename>."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:581
+#: apt.conf.5.xml:580
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -4382,7 +4385,7 @@ msgstr ""
"directorio predeterminado está en <literal>Dir::Cache</literal>"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:590
+#: apt.conf.5.xml:589
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
"<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4398,7 +4401,7 @@ msgstr ""
"<envar>APT_CONFIG</envar>)."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:596
+#: apt.conf.5.xml:595
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 "
@@ -4409,7 +4412,7 @@ msgstr ""
"Al finalizar este proceso carga el fichero de configuración principal."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:600
+#: apt.conf.5.xml:599
msgid ""
"Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
"Bin::Methods</literal> specifies the location of the method handlers and "
@@ -4426,7 +4429,7 @@ msgstr ""
"literal> especifican la ubicación de sus respectivos programas."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:608
+#: apt.conf.5.xml:607
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
"set, all paths in <literal>Dir::</literal> will be relative to "
@@ -4447,7 +4450,7 @@ msgstr ""
"staging/var/lib/dpkg/status</filename>."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:621
+#: apt.conf.5.xml:620
msgid ""
"The <literal>Ignore-Files-Silently</literal> list can be used to specify "
"which files APT should silently ignore while parsing the files in the "
@@ -4465,12 +4468,12 @@ msgstr ""
"de expresiones regulares."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:630
+#: apt.conf.5.xml:629
msgid "APT in DSelect"
msgstr "APT con DSelect"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:632
+#: apt.conf.5.xml:631
msgid ""
"When APT is used as a &dselect; method several configuration directives "
"control the default behavior. These are in the <literal>DSelect</literal> "
@@ -4481,7 +4484,7 @@ msgstr ""
"encuentran en la sección <literal>DSelect</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:637
+#: apt.conf.5.xml:636
msgid ""
"Cache Clean mode; this value may be one of <literal>always</literal>, "
"<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
@@ -4503,7 +4506,7 @@ msgstr ""
"realiza esta acción antes de descargar paquetes nuevos."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:651
+#: apt.conf.5.xml:650
msgid ""
"The contents of this variable are passed to &apt-get; as command line "
"options when it is run for the install phase."
@@ -4512,7 +4515,7 @@ msgstr ""
"la línea de ordenes al ejecutar la fase de instalación."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:656
+#: apt.conf.5.xml:655
msgid ""
"The contents of this variable are passed to &apt-get; as command line "
"options when it is run for the update phase."
@@ -4521,7 +4524,7 @@ msgstr ""
"la línea de ordenes al ejecutar la fase de actualización."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:661
+#: apt.conf.5.xml:660
msgid ""
"If true the [U]pdate operation in &dselect; will always prompt to continue. "
"The default is to prompt only on error."
@@ -4531,12 +4534,12 @@ msgstr ""
"preguntará en caso de error."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:667
+#: apt.conf.5.xml:666
msgid "How APT calls &dpkg;"
msgstr "Invocación de APT a dpkg"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:668
+#: apt.conf.5.xml:667
msgid ""
"Several configuration directives control how APT invokes &dpkg;. These are "
"in the <literal>DPkg</literal> section."
@@ -4545,7 +4548,7 @@ msgstr ""
"se encuentran en la sección <literal>DPkg</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:673
+#: apt.conf.5.xml:672
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 "
@@ -4556,7 +4559,7 @@ msgstr ""
"introduce a &dpkg; como un sólo argumento."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:679
+#: apt.conf.5.xml:678
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 "
@@ -4569,7 +4572,7 @@ msgstr ""
"sh</filename>; en caso de fallo, APT cancela la acción."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:686
+#: apt.conf.5.xml:685
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 "
@@ -4585,7 +4588,7 @@ msgstr ""
"la entrada estándar."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:692
+#: apt.conf.5.xml:691
msgid ""
"Version 2 of this protocol dumps more information, including the protocol "
"version, the APT configuration space and the packages, files and versions "
@@ -4601,7 +4604,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:700
+#: apt.conf.5.xml:699
msgid ""
"APT chdirs to this directory before invoking &dpkg;, the default is "
"<filename>/</filename>."
@@ -4610,7 +4613,7 @@ msgstr ""
"predeterminado es <filename>/</filename>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:705
+#: apt.conf.5.xml:704
msgid ""
"These options are passed to &dpkg-buildpackage; when compiling packages; the "
"default is to disable signing and produce all binaries."
@@ -4620,12 +4623,12 @@ msgstr ""
"paquetes y a producir todos los binarios."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:710
+#: apt.conf.5.xml:709
msgid "dpkg trigger usage (and related options)"
msgstr "Uso del disparador de dpkg (y de las opciones relacionadas)"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:711
+#: apt.conf.5.xml:710
msgid ""
"APT can call &dpkg; in such a way as to let it make aggressive use of "
"triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
@@ -4652,7 +4655,7 @@ msgstr ""
"tiempo (o más) durante la configuración de todos los paquetes."
#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:726
+#: apt.conf.5.xml:725
#, no-wrap
msgid ""
"DPkg::NoTriggers \"true\";\n"
@@ -4666,7 +4669,7 @@ msgstr ""
"DPkg::TriggersPending \"true\";"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:720
+#: apt.conf.5.xml:719
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 "
@@ -4690,7 +4693,7 @@ msgstr ""
"type=\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:733
+#: apt.conf.5.xml:732
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 "
@@ -4713,7 +4716,7 @@ msgstr ""
"eliminación."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:741
+#: apt.conf.5.xml:740
msgid ""
"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
"and \"<literal>no</literal>\". The default value is \"<literal>all</literal>"
@@ -4743,7 +4746,7 @@ msgstr ""
"imposibilidad de arrancar el sistema. "
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:756
+#: apt.conf.5.xml:755
msgid ""
"If this option is set APT will call <command>dpkg --configure --pending</"
"command> to let &dpkg; handle all required configurations and triggers. This "
@@ -4761,7 +4764,7 @@ msgstr ""
"desactivar esta opción en todas las ejecuciones menos la última."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:763
+#: apt.conf.5.xml:762
msgid ""
"Useful for the <literal>smart</literal> configuration as a package which has "
"pending triggers is not considered as <literal>installed</literal>, and "
@@ -4777,7 +4780,7 @@ msgstr ""
"los disparadores necesarios para configurar este paquete."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:776
+#: apt.conf.5.xml:775
#, no-wrap
msgid ""
"OrderList::Score {\n"
@@ -4795,7 +4798,7 @@ msgstr ""
"};"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:769
+#: apt.conf.5.xml:768
msgid ""
"Essential packages (and their dependencies) should be configured immediately "
"after unpacking. It is a good idea to do this quite early in the upgrade "
@@ -4820,12 +4823,12 @@ msgstr ""
"<placeholder type=\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:789
+#: apt.conf.5.xml:788
msgid "Periodic and Archives options"
msgstr "Las opciones «Periodic» y «Archives»"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:790
+#: apt.conf.5.xml:789
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by the "
@@ -4839,12 +4842,12 @@ msgstr ""
"documentación de estas opciones."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:798
+#: apt.conf.5.xml:797
msgid "Debug options"
msgstr "Opciones de depuración"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:800
+#: apt.conf.5.xml:799
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -4861,7 +4864,7 @@ msgstr ""
"para un usuario normal, aunque unas cuantas sí son:"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:811
+#: apt.conf.5.xml:810
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -4872,7 +4875,7 @@ msgstr ""
"purge</literal>."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:819
+#: apt.conf.5.xml:818
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s install</"
@@ -4883,7 +4886,7 @@ msgstr ""
"<literal>apt-get -s install</literal>) como un usuario normal."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:828
+#: apt.conf.5.xml:827
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -4895,7 +4898,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:836
+#: apt.conf.5.xml:835
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
"in CD-ROM IDs."
@@ -4904,14 +4907,14 @@ msgstr ""
"statfs en los identificadores de los discos ópticos."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:846
+#: apt.conf.5.xml:845
msgid "A full list of debugging options to apt follows."
msgstr ""
"A continuación, se muestra la lista completa de las opciones de depuración "
"de apt."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:855
+#: apt.conf.5.xml:854
msgid ""
"Print information related to accessing <literal>cdrom://</literal> sources."
msgstr ""
@@ -4919,26 +4922,26 @@ msgstr ""
"<literal>cdrom://</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:866
+#: apt.conf.5.xml:865
msgid "Print information related to downloading packages using FTP."
msgstr ""
"Muestra la información relacionada con la descarga de paquetes mediante FTP."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:877
+#: apt.conf.5.xml:876
msgid "Print information related to downloading packages using HTTP."
msgstr ""
"Muestra la información relacionada con la descarga de paquetes mediante HTTP."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:888
+#: apt.conf.5.xml:887
msgid "Print information related to downloading packages using HTTPS."
msgstr ""
"Muestra la información relacionada con la descarga de paquetes mediante "
"HTTPS."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:899
+#: apt.conf.5.xml:898
msgid ""
"Print information related to verifying cryptographic signatures using "
"<literal>gpg</literal>."
@@ -4947,7 +4950,7 @@ msgstr ""
"criptográficas mediante <literal>gpg</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:910
+#: apt.conf.5.xml:909
msgid ""
"Output information about the process of accessing collections of packages "
"stored on CD-ROMs."
@@ -4956,14 +4959,14 @@ msgstr ""
"paquetes almacenadas en CD-ROM."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:920
+#: apt.conf.5.xml:919
msgid "Describes the process of resolving build-dependencies in &apt-get;."
msgstr ""
"Describe el proceso de resolución de dependencias de compilación en &apt-"
"get;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:930
+#: apt.conf.5.xml:929
msgid ""
"Output each cryptographic hash that is generated by the <literal>apt</"
"literal> libraries."
@@ -4972,7 +4975,7 @@ msgstr ""
"<literal>apt</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:940
+#: apt.conf.5.xml:939
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 "
@@ -4983,7 +4986,7 @@ msgstr ""
"identificador de un CD-ROM."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:951
+#: apt.conf.5.xml:950
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."
@@ -4993,14 +4996,14 @@ msgstr ""
"a la vez."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:963
+#: apt.conf.5.xml:962
msgid "Log when items are added to or removed from the global download queue."
msgstr ""
"Registra los elementos que se añaden o se borran de la cola de descarga "
"global."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:973
+#: apt.conf.5.xml:972
msgid ""
"Output status messages and errors related to verifying checksums and "
"cryptographic signatures of downloaded files."
@@ -5010,7 +5013,7 @@ msgstr ""
"ficheros descargados."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:983
+#: apt.conf.5.xml:982
msgid ""
"Output information about downloading and applying package index list diffs, "
"and errors relating to package index list diffs."
@@ -5019,7 +5022,7 @@ msgstr ""
"lista de índices de paquetes, y los errores relacionados con éstos."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:995
+#: apt.conf.5.xml:994
msgid ""
"Output information related to patching apt package lists when downloading "
"index diffs instead of full indices."
@@ -5029,7 +5032,7 @@ msgstr ""
"índices completos."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1006
+#: apt.conf.5.xml:1005
msgid ""
"Log all interactions with the sub-processes that actually perform downloads."
msgstr ""
@@ -5037,7 +5040,7 @@ msgstr ""
"descargas."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1017
+#: apt.conf.5.xml:1016
msgid ""
"Log events related to the automatically-installed status of packages and to "
"the removal of unused packages."
@@ -5046,7 +5049,7 @@ msgstr ""
"de los paquetes y con la eliminación de los paquetes sin usar."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1027
+#: apt.conf.5.xml:1026
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial auto-"
@@ -5062,7 +5065,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1041
+#: apt.conf.5.xml:1040
msgid ""
"Generate debug messages describing which packages are marked as keep/install/"
"remove while the ProblemResolver does his work. Each addition or deletion "
@@ -5093,7 +5096,7 @@ msgstr ""
"la sección en la que aparece el paquete."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1062
+#: apt.conf.5.xml:1061
msgid ""
"When invoking &dpkg;, output the precise command line with which it is being "
"invoked, with arguments separated by a single space character."
@@ -5102,7 +5105,7 @@ msgstr ""
"invocó, con los argumentos separados por un espacio."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1073
+#: apt.conf.5.xml:1072
msgid ""
"Output all the data received from &dpkg; on the status file descriptor and "
"any errors encountered while parsing it."
@@ -5111,7 +5114,7 @@ msgstr ""
"estado y cualquier error encontrado durante el análisis."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1084
+#: apt.conf.5.xml:1083
msgid ""
"Generate a trace of the algorithm that decides the order in which "
"<literal>apt</literal> should pass packages to &dpkg;."
@@ -5120,7 +5123,7 @@ msgstr ""
"literal> debería entregar los paquetes a &dpkg;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1096
+#: apt.conf.5.xml:1095
msgid ""
"Output status messages tracing the steps performed when invoking &dpkg;."
msgstr ""
@@ -5128,12 +5131,12 @@ msgstr ""
"&dpkg;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1107
+#: apt.conf.5.xml:1106
msgid "Output the priority of each package list on startup."
msgstr "Muestra la prioridad de cada lista de paquetes al iniciarse."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1117
+#: apt.conf.5.xml:1116
msgid ""
"Trace the execution of the dependency resolver (this applies only to what "
"happens when a complex dependency problem is encountered)."
@@ -5142,7 +5145,7 @@ msgstr ""
"lo que ocurre cuando se encuentra un problema de dependencias complejo)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1128
+#: apt.conf.5.xml:1127
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 "
@@ -5153,7 +5156,7 @@ msgstr ""
"misma que la descrita en <literal>Debug::pkgDepCache::Marker</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1140
+#: apt.conf.5.xml:1139
msgid ""
"Print information about the vendors read from <filename>/etc/apt/vendors."
"list</filename>."
@@ -5162,13 +5165,13 @@ msgstr ""
"vendors.list</filename>."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1162 apt_preferences.5.xml:545 sources.list.5.xml:211
+#: apt.conf.5.xml:1161 apt_preferences.5.xml:545 sources.list.5.xml:211
#: apt-ftparchive.1.xml:596
msgid "Examples"
msgstr "Ejemplos"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1163
+#: apt.conf.5.xml:1162
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
@@ -5178,7 +5181,7 @@ msgstr ""
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1175
+#: apt.conf.5.xml:1174
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
@@ -6681,18 +6684,18 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:92
msgid ""
-"<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)"
-"</literal> which expands to the Debian architecture (such as <literal>amd64</"
-"literal> or <literal>armel</literal>) used on the system. This permits "
-"architecture-independent <filename>sources.list</filename> files to be used. "
-"In general this is only of interest when specifying an exact path, "
-"<literal>APT</literal> will automatically generate a URI with the current "
-"architecture otherwise."
-msgstr ""
-"<literal>distribución</literal> puede contener una variable, <literal>$(ARCH)"
-"</literal>, que se expandirá a la arquitectura de Debian usada en el sistema "
-"(por ejemplo, <literal>amd64</literal> o <literal>armel</literal>). Esto "
-"permite que los ficheros <filename>sources.list</filename> sean "
+"<literal>distribution</literal> may also contain a variable, <literal>"
+"$(ARCH)</literal> which expands to the Debian architecture (such as "
+"<literal>amd64</literal> or <literal>armel</literal>) used on the system. "
+"This permits architecture-independent <filename>sources.list</filename> "
+"files to be used. In general this is only of interest when specifying an "
+"exact path, <literal>APT</literal> will automatically generate a URI with "
+"the current architecture otherwise."
+msgstr ""
+"<literal>distribución</literal> puede contener una variable, <literal>"
+"$(ARCH)</literal>, que se expandirá a la arquitectura de Debian usada en el "
+"sistema (por ejemplo, <literal>amd64</literal> o <literal>armel</literal>). "
+"Esto permite que los ficheros <filename>sources.list</filename> sean "
"independientes de la arquitectura. En general, esta característica sólo es "
"de interés si se especifica una ruta completa, de lo contrario <literal>APT</"
"literal> generará automáticamente una URI con la arquitectura actual del "
@@ -8196,9 +8199,9 @@ msgstr "DESCRIPCIÓN"
#: apt.8:31
msgid ""
"APT is a management system for software packages. For normal day to day "
-"package management there are several frontends available, such as B<aptitude>"
-"(8) for the command line or B<synaptic>(8) for the X Window System. Some "
-"options are only implemented in B<apt-get>(8) though."
+"package management there are several frontends available, such as "
+"B<aptitude>(8) for the command line or B<synaptic>(8) for the X Window "
+"System. Some options are only implemented in B<apt-get>(8) though."
msgstr ""
"APT es un sistema de gestión de paquetes de software. Dispone de varias "
"interfaces para la gestión de paquetes normal del día a día, tales como "
@@ -8768,9 +8771,9 @@ msgid ""
"<prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get update</"
"tt> has been run before."
msgstr ""
-"Es necesario actualizar la lista disponible mediante el elemento de menú [A]"
-"ctualizar antes de iniciar <prgn>dselect</prgn>. Éste es un superconjunto de "
-"<tt>apt-get update</tt> que permite a <prgn>dselect</prgn> disponer de la "
+"Es necesario actualizar la lista disponible mediante el elemento de menú "
+"[A]ctualizar antes de iniciar <prgn>dselect</prgn>. Éste es un superconjunto "
+"de <tt>apt-get update</tt> que permite a <prgn>dselect</prgn> disponer de la "
"información obtenida. Debe ejecutar [A]ctualizar aunque haya ejecutado "
"<tt>apt-get update</tt> con anterioridad."
diff --git a/doc/po/fr.po b/doc/po/fr.po
index 5c7f521c9..41358cfa2 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -10,7 +10,11 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
+<<<<<<< HEAD
"POT-Creation-Date: 2013-04-30 10:29+0300\n"
+=======
+"POT-Creation-Date: 2013-06-13 13:46+0300\n"
+>>>>>>> upstream/debian/sid
"PO-Revision-Date: 2013-04-09 07:56+0200\n"
"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -760,9 +764,9 @@ msgid ""
"installation or upgrading. Each package is a package name, not a fully "
"qualified filename (for instance, in a Debian system, <package>apt-utils</"
"package> would be the argument provided, not <filename>apt-utils_&apt-"
-"product-version;_amd64.deb</filename>). All packages required by the package"
-"(s) specified for installation will also be retrieved and installed. The "
-"<filename>/etc/apt/sources.list</filename> file is used to locate the "
+"product-version;_amd64.deb</filename>). All packages required by the "
+"package(s) specified for installation will also be retrieved and installed. "
+"The <filename>/etc/apt/sources.list</filename> file is used to locate the "
"desired packages. If a hyphen is appended to the package name (with no "
"intervening space), the identified package will be removed if it is "
"installed. Similarly a plus sign can be used to designate a package to "
@@ -824,10 +828,10 @@ msgstr ""
"déjà installés sans mettre à jour les autres paquets du système. À la "
"différence de la commande « upgrade » qui installera la dernière version "
"disponible de tous les paquets installés au moment de son exécution, "
-"« install » n'installera la nouvelle version que pour le(s) paquet(s) indiqué"
-"(s). Il suffit de fournir le nom du(des) paquet(s) à mettre à jour et si une "
-"nouvelle version est disponible, cette version (et ses dépendances, comme "
-"décrit plus haut) sera récupérée et installée."
+"« install » n'installera la nouvelle version que pour le(s) paquet(s) "
+"indiqué(s). Il suffit de fournir le nom du(des) paquet(s) à mettre à jour et "
+"si une nouvelle version est disponible, cette version (et ses dépendances, "
+"comme décrit plus haut) sera récupérée et installée."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:137
@@ -1538,14 +1542,14 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:518 apt-cache.8.xml:343 apt-key.8.xml:174 apt-mark.8.xml:125
-#: apt.conf.5.xml:1168 apt_preferences.5.xml:698
+#: apt.conf.5.xml:1167 apt_preferences.5.xml:698
msgid "Files"
msgstr "Fichiers"
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131
#: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109
-#: apt.conf.5.xml:1174 apt_preferences.5.xml:705 sources.list.5.xml:252
+#: apt.conf.5.xml:1173 apt_preferences.5.xml:705 sources.list.5.xml:252
#: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63
#: apt-ftparchive.1.xml:607
msgid "See Also"
@@ -3264,15 +3268,14 @@ msgstr "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
#. type: Content of: <refentry><refsect1><para>
#: apt.conf.5.xml:101
msgid ""
-"In general the sample configuration file in <filename>&docdir;examples/apt."
-"conf</filename> &configureindex; is a good guide for how it should look."
+"In general the sample configuration file &configureindex; is a good guide "
+"for how it should look."
msgstr ""
-"Les modèles <filename>&docdir;examples/apt.conf</filename> et "
-"&configureindex; montrent à quoi devrait ressembler le fichier de "
-"configuration."
+"Les modèles &configureindex; montrent à quoi devrait ressembler le fichier "
+"de configuration."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:105
+#: apt.conf.5.xml:104
msgid ""
"Case is not significant in names of configuration items, so in the previous "
"example you could use <literal>dpkg::pre-install-pkgs</literal>."
@@ -3282,7 +3285,7 @@ msgstr ""
"<literal>dpkg::pre-install-pkgs</literal>."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:108
+#: apt.conf.5.xml:107
msgid ""
"Names for the configuration items are optional if a list is defined as can "
"be seen in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. If "
@@ -3298,7 +3301,7 @@ msgstr ""
"réaffectant une valeur."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:113
+#: apt.conf.5.xml:112
msgid ""
"Two special commands are defined: <literal>#include</literal> (which is "
"deprecated and not supported by alternative implementations) and "
@@ -3318,7 +3321,7 @@ msgstr ""
"également se terminer avec un point-virgule."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:123
+#: apt.conf.5.xml:122
msgid ""
"The <literal>#clear</literal> command is the only way to delete a list or a "
"complete scope. Reopening a scope (or using the syntax described below with "
@@ -3334,7 +3337,7 @@ msgstr ""
"peuvent être remplacés mais seulement effacés."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:131
+#: apt.conf.5.xml:130
msgid ""
"All of the APT tools take an -o option which allows an arbitrary "
"configuration directive to be specified on the command line. The syntax is a "
@@ -3353,7 +3356,7 @@ msgstr ""
"champ d'action (« scope ») ne peut pas être indiquée à la ligne de commande."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:139
+#: apt.conf.5.xml:138
msgid ""
"Note that appending items to a list using <literal>::</literal> only works "
"for one item per line, and that you should not use it in combination with "
@@ -3385,12 +3388,12 @@ msgstr ""
"explicitement."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:154
+#: apt.conf.5.xml:153
msgid "The APT Group"
msgstr "Le groupe APT"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:155
+#: apt.conf.5.xml:154
msgid ""
"This group of options controls general APT behavior as well as holding the "
"options for all of the tools."
@@ -3399,7 +3402,7 @@ msgstr ""
"également des options communes à tous les outils."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:160
+#: apt.conf.5.xml:159
msgid ""
"System Architecture; sets the architecture to use when fetching files and "
"parsing package lists. The internal default is the architecture apt was "
@@ -3410,7 +3413,7 @@ msgstr ""
"valeur interne par défaut est l'architecture pour laquelle APT a été compilé."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:167
+#: apt.conf.5.xml:166
msgid ""
"All Architectures the system supports. For instance, CPUs implementing the "
"<literal>amd64</literal> (also called <literal>x86-64</literal>) "
@@ -3432,7 +3435,7 @@ msgstr ""
"sont enregistrées avec <command>dpkg --add-architecture</command>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:180
+#: apt.conf.5.xml:179
msgid ""
"Default release to install packages from if more than one version is "
"available. Contains release name, codename or release version. Examples: "
@@ -3446,7 +3449,7 @@ msgstr ""
"&apt-preferences;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:186
+#: apt.conf.5.xml:185
msgid ""
"Ignore held packages; this global option causes the problem resolver to "
"ignore held packages in its decision making."
@@ -3456,7 +3459,7 @@ msgstr ""
"décision."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:191
+#: apt.conf.5.xml:190
msgid ""
"Defaults to on. When turned on the autoclean feature will remove any "
"packages which can no longer be downloaded from the cache. If turned off "
@@ -3470,7 +3473,7 @@ msgstr ""
"direct pour les réinstaller."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:199
+#: apt.conf.5.xml:198
msgid ""
"Defaults to on, which will cause APT to install essential and important "
"packages as soon as possible in an install/upgrade operation, in order to "
@@ -3497,7 +3500,7 @@ msgstr ""
"dépendances ne sont pas satisfaites."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:211
+#: apt.conf.5.xml:210
msgid ""
"The immediate configuration marker is also applied in the potentially "
"problematic case of circular dependencies, since a dependency with the "
@@ -3526,7 +3529,7 @@ msgstr ""
"le seul qu'elle permet d'éviter."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:224
+#: apt.conf.5.xml:223
msgid ""
"Before a big operation like <literal>dist-upgrade</literal> is run with this "
"option disabled you should try to explicitly <literal>install</literal> the "
@@ -3544,7 +3547,7 @@ msgstr ""
"corriger les processus de mise à jour."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:235
+#: apt.conf.5.xml:234
msgid ""
"Never enable this option unless you <emphasis>really</emphasis> know what "
"you are doing. It permits APT to temporarily remove an essential package to "
@@ -3566,7 +3569,7 @@ msgstr ""
"tous les paquets dont ces paquets dépendent."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:247
+#: apt.conf.5.xml:246
msgid ""
"APT uses since version 0.7.26 a resizable memory mapped cache file to store "
"the available information. <literal>Cache-Start</literal> acts as a hint of "
@@ -3606,14 +3609,14 @@ msgstr ""
"l'augmentation automatique de la taille du cache est désactivée."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:263
+#: apt.conf.5.xml:262
msgid "Defines which packages are considered essential build dependencies."
msgstr ""
"Cette option définit les paquets qui sont considérés comme faisant partie "
"des dépendances essentielles pour la construction de paquets."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:267
+#: apt.conf.5.xml:266
msgid ""
"The Get subsection controls the &apt-get; tool; please see its documentation "
"for more information about the options here."
@@ -3623,7 +3626,7 @@ msgstr ""
"question."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:272
+#: apt.conf.5.xml:271
msgid ""
"The Cache subsection controls the &apt-cache; tool; please see its "
"documentation for more information about the options here."
@@ -3633,7 +3636,7 @@ msgstr ""
"options en question."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:277
+#: apt.conf.5.xml:276
msgid ""
"The CDROM subsection controls the &apt-cdrom; tool; please see its "
"documentation for more information about the options here."
@@ -3643,12 +3646,12 @@ msgstr ""
"options en question."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:283
+#: apt.conf.5.xml:282
msgid "The Acquire Group"
msgstr "Le groupe Acquire"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:284
+#: apt.conf.5.xml:283
msgid ""
"The <literal>Acquire</literal> group of options controls the download of "
"packages as well as the various \"acquire methods\" responsible for the "
@@ -3659,7 +3662,7 @@ msgstr ""
"effectuent ce téléchargement (voir aussi &sources-list;)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:291
+#: apt.conf.5.xml:290
msgid ""
"Security related option defaulting to true, as giving a Release file's "
"validation an expiration date prevents replay attacks over a long timescale, "
@@ -3680,7 +3683,7 @@ msgstr ""
"alors utilisée."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:304
+#: apt.conf.5.xml:303
msgid ""
"Maximum time (in seconds) after its creation (as indicated by the "
"<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3699,7 +3702,7 @@ msgstr ""
"l'option."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:316
+#: apt.conf.5.xml:315
msgid ""
"Minimum time (in seconds) after its creation (as indicated by the "
"<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3719,7 +3722,7 @@ msgstr ""
"nom de l'option."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:328
+#: apt.conf.5.xml:327
msgid ""
"Try to download deltas called <literal>PDiffs</literal> for indexes (like "
"<filename>Packages</filename> files) instead of downloading whole ones. True "
@@ -3730,7 +3733,7 @@ msgstr ""
"filename>), plutôt que de les télécharger entièrement. Par défaut à « true »."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:331
+#: apt.conf.5.xml:330
msgid ""
"Two sub-options to limit the use of PDiffs are also available: "
"<literal>FileLimit</literal> can be used to specify a maximum number of "
@@ -3749,7 +3752,7 @@ msgstr ""
"fichiers de différences."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:341
+#: apt.conf.5.xml:340
msgid ""
"Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
"literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -3765,7 +3768,7 @@ msgstr ""
"initiée."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:349
+#: apt.conf.5.xml:348
msgid ""
"Number of retries to perform. If this is non-zero APT will retry failed "
"files the given number of times."
@@ -3775,7 +3778,7 @@ msgstr ""
"échoué."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:354
+#: apt.conf.5.xml:353
msgid ""
"Use symlinks for source archives. If set to true then source archives will "
"be symlinked when possible instead of copying. True is the default."
@@ -3785,7 +3788,7 @@ msgstr ""
"archives de sources au lieu de les copier. Par défaut à « true »."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:359
+#: apt.conf.5.xml:358
msgid ""
"<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. "
"It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</"
@@ -3806,7 +3809,7 @@ msgstr ""
"options de mandataire HTTP."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:367
+#: apt.conf.5.xml:366
msgid ""
"Three settings are provided for cache control with HTTP/1.1 compliant proxy "
"caches. <literal>No-Cache</literal> tells the proxy not to use its cached "
@@ -3826,7 +3829,7 @@ msgstr ""
"fichiers .deb très grands."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:377 apt.conf.5.xml:449
+#: apt.conf.5.xml:376 apt.conf.5.xml:448
msgid ""
"The option <literal>timeout</literal> sets the timeout timer used by the "
"method; this value applies to the connection as well as the data timeout."
@@ -3836,7 +3839,7 @@ msgstr ""
"connexion qu'aux données."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:380
+#: apt.conf.5.xml:379
msgid ""
"The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
"enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e."
@@ -3856,7 +3859,7 @@ msgstr ""
"qui ne respectent pas la norme HTTP/1.1."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:387
+#: apt.conf.5.xml:386
msgid ""
"<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
"follow redirects, which is enabled by default."
@@ -3865,7 +3868,7 @@ msgstr ""
"suive les redirections. Ce réglage est activé par défaut."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:390
+#: apt.conf.5.xml:389
msgid ""
"The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
"literal> which accepts integer values in kilobytes. The default value is 0 "
@@ -3880,7 +3883,7 @@ msgstr ""
"implicitement le téléchargement simultané depuis plusieurs serveurs."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:395
+#: apt.conf.5.xml:394
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 "
@@ -3892,7 +3895,7 @@ msgstr ""
"n'autorisent l'accès qu'aux client s'identifiant de manière spécifique.."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:403
+#: apt.conf.5.xml:402
msgid ""
"The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
"<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
@@ -3909,7 +3912,7 @@ msgstr ""
"literal> n'est pas encore gérée."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:411
+#: apt.conf.5.xml:410
msgid ""
"<literal>CaInfo</literal> suboption specifies place of file that holds info "
"about trusted certificates. <literal>&lt;host&gt;::CaInfo</literal> is the "
@@ -3942,7 +3945,7 @@ msgstr ""
"<literal>TLSv1</literal> ou <literal>SSLv3</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:432
+#: apt.conf.5.xml:431
msgid ""
"<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs. "
"It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</"
@@ -3978,7 +3981,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:452
+#: apt.conf.5.xml:451
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, "
@@ -3995,7 +3998,7 @@ msgstr ""
"modèle de fichier de configuration)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:459
+#: apt.conf.5.xml:458
msgid ""
"It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
"envar> environment variable to an HTTP URL - see the discussion of the http "
@@ -4010,7 +4013,7 @@ msgstr ""
"efficacité de cette méthode."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:464
+#: apt.conf.5.xml:463
msgid ""
"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -4026,13 +4029,13 @@ msgstr ""
"des serveurs FTP ne suivent pas la RFC 2428."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:478
+#: apt.conf.5.xml:477
#, no-wrap
msgid "/cdrom/::Mount \"foo\";"
msgstr "/cdrom/::Mount \"foo\";"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:473
+#: apt.conf.5.xml:472
msgid ""
"For URIs using the <literal>cdrom</literal> method, the only configurable "
"option is the mount point, <literal>cdrom::Mount</literal>, which must be "
@@ -4055,7 +4058,7 @@ msgstr ""
"<literal>UMount</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:486
+#: apt.conf.5.xml:485
msgid ""
"For GPGV URIs the only configurable option is <literal>gpgv::Options</"
"literal>, which passes additional parameters to gpgv."
@@ -4064,13 +4067,13 @@ msgstr ""
"permet de passer des paramètres à gpgv"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:497
+#: apt.conf.5.xml:496
#, no-wrap
msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
msgstr "Acquire::CompressionTypes::<replaceable>ExtensionFichier</replaceable> \"<replaceable>NomMethode</replaceable>\";"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:492
+#: apt.conf.5.xml:491
msgid ""
"List of compression types which are understood by the acquire methods. "
"Files like <filename>Packages</filename> can be available in various "
@@ -4090,19 +4093,19 @@ msgstr ""
"type=\"synopsis\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:502
+#: apt.conf.5.xml:501
#, no-wrap
msgid "Acquire::CompressionTypes::Order:: \"gz\";"
msgstr "Acquire::CompressionTypes::Order:: \"gz\";"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:505
+#: apt.conf.5.xml:504
#, no-wrap
msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:498
+#: apt.conf.5.xml:497
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 "
@@ -4134,13 +4137,13 @@ msgstr ""
"<literal>bz2</literal> à liste car il sera ajouté automatiquement."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:511
#, no-wrap
msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:507
+#: apt.conf.5.xml:506
msgid ""
"Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></"
"literal> will be checked at run time. If this option has been set, the "
@@ -4167,7 +4170,7 @@ msgstr ""
"question."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:517
+#: apt.conf.5.xml:516
msgid ""
"The special type <literal>uncompressed</literal> can be used to give "
"uncompressed files a preference, but note that most archives don't provide "
@@ -4179,7 +4182,7 @@ msgstr ""
"surtout destiné aux miroirs locaux."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:524
+#: apt.conf.5.xml:523
msgid ""
"When downloading <literal>gzip</literal> compressed indexes (Packages, "
"Sources, or Translations), keep them gzip compressed locally instead of "
@@ -4194,7 +4197,7 @@ msgstr ""
"(« False »)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:532
+#: apt.conf.5.xml:531
msgid ""
"The Languages subsection controls which <filename>Translation</filename> "
"files are downloaded and in which order APT tries to display the description-"
@@ -4214,13 +4217,13 @@ msgstr ""
"langues étant particulièrement rares."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:549
+#: apt.conf.5.xml:548
#, no-wrap
msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
msgstr "Acquire::Languages { \"environment\"; \"fr\"; \"en\"; \"none\"; \"de\"; };"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:537
+#: apt.conf.5.xml:536
msgid ""
"The default list includes \"environment\" and \"en\". "
"\"<literal>environment</literal>\" has a special meaning here: it will be "
@@ -4260,7 +4263,7 @@ msgstr ""
"alors « de, fr, en ». <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:550
+#: apt.conf.5.xml:549
msgid ""
"Note: To prevent problems resulting from APT being executed in different "
"environments (e.g. by different users or by other programs) all Translation "
@@ -4274,22 +4277,22 @@ msgstr ""
"(après un « <literal>none</literal> » implicite)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:559
+#: apt.conf.5.xml:558
msgid "When downloading, force to use only the IPv4 protocol."
msgstr "Utilisation imposée du protocole IPv4 lors des téléchargements."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:565
+#: apt.conf.5.xml:564
msgid "When downloading, force to use only the IPv6 protocol."
msgstr "Utilisation imposée du protocole IPv6 lors des téléchargements."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:572
+#: apt.conf.5.xml:571
msgid "Directories"
msgstr "Les répertoires"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:574
+#: apt.conf.5.xml:573
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
"local state information. <literal>lists</literal> is the directory to place "
@@ -4309,7 +4312,7 @@ msgstr ""
"<filename>./</filename>."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:581
+#: apt.conf.5.xml:580
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -4332,7 +4335,7 @@ msgstr ""
"Cache</literal>."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:590
+#: apt.conf.5.xml:589
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
"<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4347,7 +4350,7 @@ msgstr ""
"fichier de configuration indiqué par la variable <envar>APT_CONFIG</envar>)."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:596
+#: apt.conf.5.xml:595
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 "
@@ -4358,7 +4361,7 @@ msgstr ""
"configuration est chargé."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:600
+#: apt.conf.5.xml:599
msgid ""
"Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
"Bin::Methods</literal> specifies the location of the method handlers and "
@@ -4376,7 +4379,7 @@ msgstr ""
"programmes correspondants."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:608
+#: apt.conf.5.xml:607
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
"set, all paths in <literal>Dir::</literal> will be relative to "
@@ -4398,7 +4401,7 @@ msgstr ""
"staging/var/lib/dpkg/status</filename>."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:621
+#: apt.conf.5.xml:620
msgid ""
"The <literal>Ignore-Files-Silently</literal> list can be used to specify "
"which files APT should silently ignore while parsing the files in the "
@@ -4416,12 +4419,12 @@ msgstr ""
"est possible d'utiliser la syntaxe des expressions rationnelles."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:630
+#: apt.conf.5.xml:629
msgid "APT in DSelect"
msgstr "APT et DSelect"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:632
+#: apt.conf.5.xml:631
msgid ""
"When APT is used as a &dselect; method several configuration directives "
"control the default behavior. These are in the <literal>DSelect</literal> "
@@ -4432,7 +4435,7 @@ msgstr ""
"<literal>DSelect</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:637
+#: apt.conf.5.xml:636
msgid ""
"Cache Clean mode; this value may be one of <literal>always</literal>, "
"<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
@@ -4455,7 +4458,7 @@ msgstr ""
"avant de récupérer de nouveaux paquets."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:651
+#: apt.conf.5.xml:650
msgid ""
"The contents of this variable are passed to &apt-get; as command line "
"options when it is run for the install phase."
@@ -4464,7 +4467,7 @@ msgstr ""
"&apt-get; lors de la phase d'installation."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:656
+#: apt.conf.5.xml:655
msgid ""
"The contents of this variable are passed to &apt-get; as command line "
"options when it is run for the update phase."
@@ -4473,7 +4476,7 @@ msgstr ""
"&apt-get; lors de la phase de mise à jour."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:661
+#: apt.conf.5.xml:660
msgid ""
"If true the [U]pdate operation in &dselect; will always prompt to continue. "
"The default is to prompt only on error."
@@ -4483,12 +4486,12 @@ msgstr ""
"d'erreur que l'on propose à l'utilisateur d'intervenir."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:667
+#: apt.conf.5.xml:666
msgid "How APT calls &dpkg;"
msgstr "Méthode d'appel de &dpkg; par APT"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:668
+#: apt.conf.5.xml:667
msgid ""
"Several configuration directives control how APT invokes &dpkg;. These are "
"in the <literal>DPkg</literal> section."
@@ -4497,7 +4500,7 @@ msgstr ""
"&dpkg; : elles figurent dans la section <literal>DPkg</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:673
+#: apt.conf.5.xml:672
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 "
@@ -4508,7 +4511,7 @@ msgstr ""
"est passé comme un seul paramètre à &dpkg;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:679
+#: apt.conf.5.xml:678
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 "
@@ -4521,7 +4524,7 @@ msgstr ""
"<filename>/bin/sh</filename> : APT s'arrête dès que l'une d'elles échoue."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:686
+#: apt.conf.5.xml:685
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 "
@@ -4537,7 +4540,7 @@ msgstr ""
"qu'il va installer, à raison d'un par ligne."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:692
+#: apt.conf.5.xml:691
msgid ""
"Version 2 of this protocol dumps more information, including the protocol "
"version, the APT configuration space and the packages, files and versions "
@@ -4553,7 +4556,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:700
+#: apt.conf.5.xml:699
msgid ""
"APT chdirs to this directory before invoking &dpkg;, the default is "
"<filename>/</filename>."
@@ -4562,7 +4565,7 @@ msgstr ""
"le répertoire <filename>/</filename>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:705
+#: apt.conf.5.xml:704
msgid ""
"These options are passed to &dpkg-buildpackage; when compiling packages; the "
"default is to disable signing and produce all binaries."
@@ -4572,14 +4575,14 @@ msgstr ""
"créés."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:710
+#: apt.conf.5.xml:709
msgid "dpkg trigger usage (and related options)"
msgstr ""
"utilisation des actions différées (« triggers ») de dpkg (et options "
"associées)"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:711
+#: apt.conf.5.xml:710
msgid ""
"APT can call &dpkg; in such a way as to let it make aggressive use of "
"triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
@@ -4606,7 +4609,7 @@ msgstr ""
"pendant la configuration des paquets."
#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:726
+#: apt.conf.5.xml:725
#, no-wrap
msgid ""
"DPkg::NoTriggers \"true\";\n"
@@ -4620,7 +4623,7 @@ msgstr ""
"DPkg::TriggersPending \"true\";"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:720
+#: apt.conf.5.xml:719
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 "
@@ -4644,7 +4647,7 @@ msgstr ""
"<placeholder type=\"literallayout\" id=\"0\"/>."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:733
+#: apt.conf.5.xml:732
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 "
@@ -4667,7 +4670,7 @@ msgstr ""
"options « unpack » et « remove »."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:741
+#: apt.conf.5.xml:740
msgid ""
"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
"and \"<literal>no</literal>\". The default value is \"<literal>all</literal>"
@@ -4697,7 +4700,7 @@ msgstr ""
"configuré et donc éventuellement non amorçable."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:756
+#: apt.conf.5.xml:755
msgid ""
"If this option is set APT will call <command>dpkg --configure --pending</"
"command> to let &dpkg; handle all required configurations and triggers. This "
@@ -4716,7 +4719,7 @@ msgstr ""
"peut conserver l'option active."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:763
+#: apt.conf.5.xml:762
msgid ""
"Useful for the <literal>smart</literal> configuration as a package which has "
"pending triggers is not considered as <literal>installed</literal>, and "
@@ -4734,7 +4737,7 @@ msgstr ""
"celles concernant le paquet en cours de traitement."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:776
+#: apt.conf.5.xml:775
#, no-wrap
msgid ""
"OrderList::Score {\n"
@@ -4752,7 +4755,7 @@ msgstr ""
"};"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:769
+#: apt.conf.5.xml:768
msgid ""
"Essential packages (and their dependencies) should be configured immediately "
"after unpacking. It is a good idea to do this quite early in the upgrade "
@@ -4778,12 +4781,12 @@ msgstr ""
"id=\"0\"/>"
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:789
+#: apt.conf.5.xml:788
msgid "Periodic and Archives options"
msgstr "Options « Periodic » et « Archive »"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:790
+#: apt.conf.5.xml:789
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by the "
@@ -4795,12 +4798,12 @@ msgstr ""
"script <literal>/etc/cron.daily/apt</literal>, lancé quotidiennement."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:798
+#: apt.conf.5.xml:797
msgid "Debug options"
msgstr "Les options de débogage"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:800
+#: apt.conf.5.xml:799
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -4818,7 +4821,7 @@ msgstr ""
"peuvent tout de même être utiles :"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:811
+#: apt.conf.5.xml:810
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -4829,7 +4832,7 @@ msgstr ""
"upgrade, upgrade, install, remove et purge</literal>."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:819
+#: apt.conf.5.xml:818
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s install</"
@@ -4841,7 +4844,7 @@ msgstr ""
"superutilisateur."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:828
+#: apt.conf.5.xml:827
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -4853,7 +4856,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:836
+#: apt.conf.5.xml:835
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
"in CD-ROM IDs."
@@ -4862,12 +4865,12 @@ msgstr ""
"type statfs dans les identifiants de CD."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:846
+#: apt.conf.5.xml:845
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><listitem><para>
-#: apt.conf.5.xml:855
+#: apt.conf.5.xml:854
msgid ""
"Print information related to accessing <literal>cdrom://</literal> sources."
msgstr ""
@@ -4875,24 +4878,24 @@ msgstr ""
"literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:866
+#: apt.conf.5.xml:865
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><listitem><para>
-#: apt.conf.5.xml:877
+#: apt.conf.5.xml:876
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><listitem><para>
-#: apt.conf.5.xml:888
+#: apt.conf.5.xml:887
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><listitem><para>
-#: apt.conf.5.xml:899
+#: apt.conf.5.xml:898
msgid ""
"Print information related to verifying cryptographic signatures using "
"<literal>gpg</literal>."
@@ -4901,7 +4904,7 @@ msgstr ""
"cryptographiques avec <literal>gpg</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:910
+#: apt.conf.5.xml:909
msgid ""
"Output information about the process of accessing collections of packages "
"stored on CD-ROMs."
@@ -4910,14 +4913,14 @@ msgstr ""
"stockées sur CD."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:920
+#: apt.conf.5.xml:919
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><listitem><para>
-#: apt.conf.5.xml:930
+#: apt.conf.5.xml:929
msgid ""
"Output each cryptographic hash that is generated by the <literal>apt</"
"literal> libraries."
@@ -4926,7 +4929,7 @@ msgstr ""
"librairies d'<literal>apt</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:940
+#: apt.conf.5.xml:939
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 "
@@ -4937,7 +4940,7 @@ msgstr ""
"utilisés sur le système de fichier du CD."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:951
+#: apt.conf.5.xml:950
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."
@@ -4947,14 +4950,14 @@ msgstr ""
"temps."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:963
+#: apt.conf.5.xml:962
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><listitem><para>
-#: apt.conf.5.xml:973
+#: apt.conf.5.xml:972
msgid ""
"Output status messages and errors related to verifying checksums and "
"cryptographic signatures of downloaded files."
@@ -4964,7 +4967,7 @@ msgstr ""
"éventuelles."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:983
+#: apt.conf.5.xml:982
msgid ""
"Output information about downloading and applying package index list diffs, "
"and errors relating to package index list diffs."
@@ -4974,7 +4977,7 @@ msgstr ""
"éventuelles."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:995
+#: apt.conf.5.xml:994
msgid ""
"Output information related to patching apt package lists when downloading "
"index diffs instead of full indices."
@@ -4984,7 +4987,7 @@ msgstr ""
"place des fichiers complets."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1006
+#: apt.conf.5.xml:1005
msgid ""
"Log all interactions with the sub-processes that actually perform downloads."
msgstr ""
@@ -4992,7 +4995,7 @@ msgstr ""
"effectivement des téléchargements."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1017
+#: apt.conf.5.xml:1016
msgid ""
"Log events related to the automatically-installed status of packages and to "
"the removal of unused packages."
@@ -5001,7 +5004,7 @@ msgstr ""
"automatiquement, et la suppression des paquets inutiles."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1027
+#: apt.conf.5.xml:1026
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial auto-"
@@ -5016,7 +5019,7 @@ msgstr ""
"de APT ; voir <literal>Debug::pkgProblemResolver</literal> pour ce dernier."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1041
+#: apt.conf.5.xml:1040
msgid ""
"Generate debug messages describing which packages are marked as keep/install/"
"remove while the ProblemResolver does his work. Each addition or deletion "
@@ -5052,7 +5055,7 @@ msgstr ""
"de APT ; voir <literal>Debug::pkgProblemResolver</literal> pour ce dernier."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1062
+#: apt.conf.5.xml:1061
msgid ""
"When invoking &dpkg;, output the precise command line with which it is being "
"invoked, with arguments separated by a single space character."
@@ -5061,7 +5064,7 @@ msgstr ""
"paramètres sont séparés par des espaces."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1073
+#: apt.conf.5.xml:1072
msgid ""
"Output all the data received from &dpkg; on the status file descriptor and "
"any errors encountered while parsing it."
@@ -5071,7 +5074,7 @@ msgstr ""
"fichier."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1084
+#: apt.conf.5.xml:1083
msgid ""
"Generate a trace of the algorithm that decides the order in which "
"<literal>apt</literal> should pass packages to &dpkg;."
@@ -5080,18 +5083,18 @@ msgstr ""
"<literal>apt</literal> passe les paquets à &dpkg;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1096
+#: apt.conf.5.xml:1095
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><listitem><para>
-#: apt.conf.5.xml:1107
+#: apt.conf.5.xml:1106
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><listitem><para>
-#: apt.conf.5.xml:1117
+#: apt.conf.5.xml:1116
msgid ""
"Trace the execution of the dependency resolver (this applies only to what "
"happens when a complex dependency problem is encountered)."
@@ -5100,7 +5103,7 @@ msgstr ""
"concerne que les cas où un problème de dépendances complexe se présente)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1128
+#: apt.conf.5.xml:1127
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 "
@@ -5111,7 +5114,7 @@ msgstr ""
"est décrite dans <literal>Debug::pkgDepCache::Marker</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1140
+#: apt.conf.5.xml:1139
msgid ""
"Print information about the vendors read from <filename>/etc/apt/vendors."
"list</filename>."
@@ -5120,13 +5123,13 @@ msgstr ""
"list</filename>."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1162 apt_preferences.5.xml:545 sources.list.5.xml:211
+#: apt.conf.5.xml:1161 apt_preferences.5.xml:545 sources.list.5.xml:211
#: apt-ftparchive.1.xml:596
msgid "Examples"
msgstr "Exemples"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1163
+#: apt.conf.5.xml:1162
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
@@ -5136,7 +5139,7 @@ msgstr ""
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1175
+#: apt.conf.5.xml:1174
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
@@ -6629,13 +6632,13 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:92
msgid ""
-"<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)"
-"</literal> which expands to the Debian architecture (such as <literal>amd64</"
-"literal> or <literal>armel</literal>) used on the system. This permits "
-"architecture-independent <filename>sources.list</filename> files to be used. "
-"In general this is only of interest when specifying an exact path, "
-"<literal>APT</literal> will automatically generate a URI with the current "
-"architecture otherwise."
+"<literal>distribution</literal> may also contain a variable, <literal>"
+"$(ARCH)</literal> which expands to the Debian architecture (such as "
+"<literal>amd64</literal> or <literal>armel</literal>) used on the system. "
+"This permits architecture-independent <filename>sources.list</filename> "
+"files to be used. In general this is only of interest when specifying an "
+"exact path, <literal>APT</literal> will automatically generate a URI with "
+"the current architecture otherwise."
msgstr ""
"<literal>distribution</literal> peut aussi contenir une variable <literal>"
"$(ARCH)</literal>, qui sera remplacée par l'architecture Debian (comme "
@@ -8139,9 +8142,9 @@ msgstr "DESCRIPTION"
#: apt.8:31
msgid ""
"APT is a management system for software packages. For normal day to day "
-"package management there are several frontends available, such as B<aptitude>"
-"(8) for the command line or B<synaptic>(8) for the X Window System. Some "
-"options are only implemented in B<apt-get>(8) though."
+"package management there are several frontends available, such as "
+"B<aptitude>(8) for the command line or B<synaptic>(8) for the X Window "
+"System. Some options are only implemented in B<apt-get>(8) though."
msgstr ""
"APT est un système de gestion de paquets logiciels. Pour la gestion au "
"quotidien des paquets, il existe plusieurs frontaux comme B<aptitude>(9) en "
@@ -8755,11 +8758,11 @@ msgid ""
"[R]emove commands have no meaning, the [I]nstall command performs both of "
"them together."
msgstr ""
-"Une fois cela effectué, vous pouvez poursuivre et utiliser l'option « [S]"
-"électionner » pour choisir les paquets à installer puis « [I]nstaller » pour "
-"les installer. Lorsque la méthode APT est utilisée, les options « [C]"
-"onfigurer » et « [R]etirer » ne sont pas utilisées, car « [I]nstaller » fait "
-"l'ensemble des opérations."
+"Une fois cela effectué, vous pouvez poursuivre et utiliser l'option "
+"« [S]électionner » pour choisir les paquets à installer puis « [I]nstaller » "
+"pour les installer. Lorsque la méthode APT est utilisée, les options "
+"« [C]onfigurer » et « [R]etirer » ne sont pas utilisées, car « [I]nstaller » "
+"fait l'ensemble des opérations."
#. type: <p></p>
#: guide.sgml:258
diff --git a/doc/po/it.po b/doc/po/it.po
index 59a54917e..f6754c1fb 100644
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -11,7 +11,11 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
+<<<<<<< HEAD
"POT-Creation-Date: 2013-04-30 10:29+0300\n"
+=======
+"POT-Creation-Date: 2013-06-13 13:46+0300\n"
+>>>>>>> upstream/debian/sid
"PO-Revision-Date: 2012-12-23 18:04+0200\n"
"Last-Translator: Beatrice Torracca <beatricet@libero.it>\n"
"Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
@@ -812,9 +816,9 @@ msgid ""
"installation or upgrading. Each package is a package name, not a fully "
"qualified filename (for instance, in a Debian system, <package>apt-utils</"
"package> would be the argument provided, not <filename>apt-utils_&apt-"
-"product-version;_amd64.deb</filename>). All packages required by the package"
-"(s) specified for installation will also be retrieved and installed. The "
-"<filename>/etc/apt/sources.list</filename> file is used to locate the "
+"product-version;_amd64.deb</filename>). All packages required by the "
+"package(s) specified for installation will also be retrieved and installed. "
+"The <filename>/etc/apt/sources.list</filename> file is used to locate the "
"desired packages. If a hyphen is appended to the package name (with no "
"intervening space), the identified package will be removed if it is "
"installed. Similarly a plus sign can be used to designate a package to "
@@ -1582,14 +1586,14 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:518 apt-cache.8.xml:343 apt-key.8.xml:174 apt-mark.8.xml:125
-#: apt.conf.5.xml:1168 apt_preferences.5.xml:698
+#: apt.conf.5.xml:1167 apt_preferences.5.xml:698
msgid "Files"
msgstr "File"
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131
#: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109
-#: apt.conf.5.xml:1174 apt_preferences.5.xml:705 sources.list.5.xml:252
+#: apt.conf.5.xml:1173 apt_preferences.5.xml:705 sources.list.5.xml:252
#: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63
#: apt-ftparchive.1.xml:607
msgid "See Also"
@@ -3299,19 +3303,17 @@ msgstr ""
msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
msgstr "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
-# apt.conf è un file e &configureindex è un altro: configure-index.gz
#. type: Content of: <refentry><refsect1><para>
#: apt.conf.5.xml:101
msgid ""
-"In general the sample configuration file in <filename>&docdir;examples/apt."
-"conf</filename> &configureindex; is a good guide for how it should look."
+"In general the sample configuration file &configureindex; is a good guide "
+"for how it should look."
msgstr ""
-"In generale i file di configurazione d'esempio in <filename>&docdir;examples/"
-"apt.conf</filename> e &configureindex; sono una buona guida su come debba "
-"essere un file di configurazione."
+"In generale i file di configurazione d'esempio &configureindex; sono una "
+"buona guida su come debba essere un file di configurazione."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:105
+#: apt.conf.5.xml:104
msgid ""
"Case is not significant in names of configuration items, so in the previous "
"example you could use <literal>dpkg::pre-install-pkgs</literal>."
@@ -3321,7 +3323,7 @@ msgstr ""
"<literal>dpkg::pre-install-pkgs</literal>."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:108
+#: apt.conf.5.xml:107
msgid ""
"Names for the configuration items are optional if a list is defined as can "
"be seen in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. If "
@@ -3336,7 +3338,7 @@ msgstr ""
"sovrascrivere l'opzione come per ogni altra, assegnandole un nuovo valore."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:113
+#: apt.conf.5.xml:112
msgid ""
"Two special commands are defined: <literal>#include</literal> (which is "
"deprecated and not supported by alternative implementations) and "
@@ -3356,7 +3358,7 @@ msgstr ""
"queste righe devono terminare con un punto e virgola.)"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:123
+#: apt.conf.5.xml:122
msgid ""
"The <literal>#clear</literal> command is the only way to delete a list or a "
"complete scope. Reopening a scope (or using the syntax described below with "
@@ -3372,7 +3374,7 @@ msgstr ""
"ambiti non possono essere sovrascritti, solo cancellati."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:131
+#: apt.conf.5.xml:130
msgid ""
"All of the APT tools take an -o option which allows an arbitrary "
"configuration directive to be specified on the command line. The syntax is a "
@@ -3392,7 +3394,7 @@ msgstr ""
"di comando.)"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:139
+#: apt.conf.5.xml:138
msgid ""
"Note that appending items to a list using <literal>::</literal> only works "
"for one item per line, and that you should not use it in combination with "
@@ -3422,12 +3424,12 @@ msgstr ""
"ora, quando APT ancora non si lamenta esplicitamente."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:154
+#: apt.conf.5.xml:153
msgid "The APT Group"
msgstr "Il gruppo APT"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:155
+#: apt.conf.5.xml:154
msgid ""
"This group of options controls general APT behavior as well as holding the "
"options for all of the tools."
@@ -3436,7 +3438,7 @@ msgstr ""
"contenere le opzioni per tutti gli strumenti."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:160
+#: apt.conf.5.xml:159
msgid ""
"System Architecture; sets the architecture to use when fetching files and "
"parsing package lists. The internal default is the architecture apt was "
@@ -3447,7 +3449,7 @@ msgstr ""
"predefinito interno è l'architettura per la quale apt è stato compilato."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:167
+#: apt.conf.5.xml:166
msgid ""
"All Architectures the system supports. For instance, CPUs implementing the "
"<literal>amd64</literal> (also called <literal>x86-64</literal>) "
@@ -3469,7 +3471,7 @@ msgstr ""
"quando sono registrate con <command>dpkg --add-architecture</command>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:180
+#: apt.conf.5.xml:179
msgid ""
"Default release to install packages from if more than one version is "
"available. Contains release name, codename or release version. Examples: "
@@ -3483,7 +3485,7 @@ msgstr ""
"preferences;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:186
+#: apt.conf.5.xml:185
msgid ""
"Ignore held packages; this global option causes the problem resolver to "
"ignore held packages in its decision making."
@@ -3492,7 +3494,7 @@ msgstr ""
"di problemi ignori i pacchetti bloccati nel suo processo decisionale."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:191
+#: apt.conf.5.xml:190
msgid ""
"Defaults to on. When turned on the autoclean feature will remove any "
"packages which can no longer be downloaded from the cache. If turned off "
@@ -3506,7 +3508,7 @@ msgstr ""
"reinstallarli."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:199
+#: apt.conf.5.xml:198
msgid ""
"Defaults to on, which will cause APT to install essential and important "
"packages as soon as possible in an install/upgrade operation, in order to "
@@ -3533,7 +3535,7 @@ msgstr ""
"che dipende da A, dato che la dipendenza da A non è più soddisfatta."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:211
+#: apt.conf.5.xml:210
msgid ""
"The immediate configuration marker is also applied in the potentially "
"problematic case of circular dependencies, since a dependency with the "
@@ -3563,7 +3565,7 @@ msgstr ""
"l'unico problema che può aiutare a prevenire."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:224
+#: apt.conf.5.xml:223
msgid ""
"Before a big operation like <literal>dist-upgrade</literal> is run with this "
"option disabled you should try to explicitly <literal>install</literal> the "
@@ -3581,7 +3583,7 @@ msgstr ""
"il processo di aggiornamento."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:235
+#: apt.conf.5.xml:234
msgid ""
"Never enable this option unless you <emphasis>really</emphasis> know what "
"you are doing. It permits APT to temporarily remove an essential package to "
@@ -3602,7 +3604,7 @@ msgstr ""
"<command>dash</command> o qualsiasi altro da cui dipendono tali pacchetti."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:247
+#: apt.conf.5.xml:246
msgid ""
"APT uses since version 0.7.26 a resizable memory mapped cache file to store "
"the available information. <literal>Cache-Start</literal> acts as a hint of "
@@ -3640,14 +3642,14 @@ msgstr ""
"della cache è disabilitata."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:263
+#: apt.conf.5.xml:262
msgid "Defines which packages are considered essential build dependencies."
msgstr ""
"Definisce quali pacchetti sono considerati dipendenze di compilazione "
"essenziali."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:267
+#: apt.conf.5.xml:266
msgid ""
"The Get subsection controls the &apt-get; tool; please see its documentation "
"for more information about the options here."
@@ -3656,7 +3658,7 @@ msgstr ""
"documentazione per maggiori informazioni su queste opzioni."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:272
+#: apt.conf.5.xml:271
msgid ""
"The Cache subsection controls the &apt-cache; tool; please see its "
"documentation for more information about the options here."
@@ -3665,7 +3667,7 @@ msgstr ""
"documentazione per maggiori informazioni su queste opzioni."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:277
+#: apt.conf.5.xml:276
msgid ""
"The CDROM subsection controls the &apt-cdrom; tool; please see its "
"documentation for more information about the options here."
@@ -3674,12 +3676,12 @@ msgstr ""
"documentazione per maggiori informazioni su queste opzioni."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:283
+#: apt.conf.5.xml:282
msgid "The Acquire Group"
msgstr "Il gruppo Acquire"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:284
+#: apt.conf.5.xml:283
msgid ""
"The <literal>Acquire</literal> group of options controls the download of "
"packages as well as the various \"acquire methods\" responsible for the "
@@ -3690,7 +3692,7 @@ msgstr ""
"scaricamento stesso (vedere anche &sources-list;)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:291
+#: apt.conf.5.xml:290
msgid ""
"Security related option defaulting to true, as giving a Release file's "
"validation an expiration date prevents replay attacks over a long timescale, "
@@ -3712,7 +3714,7 @@ msgstr ""
"ValidTime</literal> seguente."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:304
+#: apt.conf.5.xml:303
msgid ""
"Maximum time (in seconds) after its creation (as indicated by the "
"<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3732,7 +3734,7 @@ msgstr ""
"dell'archivio in fondo al nome dell'opzione."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:316
+#: apt.conf.5.xml:315
msgid ""
"Minimum time (in seconds) after its creation (as indicated by the "
"<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3752,7 +3754,7 @@ msgstr ""
"archivio aggiungendo l'etichetta dell'archivio in fondo al nome dell'opzione."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:328
+#: apt.conf.5.xml:327
msgid ""
"Try to download deltas called <literal>PDiffs</literal> for indexes (like "
"<filename>Packages</filename> files) instead of downloading whole ones. True "
@@ -3763,7 +3765,7 @@ msgstr ""
"interamente i nuovi. Attiva in modo predefinito."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:331
+#: apt.conf.5.xml:330
msgid ""
"Two sub-options to limit the use of PDiffs are also available: "
"<literal>FileLimit</literal> can be used to specify a maximum number of "
@@ -3781,7 +3783,7 @@ msgstr ""
"completo invece delle patch."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:341
+#: apt.conf.5.xml:340
msgid ""
"Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
"literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -3796,7 +3798,7 @@ msgstr ""
"literal> significa che viene aperta una connessione per ogni tipo di URI."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:349
+#: apt.conf.5.xml:348
msgid ""
"Number of retries to perform. If this is non-zero APT will retry failed "
"files the given number of times."
@@ -3806,7 +3808,7 @@ msgstr ""
"ha avuto successo."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:354
+#: apt.conf.5.xml:353
msgid ""
"Use symlinks for source archives. If set to true then source archives will "
"be symlinked when possible instead of copying. True is the default."
@@ -3817,7 +3819,7 @@ msgstr ""
"vero."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:359
+#: apt.conf.5.xml:358
msgid ""
"<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. "
"It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</"
@@ -3836,7 +3838,7 @@ msgstr ""
"la variabile d'ambiente <envar>http_proxy</envar>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:367
+#: apt.conf.5.xml:366
msgid ""
"Three settings are provided for cache control with HTTP/1.1 compliant proxy "
"caches. <literal>No-Cache</literal> tells the proxy not to use its cached "
@@ -3856,7 +3858,7 @@ msgstr ""
"file .deb."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:377 apt.conf.5.xml:449
+#: apt.conf.5.xml:376 apt.conf.5.xml:448
msgid ""
"The option <literal>timeout</literal> sets the timeout timer used by the "
"method; this value applies to the connection as well as the data timeout."
@@ -3866,7 +3868,7 @@ msgstr ""
"quello per i dati."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:380
+#: apt.conf.5.xml:379
msgid ""
"The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
"enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e."
@@ -3886,7 +3888,7 @@ msgstr ""
"con la specifica HTTP/1.1."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:387
+#: apt.conf.5.xml:386
msgid ""
"<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
"follow redirects, which is enabled by default."
@@ -3895,7 +3897,7 @@ msgstr ""
"meno le ridirezioni che sono abilitate in modo predefinito."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:390
+#: apt.conf.5.xml:389
msgid ""
"The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
"literal> which accepts integer values in kilobytes. The default value is 0 "
@@ -3910,7 +3912,7 @@ msgstr ""
"scaricamento da più server contemporaneamente)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:395
+#: apt.conf.5.xml:394
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 "
@@ -3922,7 +3924,7 @@ msgstr ""
"conosciuto."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:403
+#: apt.conf.5.xml:402
msgid ""
"The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
"<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
@@ -3939,7 +3941,7 @@ msgstr ""
"<literal>Pipeline-Depth</literal> non è ancora supportata."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:411
+#: apt.conf.5.xml:410
msgid ""
"<literal>CaInfo</literal> suboption specifies place of file that holds info "
"about trusted certificates. <literal>&lt;host&gt;::CaInfo</literal> is the "
@@ -3980,7 +3982,7 @@ msgstr ""
"literal> è la corrispondente opzione specifica per ciascun host."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:432
+#: apt.conf.5.xml:431
msgid ""
"<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs. "
"It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</"
@@ -4014,7 +4016,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:452
+#: apt.conf.5.xml:451
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, "
@@ -4030,7 +4032,7 @@ msgstr ""
"uno specifico host (vedere il file di configurazione d'esempio)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:459
+#: apt.conf.5.xml:458
msgid ""
"It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
"envar> environment variable to an HTTP URL - see the discussion of the http "
@@ -4044,7 +4046,7 @@ msgstr ""
"a causa della sua bassa efficienza."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:464
+#: apt.conf.5.xml:463
msgid ""
"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -4060,13 +4062,13 @@ msgstr ""
"parte dei server FTP non supporta la RFC 2428."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:478
+#: apt.conf.5.xml:477
#, no-wrap
msgid "/cdrom/::Mount \"foo\";"
msgstr "/cdrom/::Mount \"pippo\";"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:473
+#: apt.conf.5.xml:472
msgid ""
"For URIs using the <literal>cdrom</literal> method, the only configurable "
"option is the mount point, <literal>cdrom::Mount</literal>, which must be "
@@ -4088,7 +4090,7 @@ msgstr ""
"comandi per lo smontaggio possono essere specificati usando UMount."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:486
+#: apt.conf.5.xml:485
msgid ""
"For GPGV URIs the only configurable option is <literal>gpgv::Options</"
"literal>, which passes additional parameters to gpgv."
@@ -4097,13 +4099,13 @@ msgstr ""
"literal>, che passa parametri aggiuntivi a gpgv."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:497
+#: apt.conf.5.xml:496
#, no-wrap
msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
msgstr "Acquire::CompressionTypes::<replaceable>EstensioneFile</replaceable> \"<replaceable>NomeMetodo</replaceable>\";"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:492
+#: apt.conf.5.xml:491
msgid ""
"List of compression types which are understood by the acquire methods. "
"Files like <filename>Packages</filename> can be available in various "
@@ -4122,19 +4124,19 @@ msgstr ""
"metodo usato. La sintassi è: <placeholder type=\"synopsis\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:502
+#: apt.conf.5.xml:501
#, no-wrap
msgid "Acquire::CompressionTypes::Order:: \"gz\";"
msgstr "Acquire::CompressionTypes::Order:: \"gz\";"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:505
+#: apt.conf.5.xml:504
#, no-wrap
msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:498
+#: apt.conf.5.xml:497
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 "
@@ -4165,13 +4167,13 @@ msgstr ""
"all'elenco, dato che verrà aggiunto automaticamente."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:511
#, no-wrap
msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:507
+#: apt.conf.5.xml:506
msgid ""
"Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></"
"literal> will be checked at run time. If this option has been set, the "
@@ -4197,7 +4199,7 @@ msgstr ""
"definito; aggiunge solamente il tipo indicato all'inizio dell'elenco."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:517
+#: apt.conf.5.xml:516
msgid ""
"The special type <literal>uncompressed</literal> can be used to give "
"uncompressed files a preference, but note that most archives don't provide "
@@ -4209,7 +4211,7 @@ msgstr ""
"soprattutto per i mirror locali."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:524
+#: apt.conf.5.xml:523
msgid ""
"When downloading <literal>gzip</literal> compressed indexes (Packages, "
"Sources, or Translations), keep them gzip compressed locally instead of "
@@ -4223,7 +4225,7 @@ msgstr ""
"modo predefinito è disabilitato."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:532
+#: apt.conf.5.xml:531
msgid ""
"The Languages subsection controls which <filename>Translation</filename> "
"files are downloaded and in which order APT tries to display the description-"
@@ -4242,13 +4244,13 @@ msgstr ""
"codici di lingua lunghi sono particolarmente rari."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:549
+#: apt.conf.5.xml:548
#, no-wrap
msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
msgstr "Acquire::Languages { \"environment\"; \"it\"; \"en\"; \"none\"; \"fr\"; };"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:537
+#: apt.conf.5.xml:536
msgid ""
"The default list includes \"environment\" and \"en\". "
"\"<literal>environment</literal>\" has a special meaning here: it will be "
@@ -4287,7 +4289,7 @@ msgstr ""
"<placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:550
+#: apt.conf.5.xml:549
msgid ""
"Note: To prevent problems resulting from APT being executed in different "
"environments (e.g. by different users or by other programs) all Translation "
@@ -4301,22 +4303,22 @@ msgstr ""
"implicito)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:559
+#: apt.conf.5.xml:558
msgid "When downloading, force to use only the IPv4 protocol."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:565
+#: apt.conf.5.xml:564
msgid "When downloading, force to use only the IPv6 protocol."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:572
+#: apt.conf.5.xml:571
msgid "Directories"
msgstr "Directory"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:574
+#: apt.conf.5.xml:573
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
"local state information. <literal>lists</literal> is the directory to place "
@@ -4336,7 +4338,7 @@ msgstr ""
"<filename>/</filename> o <filename>./</filename>."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:581
+#: apt.conf.5.xml:580
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -4358,7 +4360,7 @@ msgstr ""
"la directory predefinita è contenuta in <literal>Dir::Cache</literal>"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:590
+#: apt.conf.5.xml:589
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
"<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4373,7 +4375,7 @@ msgstr ""
"configurazione specificato da <envar>APT_CONFIG</envar>)."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:596
+#: apt.conf.5.xml:595
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 "
@@ -4384,7 +4386,7 @@ msgstr ""
"termine viene caricato il file di configurazione principale."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:600
+#: apt.conf.5.xml:599
msgid ""
"Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
"Bin::Methods</literal> specifies the location of the method handlers and "
@@ -4401,7 +4403,7 @@ msgstr ""
"specificano la posizione dei rispettivi programmi."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:608
+#: apt.conf.5.xml:607
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
"set, all paths in <literal>Dir::</literal> will be relative to "
@@ -4422,7 +4424,7 @@ msgstr ""
"staging/var/lib/dpkg/status</filename>."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:621
+#: apt.conf.5.xml:620
msgid ""
"The <literal>Ignore-Files-Silently</literal> list can be used to specify "
"which files APT should silently ignore while parsing the files in the "
@@ -4440,12 +4442,12 @@ msgstr ""
"questi modelli possono usare una sintassi con espressioni regolari."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:630
+#: apt.conf.5.xml:629
msgid "APT in DSelect"
msgstr "APT in DSelect"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:632
+#: apt.conf.5.xml:631
msgid ""
"When APT is used as a &dselect; method several configuration directives "
"control the default behavior. These are in the <literal>DSelect</literal> "
@@ -4456,7 +4458,7 @@ msgstr ""
"sezione <literal>DSelect</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:637
+#: apt.conf.5.xml:636
msgid ""
"Cache Clean mode; this value may be one of <literal>always</literal>, "
"<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
@@ -4478,7 +4480,7 @@ msgstr ""
"scaricare i nuovi pacchetti."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:651
+#: apt.conf.5.xml:650
msgid ""
"The contents of this variable are passed to &apt-get; as command line "
"options when it is run for the install phase."
@@ -4488,7 +4490,7 @@ msgstr ""
"installazione."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:656
+#: apt.conf.5.xml:655
msgid ""
"The contents of this variable are passed to &apt-get; as command line "
"options when it is run for the update phase."
@@ -4498,7 +4500,7 @@ msgstr ""
"aggiornamento."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:661
+#: apt.conf.5.xml:660
msgid ""
"If true the [U]pdate operation in &dselect; will always prompt to continue. "
"The default is to prompt only on error."
@@ -4508,12 +4510,12 @@ msgstr ""
"solo in caso di errore."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:667
+#: apt.conf.5.xml:666
msgid "How APT calls &dpkg;"
msgstr "Come APT invoca &dpkg;"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:668
+#: apt.conf.5.xml:667
msgid ""
"Several configuration directives control how APT invokes &dpkg;. These are "
"in the <literal>DPkg</literal> section."
@@ -4522,7 +4524,7 @@ msgstr ""
"&dpkg;; sono nella sezione <literal>DPkg</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:673
+#: apt.conf.5.xml:672
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 "
@@ -4533,7 +4535,7 @@ msgstr ""
"passata a &dpkg; come un singolo argomento."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:679
+#: apt.conf.5.xml:678
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 "
@@ -4546,7 +4548,7 @@ msgstr ""
"bin/sh</filename>; se qualcuno dei comandi fallisce APT terminerà annullando."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:686
+#: apt.conf.5.xml:685
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 "
@@ -4562,7 +4564,7 @@ msgstr ""
"uno per riga, sullo standard input."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:692
+#: apt.conf.5.xml:691
msgid ""
"Version 2 of this protocol dumps more information, including the protocol "
"version, the APT configuration space and the packages, files and versions "
@@ -4578,7 +4580,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:700
+#: apt.conf.5.xml:699
msgid ""
"APT chdirs to this directory before invoking &dpkg;, the default is "
"<filename>/</filename>."
@@ -4587,7 +4589,7 @@ msgstr ""
"valore predefinito è <filename>/</filename>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:705
+#: apt.conf.5.xml:704
msgid ""
"These options are passed to &dpkg-buildpackage; when compiling packages; the "
"default is to disable signing and produce all binaries."
@@ -4597,12 +4599,12 @@ msgstr ""
"binari."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:710
+#: apt.conf.5.xml:709
msgid "dpkg trigger usage (and related options)"
msgstr "Uso dei trigger di dpkg (e relative opzioni)"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:711
+#: apt.conf.5.xml:710
msgid ""
"APT can call &dpkg; in such a way as to let it make aggressive use of "
"triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
@@ -4630,7 +4632,7 @@ msgstr ""
"pacchetti."
#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:726
+#: apt.conf.5.xml:725
#, no-wrap
msgid ""
"DPkg::NoTriggers \"true\";\n"
@@ -4644,7 +4646,7 @@ msgstr ""
"DPkg::TriggersPending \"true\";"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:720
+#: apt.conf.5.xml:719
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 "
@@ -4668,7 +4670,7 @@ msgstr ""
"\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:733
+#: apt.conf.5.xml:732
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 "
@@ -4690,7 +4692,7 @@ msgstr ""
"questa opzione anche alle chiamate per lo spacchettamento e la rimozione."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:741
+#: apt.conf.5.xml:740
msgid ""
"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
"and \"<literal>no</literal>\". The default value is \"<literal>all</literal>"
@@ -4720,7 +4722,7 @@ msgstr ""
"potrebbe finire in uno stato non configurato e potenzialmente non avviabile."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:756
+#: apt.conf.5.xml:755
msgid ""
"If this option is set APT will call <command>dpkg --configure --pending</"
"command> to let &dpkg; handle all required configurations and triggers. This "
@@ -4738,7 +4740,7 @@ msgstr ""
"si può disattivare questa opzione in tutte le esecuzioni tranne l'ultima."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:763
+#: apt.conf.5.xml:762
msgid ""
"Useful for the <literal>smart</literal> configuration as a package which has "
"pending triggers is not considered as <literal>installed</literal>, and "
@@ -4754,7 +4756,7 @@ msgstr ""
"necessari per configurare il pacchetto in questione."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:776
+#: apt.conf.5.xml:775
#, no-wrap
msgid ""
"OrderList::Score {\n"
@@ -4772,7 +4774,7 @@ msgstr ""
"};"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:769
+#: apt.conf.5.xml:768
msgid ""
"Essential packages (and their dependencies) should be configured immediately "
"after unpacking. It is a good idea to do this quite early in the upgrade "
@@ -4797,12 +4799,12 @@ msgstr ""
"con i loro valori predefiniti. <placeholder type=\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:789
+#: apt.conf.5.xml:788
msgid "Periodic and Archives options"
msgstr "Opzioni Periodic e Archives"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:790
+#: apt.conf.5.xml:789
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by the "
@@ -4816,12 +4818,12 @@ msgstr ""
"all'inizio dello script."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:798
+#: apt.conf.5.xml:797
msgid "Debug options"
msgstr "Opzioni di debug"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:800
+#: apt.conf.5.xml:799
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -4839,7 +4841,7 @@ msgstr ""
"esserlo:"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:811
+#: apt.conf.5.xml:810
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -4850,7 +4852,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:819
+#: apt.conf.5.xml:818
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s install</"
@@ -4861,7 +4863,7 @@ msgstr ""
"install</literal>) come utente non root."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:828
+#: apt.conf.5.xml:827
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -4873,7 +4875,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:836
+#: apt.conf.5.xml:835
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
"in CD-ROM IDs."
@@ -4882,37 +4884,37 @@ msgstr ""
"negli ID dei CD-ROM."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:846
+#: apt.conf.5.xml:845
msgid "A full list of debugging options to apt follows."
msgstr "Segue un elenco completo delle opzioni di debug per apt."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:855
+#: apt.conf.5.xml:854
msgid ""
"Print information related to accessing <literal>cdrom://</literal> sources."
msgstr ""
"Stampa informazioni relative all'accesso a fonti <literal>cdrom://</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:866
+#: apt.conf.5.xml:865
msgid "Print information related to downloading packages using FTP."
msgstr ""
"Stampa informazioni relative allo scaricamento dei pacchetti usando FTP."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:877
+#: apt.conf.5.xml:876
msgid "Print information related to downloading packages using HTTP."
msgstr ""
"Stampa informazioni relative allo scaricamento dei pacchetti usando HTTP."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:888
+#: apt.conf.5.xml:887
msgid "Print information related to downloading packages using HTTPS."
msgstr ""
"Stampa informazioni relative allo scaricamento dei pacchetti usando HTTPS."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:899
+#: apt.conf.5.xml:898
msgid ""
"Print information related to verifying cryptographic signatures using "
"<literal>gpg</literal>."
@@ -4921,7 +4923,7 @@ msgstr ""
"usando <literal>gpg</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:910
+#: apt.conf.5.xml:909
msgid ""
"Output information about the process of accessing collections of packages "
"stored on CD-ROMs."
@@ -4930,14 +4932,14 @@ msgstr ""
"pacchetti memorizzati su CD-ROM."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:920
+#: apt.conf.5.xml:919
msgid "Describes the process of resolving build-dependencies in &apt-get;."
msgstr ""
"Descrive il processo di risoluzione delle dipendenze di compilazione in &apt-"
"get;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:930
+#: apt.conf.5.xml:929
msgid ""
"Output each cryptographic hash that is generated by the <literal>apt</"
"literal> libraries."
@@ -4946,7 +4948,7 @@ msgstr ""
"<literal>apt</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:940
+#: apt.conf.5.xml:939
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 "
@@ -4957,7 +4959,7 @@ msgstr ""
"system del CD-ROM."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:951
+#: apt.conf.5.xml:950
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."
@@ -4967,14 +4969,14 @@ msgstr ""
"contemporaneamente."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:963
+#: apt.conf.5.xml:962
msgid "Log when items are added to or removed from the global download queue."
msgstr ""
"Registra nel log quando vengono aggiunte o rimosse voci dalla coda globale "
"degli scaricamenti."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:973
+#: apt.conf.5.xml:972
msgid ""
"Output status messages and errors related to verifying checksums and "
"cryptographic signatures of downloaded files."
@@ -4983,7 +4985,7 @@ msgstr ""
"codici di controllo e delle firme di cifratura dei file scaricati."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:983
+#: apt.conf.5.xml:982
msgid ""
"Output information about downloading and applying package index list diffs, "
"and errors relating to package index list diffs."
@@ -4993,7 +4995,7 @@ msgstr ""
"diff."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:995
+#: apt.conf.5.xml:994
msgid ""
"Output information related to patching apt package lists when downloading "
"index diffs instead of full indices."
@@ -5003,7 +5005,7 @@ msgstr ""
"invece degli indici completi."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1006
+#: apt.conf.5.xml:1005
msgid ""
"Log all interactions with the sub-processes that actually perform downloads."
msgstr ""
@@ -5011,7 +5013,7 @@ msgstr ""
"realmente gli scaricamenti."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1017
+#: apt.conf.5.xml:1016
msgid ""
"Log events related to the automatically-installed status of packages and to "
"the removal of unused packages."
@@ -5020,7 +5022,7 @@ msgstr ""
"installato dei pacchetti e alla rimozione dei pacchetti non utilizzati."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1027
+#: apt.conf.5.xml:1026
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial auto-"
@@ -5036,7 +5038,7 @@ msgstr ""
"pkgProblemResolver</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1041
+#: apt.conf.5.xml:1040
msgid ""
"Generate debug messages describing which packages are marked as keep/install/"
"remove while the ProblemResolver does his work. Each addition or deletion "
@@ -5068,7 +5070,7 @@ msgstr ""
"sezione in cui compare il pacchetto."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1062
+#: apt.conf.5.xml:1061
msgid ""
"When invoking &dpkg;, output the precise command line with which it is being "
"invoked, with arguments separated by a single space character."
@@ -5077,7 +5079,7 @@ msgstr ""
"gli argomenti separati da un singolo carattere di spazio."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1073
+#: apt.conf.5.xml:1072
msgid ""
"Output all the data received from &dpkg; on the status file descriptor and "
"any errors encountered while parsing it."
@@ -5086,7 +5088,7 @@ msgstr ""
"di stato ed ogni errore incontrato durante la sua analisi."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1084
+#: apt.conf.5.xml:1083
msgid ""
"Generate a trace of the algorithm that decides the order in which "
"<literal>apt</literal> should pass packages to &dpkg;."
@@ -5095,7 +5097,7 @@ msgstr ""
"literal> deve passare i pacchetti a &dpkg;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1096
+#: apt.conf.5.xml:1095
msgid ""
"Output status messages tracing the steps performed when invoking &dpkg;."
msgstr ""
@@ -5103,12 +5105,12 @@ msgstr ""
"nell'invocazione di &dpkg;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1107
+#: apt.conf.5.xml:1106
msgid "Output the priority of each package list on startup."
msgstr "Produce in output la priorità di ogni elenco di pacchetti all'avvio."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1117
+#: apt.conf.5.xml:1116
msgid ""
"Trace the execution of the dependency resolver (this applies only to what "
"happens when a complex dependency problem is encountered)."
@@ -5118,7 +5120,7 @@ msgstr ""
"dipendenze)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1128
+#: apt.conf.5.xml:1127
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 "
@@ -5129,7 +5131,7 @@ msgstr ""
"la stessa descritta in <literal>Debug::pkgDepCache::Marker</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1140
+#: apt.conf.5.xml:1139
msgid ""
"Print information about the vendors read from <filename>/etc/apt/vendors."
"list</filename>."
@@ -5138,13 +5140,13 @@ msgstr ""
"filename>."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1162 apt_preferences.5.xml:545 sources.list.5.xml:211
+#: apt.conf.5.xml:1161 apt_preferences.5.xml:545 sources.list.5.xml:211
#: apt-ftparchive.1.xml:596
msgid "Examples"
msgstr "Esempi"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1163
+#: apt.conf.5.xml:1162
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
@@ -5154,7 +5156,7 @@ msgstr ""
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1175
+#: apt.conf.5.xml:1174
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
@@ -6665,13 +6667,13 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:92
msgid ""
-"<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)"
-"</literal> which expands to the Debian architecture (such as <literal>amd64</"
-"literal> or <literal>armel</literal>) used on the system. This permits "
-"architecture-independent <filename>sources.list</filename> files to be used. "
-"In general this is only of interest when specifying an exact path, "
-"<literal>APT</literal> will automatically generate a URI with the current "
-"architecture otherwise."
+"<literal>distribution</literal> may also contain a variable, <literal>"
+"$(ARCH)</literal> which expands to the Debian architecture (such as "
+"<literal>amd64</literal> or <literal>armel</literal>) used on the system. "
+"This permits architecture-independent <filename>sources.list</filename> "
+"files to be used. In general this is only of interest when specifying an "
+"exact path, <literal>APT</literal> will automatically generate a URI with "
+"the current architecture otherwise."
msgstr ""
"<literal>distribuzione</literal> può anche contenere una variabile <literal>"
"$(ARCH)</literal> che viene espansa nell'architettura Debian (come "
@@ -8166,9 +8168,9 @@ msgstr "DESCRIZIONE"
#: apt.8:31
msgid ""
"APT is a management system for software packages. For normal day to day "
-"package management there are several frontends available, such as B<aptitude>"
-"(8) for the command line or B<synaptic>(8) for the X Window System. Some "
-"options are only implemented in B<apt-get>(8) though."
+"package management there are several frontends available, such as "
+"B<aptitude>(8) for the command line or B<synaptic>(8) for the X Window "
+"System. Some options are only implemented in B<apt-get>(8) though."
msgstr ""
"APT è un sistema di gestione per i pacchetti software. Per la normale "
"gestione quotidiana dei pacchetti sono disponibili diverse interfacce, quali "
@@ -8222,8 +8224,8 @@ msgid ""
"B<reportbug>(1) command."
msgstr ""
"Vedere E<lt>http://bugs.debian.org/aptE<gt>. Per segnalare un bug in B<apt>, "
-"vedere I</usr/share/doc/debian/bug-reporting.txt> o il comando B<reportbug>"
-"(1)."
+"vedere I</usr/share/doc/debian/bug-reporting.txt> o il comando "
+"B<reportbug>(1)."
#. type: SH
#: apt.8:51
diff --git a/doc/po/ja.po b/doc/po/ja.po
index cb2ae7f48..866cf0e43 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -8,7 +8,11 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.7.25.3\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
+<<<<<<< HEAD
"POT-Creation-Date: 2013-04-30 10:29+0300\n"
+=======
+"POT-Creation-Date: 2013-06-13 13:46+0300\n"
+>>>>>>> upstream/debian/sid
"PO-Revision-Date: 2012-08-08 07:58+0900\n"
"Last-Translator: KURASAWA Nozomu <nabetaro@debian.or.jp>\n"
"Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
@@ -800,9 +804,9 @@ msgid ""
"installation or upgrading. Each package is a package name, not a fully "
"qualified filename (for instance, in a Debian system, <package>apt-utils</"
"package> would be the argument provided, not <filename>apt-utils_&apt-"
-"product-version;_amd64.deb</filename>). All packages required by the package"
-"(s) specified for installation will also be retrieved and installed. The "
-"<filename>/etc/apt/sources.list</filename> file is used to locate the "
+"product-version;_amd64.deb</filename>). All packages required by the "
+"package(s) specified for installation will also be retrieved and installed. "
+"The <filename>/etc/apt/sources.list</filename> file is used to locate the "
"desired packages. If a hyphen is appended to the package name (with no "
"intervening space), the identified package will be removed if it is "
"installed. Similarly a plus sign can be used to designate a package to "
@@ -1530,14 +1534,14 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:518 apt-cache.8.xml:343 apt-key.8.xml:174 apt-mark.8.xml:125
-#: apt.conf.5.xml:1168 apt_preferences.5.xml:698
+#: apt.conf.5.xml:1167 apt_preferences.5.xml:698
msgid "Files"
msgstr "ファイル"
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131
#: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109
-#: apt.conf.5.xml:1174 apt_preferences.5.xml:705 sources.list.5.xml:252
+#: apt.conf.5.xml:1173 apt_preferences.5.xml:705 sources.list.5.xml:252
#: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63
#: apt-ftparchive.1.xml:607
msgid "See Also"
@@ -3182,14 +3186,14 @@ msgstr "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
#. type: Content of: <refentry><refsect1><para>
#: apt.conf.5.xml:101
msgid ""
-"In general the sample configuration file in <filename>&docdir;examples/apt."
-"conf</filename> &configureindex; is a good guide for how it should look."
+"In general the sample configuration file &configureindex; is a good guide "
+"for how it should look."
msgstr ""
-"<filename>&docdir;examples/apt.conf</filename> &configureindex; は一般的な設"
-"定ファイルのサンプルです。どのように設定するか参考になるでしょう。"
+"&configureindex; は一般的な設定ファイルのサンプルです。どのように設定するか参"
+"考になるでしょう。"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:105
+#: apt.conf.5.xml:104
msgid ""
"Case is not significant in names of configuration items, so in the previous "
"example you could use <literal>dpkg::pre-install-pkgs</literal>."
@@ -3198,7 +3202,7 @@ msgstr ""
"<literal>dpkg::pre-install-pkgs</literal> とすることもできます。"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:108
+#: apt.conf.5.xml:107
msgid ""
"Names for the configuration items are optional if a list is defined as can "
"be seen in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. If "
@@ -3213,7 +3217,7 @@ msgstr ""
"できます。"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:113
+#: apt.conf.5.xml:112
msgid ""
"Two special commands are defined: <literal>#include</literal> (which is "
"deprecated and not supported by alternative implementations) and "
@@ -3232,7 +3236,7 @@ msgstr ""
"があることに注意してください)。"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:123
+#: apt.conf.5.xml:122
msgid ""
"The <literal>#clear</literal> command is the only way to delete a list or a "
"complete scope. Reopening a scope (or using the syntax described below with "
@@ -3247,7 +3251,7 @@ msgstr ""
"せん。クリアされるだけです。"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:131
+#: apt.conf.5.xml:130
msgid ""
"All of the APT tools take an -o option which allows an arbitrary "
"configuration directive to be specified on the command line. The syntax is a "
@@ -3265,7 +3269,7 @@ msgstr ""
"ん)。"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:139
+#: apt.conf.5.xml:138
msgid ""
"Note that appending items to a list using <literal>::</literal> only works "
"for one item per line, and that you should not use it in combination with "
@@ -3293,12 +3297,12 @@ msgstr ""
"かない限りは、自分でそのような構文を修正してください。"
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:154
+#: apt.conf.5.xml:153
msgid "The APT Group"
msgstr "APT グループ"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:155
+#: apt.conf.5.xml:154
msgid ""
"This group of options controls general APT behavior as well as holding the "
"options for all of the tools."
@@ -3307,7 +3311,7 @@ msgstr ""
"御します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:160
+#: apt.conf.5.xml:159
msgid ""
"System Architecture; sets the architecture to use when fetching files and "
"parsing package lists. The internal default is the architecture apt was "
@@ -3318,7 +3322,7 @@ msgstr ""
"ルしたアーキテクチャです。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:167
+#: apt.conf.5.xml:166
msgid ""
"All Architectures the system supports. For instance, CPUs implementing the "
"<literal>amd64</literal> (also called <literal>x86-64</literal>) "
@@ -3339,7 +3343,7 @@ msgstr ""
"加します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:180
+#: apt.conf.5.xml:179
msgid ""
"Default release to install packages from if more than one version is "
"available. Contains release name, codename or release version. Examples: "
@@ -3352,7 +3356,7 @@ msgstr ""
"'4.0', '5.0*' となります。&apt-preferences; も参照してください。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:186
+#: apt.conf.5.xml:185
msgid ""
"Ignore held packages; this global option causes the problem resolver to "
"ignore held packages in its decision making."
@@ -3361,7 +3365,7 @@ msgstr ""
"パッケージを無視します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:191
+#: apt.conf.5.xml:190
msgid ""
"Defaults to on. When turned on the autoclean feature will remove any "
"packages which can no longer be downloaded from the cache. If turned off "
@@ -3375,7 +3379,7 @@ msgstr ""
"注意してください。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:199
+#: apt.conf.5.xml:198
msgid ""
"Defaults to on, which will cause APT to install essential and important "
"packages as soon as possible in an install/upgrade operation, in order to "
@@ -3399,7 +3403,7 @@ msgstr ""
"なり、A への依存関係は、もう満たせません。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:211
+#: apt.conf.5.xml:210
msgid ""
"The immediate configuration marker is also applied in the potentially "
"problematic case of circular dependencies, since a dependency with the "
@@ -3424,7 +3428,7 @@ msgstr ""
"述のシナリオを解決する方法の、1つにしかすぎないのです。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:224
+#: apt.conf.5.xml:223
msgid ""
"Before a big operation like <literal>dist-upgrade</literal> is run with this "
"option disabled you should try to explicitly <literal>install</literal> the "
@@ -3440,7 +3444,7 @@ msgstr ""
"も報告していただきたいです。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:235
+#: apt.conf.5.xml:234
msgid ""
"Never enable this option unless you <emphasis>really</emphasis> know what "
"you are doing. It permits APT to temporarily remove an essential package to "
@@ -3461,7 +3465,7 @@ msgstr ""
"それらが依存しているパッケージ以外の不可欠パッケージで動作します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:247
+#: apt.conf.5.xml:246
msgid ""
"APT uses since version 0.7.26 a resizable memory mapped cache file to store "
"the available information. <literal>Cache-Start</literal> acts as a hint of "
@@ -3495,12 +3499,12 @@ msgstr ""
"の自動増加を無効にします。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:263
+#: apt.conf.5.xml:262
msgid "Defines which packages are considered essential build dependencies."
msgstr "構築依存関係で不可欠なパッケージを定義します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:267
+#: apt.conf.5.xml:266
msgid ""
"The Get subsection controls the &apt-get; tool; please see its documentation "
"for more information about the options here."
@@ -3509,7 +3513,7 @@ msgstr ""
"&apt-get; の文書を参照してください。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:272
+#: apt.conf.5.xml:271
msgid ""
"The Cache subsection controls the &apt-cache; tool; please see its "
"documentation for more information about the options here."
@@ -3518,7 +3522,7 @@ msgstr ""
"は &apt-cache; の文書を参照してください。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:277
+#: apt.conf.5.xml:276
msgid ""
"The CDROM subsection controls the &apt-cdrom; tool; please see its "
"documentation for more information about the options here."
@@ -3527,12 +3531,12 @@ msgstr ""
"は &apt-cdrom; の文書を参照してください。"
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:283
+#: apt.conf.5.xml:282
msgid "The Acquire Group"
msgstr "Acquire グループ"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:284
+#: apt.conf.5.xml:283
msgid ""
"The <literal>Acquire</literal> group of options controls the download of "
"packages as well as the various \"acquire methods\" responsible for the "
@@ -3543,7 +3547,7 @@ msgstr ""
"(&sources-list; も参照)。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:291
+#: apt.conf.5.xml:290
msgid ""
"Security related option defaulting to true, as giving a Release file's "
"validation an expiration date prevents replay attacks over a long timescale, "
@@ -3563,7 +3567,7 @@ msgstr ""
"下の <literal>Max-ValidTime</literal> オプションを使用できます。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:304
+#: apt.conf.5.xml:303
msgid ""
"Maximum time (in seconds) after its creation (as indicated by the "
"<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3581,7 +3585,7 @@ msgstr ""
"固有の設定を作成できます。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:316
+#: apt.conf.5.xml:315
msgid ""
"Minimum time (in seconds) after its creation (as indicated by the "
"<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3599,7 +3603,7 @@ msgstr ""
"定を作成できます。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:328
+#: apt.conf.5.xml:327
msgid ""
"Try to download deltas called <literal>PDiffs</literal> for indexes (like "
"<filename>Packages</filename> files) instead of downloading whole ones. True "
@@ -3610,7 +3614,7 @@ msgstr ""
"す。デフォルトでは True です。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:331
+#: apt.conf.5.xml:330
msgid ""
"Two sub-options to limit the use of PDiffs are also available: "
"<literal>FileLimit</literal> can be used to specify a maximum number of "
@@ -3626,7 +3630,7 @@ msgstr ""
"も、パッチをダウンロードする代わりに、完全なファイルをダウンロードします。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:341
+#: apt.conf.5.xml:340
msgid ""
"Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
"literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -3640,7 +3644,7 @@ msgstr ""
"<literal>access</literal> は、URI タイプごとに 1 接続を開きます。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:349
+#: apt.conf.5.xml:348
msgid ""
"Number of retries to perform. If this is non-zero APT will retry failed "
"files the given number of times."
@@ -3649,7 +3653,7 @@ msgstr ""
"えられた回数だけリトライを行います。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:354
+#: apt.conf.5.xml:353
msgid ""
"Use symlinks for source archives. If set to true then source archives will "
"be symlinked when possible instead of copying. True is the default."
@@ -3659,7 +3663,7 @@ msgstr ""
"す。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:359
+#: apt.conf.5.xml:358
msgid ""
"<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. "
"It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</"
@@ -3677,7 +3681,7 @@ msgstr ""
"ないと、環境変数 <envar>http_proxy</envar> を使用します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:367
+#: apt.conf.5.xml:366
msgid ""
"Three settings are provided for cache control with HTTP/1.1 compliant proxy "
"caches. <literal>No-Cache</literal> tells the proxy not to use its cached "
@@ -3696,7 +3700,7 @@ msgstr ""
"が汚れるのを防げます。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:377 apt.conf.5.xml:449
+#: apt.conf.5.xml:376 apt.conf.5.xml:448
msgid ""
"The option <literal>timeout</literal> sets the timeout timer used by the "
"method; this value applies to the connection as well as the data timeout."
@@ -3706,7 +3710,7 @@ msgstr ""
"す。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:380
+#: apt.conf.5.xml:379
msgid ""
"The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
"enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e."
@@ -3724,7 +3728,7 @@ msgstr ""
"フォルト値は 0 (= 無効) です。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:387
+#: apt.conf.5.xml:386
msgid ""
"<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
"follow redirects, which is enabled by default."
@@ -3733,7 +3737,7 @@ msgstr ""
"かどうかを制御します。デフォルトでは有効です。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:390
+#: apt.conf.5.xml:389
msgid ""
"The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
"literal> which accepts integer values in kilobytes. The default value is 0 "
@@ -3747,7 +3751,7 @@ msgstr ""
"ロードしなくなることに注意してください)。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:395
+#: apt.conf.5.xml:394
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 "
@@ -3758,7 +3762,7 @@ msgstr ""
"ロードするための、異なる User-Agent を設定できます。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:403
+#: apt.conf.5.xml:402
msgid ""
"The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
"<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
@@ -3775,7 +3779,7 @@ msgstr ""
"していません。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:411
+#: apt.conf.5.xml:410
msgid ""
"<literal>CaInfo</literal> suboption specifies place of file that holds info "
"about trusted certificates. <literal>&lt;host&gt;::CaInfo</literal> is the "
@@ -3813,7 +3817,7 @@ msgstr ""
"ごとのオプションです。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:432
+#: apt.conf.5.xml:431
msgid ""
"<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs. "
"It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</"
@@ -3839,13 +3843,13 @@ msgstr ""
"るには、設定ファイルに <literal>ftp::ProxyLogin</literal> スクリプトを設定す"
"る必要があります。このエントリには、接続する際にプロキシサーバに送信するコマ"
"ンドを設定します。どのようにするのかは &configureindex; の例を参照してくださ"
-"い。URI を構成するコンポーネントに対応する置換変数は、<literal>$(PROXY_USER)"
-"</literal>, <literal>$(PROXY_PASS)</literal>, <literal>$(SITE_USER)</"
-"literal>, <literal>$(SITE_PASS)</literal>, <literal>$(SITE)</literal>, "
-"<literal>$(SITE_PORT)</literal> です。"
+"い。URI を構成するコンポーネントに対応する置換変数は、<literal>"
+"$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, <literal>"
+"$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, <literal>$(SITE)</"
+"literal>, <literal>$(SITE_PORT)</literal> です。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:452
+#: apt.conf.5.xml:451
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, "
@@ -3860,7 +3864,7 @@ msgstr ""
"定例はサンプル設定ファイルを参照してください)。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:459
+#: apt.conf.5.xml:458
msgid ""
"It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
"envar> environment variable to an HTTP URL - see the discussion of the http "
@@ -3873,7 +3877,7 @@ msgstr ""
"FTP over HTTP を使用するのは推奨しません。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:464
+#: apt.conf.5.xml:463
msgid ""
"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -3889,13 +3893,13 @@ msgstr ""
"いことに注意してください。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:478
+#: apt.conf.5.xml:477
#, no-wrap
msgid "/cdrom/::Mount \"foo\";"
msgstr "/cdrom/::Mount \"foo\";"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:473
+#: apt.conf.5.xml:472
msgid ""
"For URIs using the <literal>cdrom</literal> method, the only configurable "
"option is the mount point, <literal>cdrom::Mount</literal>, which must be "
@@ -3916,7 +3920,7 @@ msgstr ""
"マンドは UMount で指定することができます。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:486
+#: apt.conf.5.xml:485
msgid ""
"For GPGV URIs the only configurable option is <literal>gpgv::Options</"
"literal>, which passes additional parameters to gpgv."
@@ -3925,13 +3929,13 @@ msgstr ""
"る、<literal>gpgv::Options</literal> です。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:497
+#: apt.conf.5.xml:496
#, no-wrap
msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
msgstr "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:492
+#: apt.conf.5.xml:491
msgid ""
"List of compression types which are understood by the acquire methods. "
"Files like <filename>Packages</filename> can be available in various "
@@ -3949,19 +3953,19 @@ msgstr ""
"す。構文は以下のようになります。<placeholder type=\"synopsis\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:502
+#: apt.conf.5.xml:501
#, no-wrap
msgid "Acquire::CompressionTypes::Order:: \"gz\";"
msgstr "Acquire::CompressionTypes::Order:: \"gz\";"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:505
+#: apt.conf.5.xml:504
#, no-wrap
msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:498
+#: apt.conf.5.xml:497
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 "
@@ -3990,13 +3994,13 @@ msgstr ""
"<literal>bz2</literal> は自動的に追加されるため、明示する必要はありません。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:511
#, no-wrap
msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:507
+#: apt.conf.5.xml:506
msgid ""
"Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></"
"literal> will be checked at run time. If this option has been set, the "
@@ -4020,7 +4024,7 @@ msgstr ""
"のみ定義されます。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:517
+#: apt.conf.5.xml:516
msgid ""
"The special type <literal>uncompressed</literal> can be used to give "
"uncompressed files a preference, but note that most archives don't provide "
@@ -4031,7 +4035,7 @@ msgstr ""
"んどローカルミラーでのみ有効になることに注意してください。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:524
+#: apt.conf.5.xml:523
msgid ""
"When downloading <literal>gzip</literal> compressed indexes (Packages, "
"Sources, or Translations), keep them gzip compressed locally instead of "
@@ -4044,7 +4048,7 @@ msgstr ""
"する際に、CPU の能力を余計に消費します。デフォルトでは false です。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:532
+#: apt.conf.5.xml:531
msgid ""
"The Languages subsection controls which <filename>Translation</filename> "
"files are downloaded and in which order APT tries to display the description-"
@@ -4062,13 +4066,13 @@ msgstr ""
"意してください。長い言語コードは特に見かけません。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:549
+#: apt.conf.5.xml:548
#, no-wrap
msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:537
+#: apt.conf.5.xml:536
msgid ""
"The default list includes \"environment\" and \"en\". "
"\"<literal>environment</literal>\" has a special meaning here: it will be "
@@ -4105,7 +4109,7 @@ msgstr ""
"ことに注意してください。<placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:550
+#: apt.conf.5.xml:549
msgid ""
"Note: To prevent problems resulting from APT being executed in different "
"environments (e.g. by different users or by other programs) all Translation "
@@ -4118,22 +4122,22 @@ msgstr ""
"後) に追加します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:559
+#: apt.conf.5.xml:558
msgid "When downloading, force to use only the IPv4 protocol."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:565
+#: apt.conf.5.xml:564
msgid "When downloading, force to use only the IPv6 protocol."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:572
+#: apt.conf.5.xml:571
msgid "Directories"
msgstr "ディレクトリ"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:574
+#: apt.conf.5.xml:573
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
"local state information. <literal>lists</literal> is the directory to place "
@@ -4152,7 +4156,7 @@ msgstr ""
"サブアイテムすべてに、前に付加するデフォルトディレクトリを含んでいます。"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:581
+#: apt.conf.5.xml:580
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -4173,7 +4177,7 @@ msgstr ""
"様、<literal>Dir::Cache</literal> はデフォルトディレクトリを含んでいます。"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:590
+#: apt.conf.5.xml:589
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
"<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4187,7 +4191,7 @@ msgstr ""
"ファイルを指定された場合のみ、この設定の効果があります)"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:596
+#: apt.conf.5.xml:595
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 "
@@ -4198,7 +4202,7 @@ msgstr ""
"します。"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:600
+#: apt.conf.5.xml:599
msgid ""
"Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
"Bin::Methods</literal> specifies the location of the method handlers and "
@@ -4215,7 +4219,7 @@ msgstr ""
"プログラムの場所を指定します。"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:608
+#: apt.conf.5.xml:607
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
"set, all paths in <literal>Dir::</literal> will be relative to "
@@ -4235,7 +4239,7 @@ msgstr ""
"<filename>/tmp/staging/var/lib/dpkg/status</filename> から探します。"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:621
+#: apt.conf.5.xml:620
msgid ""
"The <literal>Ignore-Files-Silently</literal> list can be used to specify "
"which files APT should silently ignore while parsing the files in the "
@@ -4251,12 +4255,12 @@ msgstr ""
"フォルト値を見ればわかる通り、このパターンには正規表現を使用できます。"
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:630
+#: apt.conf.5.xml:629
msgid "APT in DSelect"
msgstr "DSelect での APT"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:632
+#: apt.conf.5.xml:631
msgid ""
"When APT is used as a &dselect; method several configuration directives "
"control the default behavior. These are in the <literal>DSelect</literal> "
@@ -4267,7 +4271,7 @@ msgstr ""
"ます。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:637
+#: apt.conf.5.xml:636
msgid ""
"Cache Clean mode; this value may be one of <literal>always</literal>, "
"<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
@@ -4288,7 +4292,7 @@ msgstr ""
"パッケージをダウンロードする直前に行います。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:651
+#: apt.conf.5.xml:650
msgid ""
"The contents of this variable are passed to &apt-get; as command line "
"options when it is run for the install phase."
@@ -4297,7 +4301,7 @@ msgstr ""
"されます。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:656
+#: apt.conf.5.xml:655
msgid ""
"The contents of this variable are passed to &apt-get; as command line "
"options when it is run for the update phase."
@@ -4306,7 +4310,7 @@ msgstr ""
"されます。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:661
+#: apt.conf.5.xml:660
msgid ""
"If true the [U]pdate operation in &dselect; will always prompt to continue. "
"The default is to prompt only on error."
@@ -4315,12 +4319,12 @@ msgstr ""
"します。デフォルトはエラーが発生した場合のみです。"
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:667
+#: apt.conf.5.xml:666
msgid "How APT calls &dpkg;"
msgstr "APT が &dpkg; を呼ぶ方法"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:668
+#: apt.conf.5.xml:667
msgid ""
"Several configuration directives control how APT invokes &dpkg;. These are "
"in the <literal>DPkg</literal> section."
@@ -4329,7 +4333,7 @@ msgstr ""
"<literal>DPkg</literal> セクションにあります。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:673
+#: apt.conf.5.xml:672
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 "
@@ -4339,7 +4343,7 @@ msgstr ""
"なければなりません。また、各リストは単一の引数として &dpkg; に渡されます。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:679
+#: apt.conf.5.xml:678
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 "
@@ -4351,7 +4355,7 @@ msgstr ""
"bin/sh</filename> を通して呼び出され、何か問題があれば APT が異常終了します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:686
+#: apt.conf.5.xml:685
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 "
@@ -4366,7 +4370,7 @@ msgstr ""
"マンドの標準入力に送ります。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:692
+#: apt.conf.5.xml:691
msgid ""
"Version 2 of this protocol dumps more information, including the protocol "
"version, the APT configuration space and the packages, files and versions "
@@ -4381,7 +4385,7 @@ msgstr ""
"Install-Pkgs</literal> で与えられるコマンドです。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:700
+#: apt.conf.5.xml:699
msgid ""
"APT chdirs to this directory before invoking &dpkg;, the default is "
"<filename>/</filename>."
@@ -4390,7 +4394,7 @@ msgstr ""
"<filename>/</filename> です。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:705
+#: apt.conf.5.xml:704
msgid ""
"These options are passed to &dpkg-buildpackage; when compiling packages; the "
"default is to disable signing and produce all binaries."
@@ -4399,12 +4403,12 @@ msgstr ""
"ます。デフォルトでは署名を無効にし、全バイナリを生成します。"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:710
+#: apt.conf.5.xml:709
msgid "dpkg trigger usage (and related options)"
msgstr "dpkg トリガの使い方 (および関連オプション)"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:711
+#: apt.conf.5.xml:710
msgid ""
"APT can call &dpkg; in such a way as to let it make aggressive use of "
"triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
@@ -4428,7 +4432,7 @@ msgstr ""
"(もしくはそれ以上) の時間 100% のままとなり、進捗レポートを壊してしまいます。"
#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:726
+#: apt.conf.5.xml:725
#, no-wrap
msgid ""
"DPkg::NoTriggers \"true\";\n"
@@ -4442,7 +4446,7 @@ msgstr ""
"DPkg::TriggersPending \"true\";"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:720
+#: apt.conf.5.xml:719
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 "
@@ -4465,7 +4469,7 @@ msgstr ""
"\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:733
+#: apt.conf.5.xml:732
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 "
@@ -4485,7 +4489,7 @@ msgstr ""
"在 APT は、このフラグを、展開呼び出しや削除呼び出しにも追加します。"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:741
+#: apt.conf.5.xml:740
msgid ""
"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
"and \"<literal>no</literal>\". The default value is \"<literal>all</literal>"
@@ -4512,7 +4516,7 @@ msgstr ""
"能性があるからです。"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:756
+#: apt.conf.5.xml:755
msgid ""
"If this option is set APT will call <command>dpkg --configure --pending</"
"command> to let &dpkg; handle all required configurations and triggers. This "
@@ -4529,7 +4533,7 @@ msgstr ""
"では、最後以外のすべての実行で、無効にできます。"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:763
+#: apt.conf.5.xml:762
msgid ""
"Useful for the <literal>smart</literal> configuration as a package which has "
"pending triggers is not considered as <literal>installed</literal>, and "
@@ -4544,7 +4548,7 @@ msgstr ""
"ことに注意してください。"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:776
+#: apt.conf.5.xml:775
#, no-wrap
msgid ""
"OrderList::Score {\n"
@@ -4562,7 +4566,7 @@ msgstr ""
"};"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:769
+#: apt.conf.5.xml:768
msgid ""
"Essential packages (and their dependencies) should be configured immediately "
"after unpacking. It is a good idea to do this quite early in the upgrade "
@@ -4585,12 +4589,12 @@ msgstr ""
"\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:789
+#: apt.conf.5.xml:788
msgid "Periodic and Archives options"
msgstr "Periodic オプションと Archives オプション"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:790
+#: apt.conf.5.xml:789
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by the "
@@ -4603,12 +4607,12 @@ msgstr ""
"トは、このスクリプトの先頭を参照してください。"
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:798
+#: apt.conf.5.xml:797
msgid "Debug options"
msgstr "デバッグオプション"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:800
+#: apt.conf.5.xml:799
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -4624,7 +4628,7 @@ msgstr ""
"のオプションは興味がないでしょうが、以下のものは興味を引くかもしれません。"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:811
+#: apt.conf.5.xml:810
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -4635,7 +4639,7 @@ msgstr ""
"にします。"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:819
+#: apt.conf.5.xml:818
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s install</"
@@ -4646,7 +4650,7 @@ msgstr ""
"literal>) を行う場合に使用します。"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:828
+#: apt.conf.5.xml:827
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -4658,7 +4662,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:836
+#: apt.conf.5.xml:835
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
"in CD-ROM IDs."
@@ -4667,34 +4671,34 @@ msgstr ""
"ないようにします。"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:846
+#: apt.conf.5.xml:845
msgid "A full list of debugging options to apt follows."
msgstr "以下は apt に対するデバッグオプションのすべてです。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:855
+#: apt.conf.5.xml:854
msgid ""
"Print information related to accessing <literal>cdrom://</literal> sources."
msgstr ""
"<literal>cdrom://</literal> ソースへのアクセスに関する情報を出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:866
+#: apt.conf.5.xml:865
msgid "Print information related to downloading packages using FTP."
msgstr "FTP を用いたパッケージのダウンロードに関する情報を出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:877
+#: apt.conf.5.xml:876
msgid "Print information related to downloading packages using HTTP."
msgstr "HTTP を用いたパッケージのダウンロードに関する情報を出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:888
+#: apt.conf.5.xml:887
msgid "Print information related to downloading packages using HTTPS."
msgstr "HTTPS を用いたパッケージのダウンロードに関する情報を出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:899
+#: apt.conf.5.xml:898
msgid ""
"Print information related to verifying cryptographic signatures using "
"<literal>gpg</literal>."
@@ -4702,7 +4706,7 @@ msgstr ""
"<literal>gpg</literal> を用いた暗号署名の検証に関する情報を出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:910
+#: apt.conf.5.xml:909
msgid ""
"Output information about the process of accessing collections of packages "
"stored on CD-ROMs."
@@ -4711,12 +4715,12 @@ msgstr ""
"します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:920
+#: apt.conf.5.xml:919
msgid "Describes the process of resolving build-dependencies in &apt-get;."
msgstr "&apt-get; での構築依存関係解決のプロセスを説明します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:930
+#: apt.conf.5.xml:929
msgid ""
"Output each cryptographic hash that is generated by the <literal>apt</"
"literal> libraries."
@@ -4724,7 +4728,7 @@ msgstr ""
"<literal>apt</literal> ライブラリが生成した、暗号化ハッシュを出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:940
+#: apt.conf.5.xml:939
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 "
@@ -4734,7 +4738,7 @@ msgstr ""
"システムにある使用済・未使用ブロックの数からの情報を含めないようにします。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:951
+#: apt.conf.5.xml:950
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."
@@ -4743,13 +4747,13 @@ msgstr ""
"<quote><literal>apt-get update</literal></quote> を実行できるようになります。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:963
+#: apt.conf.5.xml:962
msgid "Log when items are added to or removed from the global download queue."
msgstr ""
"グローバルダウンロードキューに対する項目の追加・削除の際にログを出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:973
+#: apt.conf.5.xml:972
msgid ""
"Output status messages and errors related to verifying checksums and "
"cryptographic signatures of downloaded files."
@@ -4758,7 +4762,7 @@ msgstr ""
"ジやエラーを出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:983
+#: apt.conf.5.xml:982
msgid ""
"Output information about downloading and applying package index list diffs, "
"and errors relating to package index list diffs."
@@ -4767,7 +4771,7 @@ msgstr ""
"します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:995
+#: apt.conf.5.xml:994
msgid ""
"Output information related to patching apt package lists when downloading "
"index diffs instead of full indices."
@@ -4776,14 +4780,14 @@ msgstr ""
"リストへのパッチ適用に関する情報を出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1006
+#: apt.conf.5.xml:1005
msgid ""
"Log all interactions with the sub-processes that actually perform downloads."
msgstr ""
"実際のダウンロードを行う際の、サブプロセスとのやりとりをログに出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1017
+#: apt.conf.5.xml:1016
msgid ""
"Log events related to the automatically-installed status of packages and to "
"the removal of unused packages."
@@ -4792,7 +4796,7 @@ msgstr ""
"に出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1027
+#: apt.conf.5.xml:1026
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial auto-"
@@ -4807,7 +4811,7 @@ msgstr ""
"路に対応しています。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1041
+#: apt.conf.5.xml:1040
msgid ""
"Generate debug messages describing which packages are marked as keep/install/"
"remove while the ProblemResolver does his work. Each addition or deletion "
@@ -4836,7 +4840,7 @@ msgstr ""
"ます。<literal>section</literal> はパッケージが現れるセクション名です。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1062
+#: apt.conf.5.xml:1061
msgid ""
"When invoking &dpkg;, output the precise command line with which it is being "
"invoked, with arguments separated by a single space character."
@@ -4845,7 +4849,7 @@ msgstr ""
"切られます。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1073
+#: apt.conf.5.xml:1072
msgid ""
"Output all the data received from &dpkg; on the status file descriptor and "
"any errors encountered while parsing it."
@@ -4854,7 +4858,7 @@ msgstr ""
"を解析中に発生したエラーを出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1084
+#: apt.conf.5.xml:1083
msgid ""
"Generate a trace of the algorithm that decides the order in which "
"<literal>apt</literal> should pass packages to &dpkg;."
@@ -4863,18 +4867,18 @@ msgstr ""
"のトレースを生成します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1096
+#: apt.conf.5.xml:1095
msgid ""
"Output status messages tracing the steps performed when invoking &dpkg;."
msgstr "&dpkg; を呼び出す際に、実行手順を追跡した状態メッセージを出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1107
+#: apt.conf.5.xml:1106
msgid "Output the priority of each package list on startup."
msgstr "起動時の各パッケージの優先度を表示します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1117
+#: apt.conf.5.xml:1116
msgid ""
"Trace the execution of the dependency resolver (this applies only to what "
"happens when a complex dependency problem is encountered)."
@@ -4883,7 +4887,7 @@ msgstr ""
"した場合にのみ、適用されます)。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1128
+#: apt.conf.5.xml:1127
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 "
@@ -4894,7 +4898,7 @@ msgstr ""
"説明したものと同じです。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1140
+#: apt.conf.5.xml:1139
msgid ""
"Print information about the vendors read from <filename>/etc/apt/vendors."
"list</filename>."
@@ -4903,13 +4907,13 @@ msgstr ""
"します。"
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1162 apt_preferences.5.xml:545 sources.list.5.xml:211
+#: apt.conf.5.xml:1161 apt_preferences.5.xml:545 sources.list.5.xml:211
#: apt-ftparchive.1.xml:596
msgid "Examples"
msgstr "サンプル"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1163
+#: apt.conf.5.xml:1162
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
@@ -4919,7 +4923,7 @@ msgstr ""
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1175
+#: apt.conf.5.xml:1174
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
@@ -6376,13 +6380,13 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:92
msgid ""
-"<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)"
-"</literal> which expands to the Debian architecture (such as <literal>amd64</"
-"literal> or <literal>armel</literal>) used on the system. This permits "
-"architecture-independent <filename>sources.list</filename> files to be used. "
-"In general this is only of interest when specifying an exact path, "
-"<literal>APT</literal> will automatically generate a URI with the current "
-"architecture otherwise."
+"<literal>distribution</literal> may also contain a variable, <literal>"
+"$(ARCH)</literal> which expands to the Debian architecture (such as "
+"<literal>amd64</literal> or <literal>armel</literal>) used on the system. "
+"This permits architecture-independent <filename>sources.list</filename> "
+"files to be used. In general this is only of interest when specifying an "
+"exact path, <literal>APT</literal> will automatically generate a URI with "
+"the current architecture otherwise."
msgstr ""
"<literal>distribution</literal> は、<literal>$(ARCH)</literal> 変数を含む場合"
"があります。<literal>$(ARCH)</literal> 変数は、システムで使用している Debian "
@@ -7832,14 +7836,14 @@ msgstr "説明"
#: apt.8:31
msgid ""
"APT is a management system for software packages. For normal day to day "
-"package management there are several frontends available, such as B<aptitude>"
-"(8) for the command line or B<synaptic>(8) for the X Window System. Some "
-"options are only implemented in B<apt-get>(8) though."
+"package management there are several frontends available, such as "
+"B<aptitude>(8) for the command line or B<synaptic>(8) for the X Window "
+"System. Some options are only implemented in B<apt-get>(8) though."
msgstr ""
"APT はソフトウェアパッケージの管理システムです。日々のパッケージ管理のため"
-"に、コマンドライン用の B<aptitude>(8) や、X Window System 用の B<synaptic>"
-"(8) といった、いくつかのフロントエンドが用意されています。いくつかのオプショ"
-"ンは B<apt-get>(8) にしか実装されていません。"
+"に、コマンドライン用の B<aptitude>(8) や、X Window System 用の "
+"B<synaptic>(8) といった、いくつかのフロントエンドが用意されています。いくつか"
+"のオプションは B<apt-get>(8) にしか実装されていません。"
#. type: SH
#: apt.8:31
diff --git a/doc/po/pl.po b/doc/po/pl.po
index 4388534f8..ee4461f39 100644
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -11,7 +11,11 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.9.7.3\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
+<<<<<<< HEAD
"POT-Creation-Date: 2013-04-30 10:29+0300\n"
+=======
+"POT-Creation-Date: 2013-06-13 13:46+0300\n"
+>>>>>>> upstream/debian/sid
"PO-Revision-Date: 2012-07-28 21:59+0200\n"
"Last-Translator: Robert Luberda <robert@debian.org>\n"
"Language-Team: Polish <manpages-pl-list@lists.sourceforge.net>\n"
@@ -811,9 +815,9 @@ msgid ""
"installation or upgrading. Each package is a package name, not a fully "
"qualified filename (for instance, in a Debian system, <package>apt-utils</"
"package> would be the argument provided, not <filename>apt-utils_&apt-"
-"product-version;_amd64.deb</filename>). All packages required by the package"
-"(s) specified for installation will also be retrieved and installed. The "
-"<filename>/etc/apt/sources.list</filename> file is used to locate the "
+"product-version;_amd64.deb</filename>). All packages required by the "
+"package(s) specified for installation will also be retrieved and installed. "
+"The <filename>/etc/apt/sources.list</filename> file is used to locate the "
"desired packages. If a hyphen is appended to the package name (with no "
"intervening space), the identified package will be removed if it is "
"installed. Similarly a plus sign can be used to designate a package to "
@@ -1613,14 +1617,14 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:518 apt-cache.8.xml:343 apt-key.8.xml:174 apt-mark.8.xml:125
-#: apt.conf.5.xml:1168 apt_preferences.5.xml:698
+#: apt.conf.5.xml:1167 apt_preferences.5.xml:698
msgid "Files"
msgstr "Pliki"
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131
#: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109
-#: apt.conf.5.xml:1174 apt_preferences.5.xml:705 sources.list.5.xml:252
+#: apt.conf.5.xml:1173 apt_preferences.5.xml:705 sources.list.5.xml:252
#: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63
#: apt-ftparchive.1.xml:607
msgid "See Also"
@@ -3362,19 +3366,19 @@ msgstr "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
#. type: Content of: <refentry><refsect1><para>
#: apt.conf.5.xml:101
msgid ""
-"In general the sample configuration file in <filename>&docdir;examples/apt."
-"conf</filename> &configureindex; is a good guide for how it should look."
+"In general the sample configuration file &configureindex; is a good guide "
+"for how it should look."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:105
+#: apt.conf.5.xml:104
msgid ""
"Case is not significant in names of configuration items, so in the previous "
"example you could use <literal>dpkg::pre-install-pkgs</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:108
+#: apt.conf.5.xml:107
msgid ""
"Names for the configuration items are optional if a list is defined as can "
"be seen in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. If "
@@ -3384,7 +3388,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:113
+#: apt.conf.5.xml:112
msgid ""
"Two special commands are defined: <literal>#include</literal> (which is "
"deprecated and not supported by alternative implementations) and "
@@ -3396,7 +3400,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:123
+#: apt.conf.5.xml:122
msgid ""
"The <literal>#clear</literal> command is the only way to delete a list or a "
"complete scope. Reopening a scope (or using the syntax described below with "
@@ -3406,7 +3410,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:131
+#: apt.conf.5.xml:130
msgid ""
"All of the APT tools take an -o option which allows an arbitrary "
"configuration directive to be specified on the command line. The syntax is a "
@@ -3418,7 +3422,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:139
+#: apt.conf.5.xml:138
msgid ""
"Note that appending items to a list using <literal>::</literal> only works "
"for one item per line, and that you should not use it in combination with "
@@ -3435,19 +3439,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:154
+#: apt.conf.5.xml:153
msgid "The APT Group"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:155
+#: apt.conf.5.xml:154
msgid ""
"This group of options controls general APT behavior as well as holding the "
"options for all of the tools."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:160
+#: apt.conf.5.xml:159
msgid ""
"System Architecture; sets the architecture to use when fetching files and "
"parsing package lists. The internal default is the architecture apt was "
@@ -3455,7 +3459,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:167
+#: apt.conf.5.xml:166
msgid ""
"All Architectures the system supports. For instance, CPUs implementing the "
"<literal>amd64</literal> (also called <literal>x86-64</literal>) "
@@ -3468,7 +3472,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:180
+#: apt.conf.5.xml:179
msgid ""
"Default release to install packages from if more than one version is "
"available. Contains release name, codename or release version. Examples: "
@@ -3477,14 +3481,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:186
+#: apt.conf.5.xml:185
msgid ""
"Ignore held packages; this global option causes the problem resolver to "
"ignore held packages in its decision making."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:191
+#: apt.conf.5.xml:190
msgid ""
"Defaults to on. When turned on the autoclean feature will remove any "
"packages which can no longer be downloaded from the cache. If turned off "
@@ -3493,7 +3497,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:199
+#: apt.conf.5.xml:198
msgid ""
"Defaults to on, which will cause APT to install essential and important "
"packages as soon as possible in an install/upgrade operation, in order to "
@@ -3508,7 +3512,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:211
+#: apt.conf.5.xml:210
msgid ""
"The immediate configuration marker is also applied in the potentially "
"problematic case of circular dependencies, since a dependency with the "
@@ -3525,7 +3529,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:224
+#: apt.conf.5.xml:223
msgid ""
"Before a big operation like <literal>dist-upgrade</literal> is run with this "
"option disabled you should try to explicitly <literal>install</literal> the "
@@ -3536,7 +3540,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:235
+#: apt.conf.5.xml:234
msgid ""
"Never enable this option unless you <emphasis>really</emphasis> know what "
"you are doing. It permits APT to temporarily remove an essential package to "
@@ -3549,7 +3553,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:247
+#: apt.conf.5.xml:246
msgid ""
"APT uses since version 0.7.26 a resizable memory mapped cache file to store "
"the available information. <literal>Cache-Start</literal> acts as a hint of "
@@ -3569,38 +3573,38 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:263
+#: apt.conf.5.xml:262
msgid "Defines which packages are considered essential build dependencies."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:267
+#: apt.conf.5.xml:266
msgid ""
"The Get subsection controls the &apt-get; tool; please see its documentation "
"for more information about the options here."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:272
+#: apt.conf.5.xml:271
msgid ""
"The Cache subsection controls the &apt-cache; tool; please see its "
"documentation for more information about the options here."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:277
+#: apt.conf.5.xml:276
msgid ""
"The CDROM subsection controls the &apt-cdrom; tool; please see its "
"documentation for more information about the options here."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:283
+#: apt.conf.5.xml:282
msgid "The Acquire Group"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:284
+#: apt.conf.5.xml:283
msgid ""
"The <literal>Acquire</literal> group of options controls the download of "
"packages as well as the various \"acquire methods\" responsible for the "
@@ -3608,7 +3612,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:291
+#: apt.conf.5.xml:290
msgid ""
"Security related option defaulting to true, as giving a Release file's "
"validation an expiration date prevents replay attacks over a long timescale, "
@@ -3621,7 +3625,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:304
+#: apt.conf.5.xml:303
msgid ""
"Maximum time (in seconds) after its creation (as indicated by the "
"<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3633,7 +3637,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:316
+#: apt.conf.5.xml:315
msgid ""
"Minimum time (in seconds) after its creation (as indicated by the "
"<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3645,7 +3649,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:328
+#: apt.conf.5.xml:327
msgid ""
"Try to download deltas called <literal>PDiffs</literal> for indexes (like "
"<filename>Packages</filename> files) instead of downloading whole ones. True "
@@ -3653,7 +3657,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:331
+#: apt.conf.5.xml:330
msgid ""
"Two sub-options to limit the use of PDiffs are also available: "
"<literal>FileLimit</literal> can be used to specify a maximum number of "
@@ -3664,7 +3668,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:341
+#: apt.conf.5.xml:340
msgid ""
"Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
"literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -3674,21 +3678,21 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:349
+#: apt.conf.5.xml:348
msgid ""
"Number of retries to perform. If this is non-zero APT will retry failed "
"files the given number of times."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:354
+#: apt.conf.5.xml:353
msgid ""
"Use symlinks for source archives. If set to true then source archives will "
"be symlinked when possible instead of copying. True is the default."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:359
+#: apt.conf.5.xml:358
msgid ""
"<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. "
"It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</"
@@ -3700,7 +3704,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:367
+#: apt.conf.5.xml:366
msgid ""
"Three settings are provided for cache control with HTTP/1.1 compliant proxy "
"caches. <literal>No-Cache</literal> tells the proxy not to use its cached "
@@ -3712,14 +3716,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:377 apt.conf.5.xml:449
+#: apt.conf.5.xml:376 apt.conf.5.xml:448
msgid ""
"The option <literal>timeout</literal> sets the timeout timer used by the "
"method; this value applies to the connection as well as the data timeout."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:380
+#: apt.conf.5.xml:379
msgid ""
"The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
"enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e."
@@ -3731,14 +3735,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:387
+#: apt.conf.5.xml:386
msgid ""
"<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
"follow redirects, which is enabled by default."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:390
+#: apt.conf.5.xml:389
msgid ""
"The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
"literal> which accepts integer values in kilobytes. The default value is 0 "
@@ -3748,7 +3752,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:395
+#: apt.conf.5.xml:394
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 "
@@ -3756,7 +3760,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:403
+#: apt.conf.5.xml:402
msgid ""
"The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
"<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
@@ -3767,7 +3771,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:411
+#: apt.conf.5.xml:410
msgid ""
"<literal>CaInfo</literal> suboption specifies place of file that holds info "
"about trusted certificates. <literal>&lt;host&gt;::CaInfo</literal> is the "
@@ -3789,7 +3793,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:432
+#: apt.conf.5.xml:431
msgid ""
"<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs. "
"It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</"
@@ -3808,7 +3812,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:452
+#: apt.conf.5.xml:451
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, "
@@ -3818,7 +3822,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:459
+#: apt.conf.5.xml:458
msgid ""
"It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
"envar> environment variable to an HTTP URL - see the discussion of the http "
@@ -3827,7 +3831,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:464
+#: apt.conf.5.xml:463
msgid ""
"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -3837,13 +3841,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:478
+#: apt.conf.5.xml:477
#, no-wrap
msgid "/cdrom/::Mount \"foo\";"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:473
+#: apt.conf.5.xml:472
msgid ""
"For URIs using the <literal>cdrom</literal> method, the only configurable "
"option is the mount point, <literal>cdrom::Mount</literal>, which must be "
@@ -3856,20 +3860,20 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:486
+#: apt.conf.5.xml:485
msgid ""
"For GPGV URIs the only configurable option is <literal>gpgv::Options</"
"literal>, which passes additional parameters to gpgv."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:497
+#: apt.conf.5.xml:496
#, no-wrap
msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:492
+#: apt.conf.5.xml:491
msgid ""
"List of compression types which are understood by the acquire methods. "
"Files like <filename>Packages</filename> can be available in various "
@@ -3881,19 +3885,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:502
+#: apt.conf.5.xml:501
#, no-wrap
msgid "Acquire::CompressionTypes::Order:: \"gz\";"
msgstr "Acquire::CompressionTypes::Order:: \"gz\";"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:505
+#: apt.conf.5.xml:504
#, no-wrap
msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:498
+#: apt.conf.5.xml:497
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 "
@@ -3911,13 +3915,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:511
#, no-wrap
msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:507
+#: apt.conf.5.xml:506
msgid ""
"Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></"
"literal> will be checked at run time. If this option has been set, the "
@@ -3932,7 +3936,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:517
+#: apt.conf.5.xml:516
msgid ""
"The special type <literal>uncompressed</literal> can be used to give "
"uncompressed files a preference, but note that most archives don't provide "
@@ -3940,7 +3944,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:524
+#: apt.conf.5.xml:523
msgid ""
"When downloading <literal>gzip</literal> compressed indexes (Packages, "
"Sources, or Translations), keep them gzip compressed locally instead of "
@@ -3949,7 +3953,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:532
+#: apt.conf.5.xml:531
msgid ""
"The Languages subsection controls which <filename>Translation</filename> "
"files are downloaded and in which order APT tries to display the description-"
@@ -3961,13 +3965,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:549
+#: apt.conf.5.xml:548
#, no-wrap
msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:537
+#: apt.conf.5.xml:536
msgid ""
"The default list includes \"environment\" and \"en\". "
"\"<literal>environment</literal>\" has a special meaning here: it will be "
@@ -3989,7 +3993,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:550
+#: apt.conf.5.xml:549
msgid ""
"Note: To prevent problems resulting from APT being executed in different "
"environments (e.g. by different users or by other programs) all Translation "
@@ -3998,22 +4002,22 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:559
+#: apt.conf.5.xml:558
msgid "When downloading, force to use only the IPv4 protocol."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:565
+#: apt.conf.5.xml:564
msgid "When downloading, force to use only the IPv6 protocol."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:572
+#: apt.conf.5.xml:571
msgid "Directories"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:574
+#: apt.conf.5.xml:573
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
"local state information. <literal>lists</literal> is the directory to place "
@@ -4025,7 +4029,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:581
+#: apt.conf.5.xml:580
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -4038,7 +4042,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:590
+#: apt.conf.5.xml:589
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
"<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4048,7 +4052,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:596
+#: apt.conf.5.xml:595
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 "
@@ -4056,7 +4060,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:600
+#: apt.conf.5.xml:599
msgid ""
"Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
"Bin::Methods</literal> specifies the location of the method handlers and "
@@ -4067,7 +4071,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:608
+#: apt.conf.5.xml:607
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
"set, all paths in <literal>Dir::</literal> will be relative to "
@@ -4080,7 +4084,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:621
+#: apt.conf.5.xml:620
msgid ""
"The <literal>Ignore-Files-Silently</literal> list can be used to specify "
"which files APT should silently ignore while parsing the files in the "
@@ -4091,12 +4095,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:630
+#: apt.conf.5.xml:629
msgid "APT in DSelect"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:632
+#: apt.conf.5.xml:631
msgid ""
"When APT is used as a &dselect; method several configuration directives "
"control the default behavior. These are in the <literal>DSelect</literal> "
@@ -4104,7 +4108,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:637
+#: apt.conf.5.xml:636
msgid ""
"Cache Clean mode; this value may be one of <literal>always</literal>, "
"<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
@@ -4117,40 +4121,40 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:651
+#: apt.conf.5.xml:650
msgid ""
"The contents of this variable are passed to &apt-get; as command line "
"options when it is run for the install phase."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:656
+#: apt.conf.5.xml:655
msgid ""
"The contents of this variable are passed to &apt-get; as command line "
"options when it is run for the update phase."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:661
+#: apt.conf.5.xml:660
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:667
+#: apt.conf.5.xml:666
msgid "How APT calls &dpkg;"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:668
+#: apt.conf.5.xml:667
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:673
+#: apt.conf.5.xml:672
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 "
@@ -4158,7 +4162,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:679
+#: apt.conf.5.xml:678
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 "
@@ -4167,7 +4171,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:686
+#: apt.conf.5.xml:685
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 "
@@ -4177,7 +4181,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:692
+#: apt.conf.5.xml:691
msgid ""
"Version 2 of this protocol dumps more information, including the protocol "
"version, the APT configuration space and the packages, files and versions "
@@ -4187,26 +4191,26 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:700
+#: apt.conf.5.xml:699
msgid ""
"APT chdirs to this directory before invoking &dpkg;, the default is "
"<filename>/</filename>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:705
+#: apt.conf.5.xml:704
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:710
+#: apt.conf.5.xml:709
msgid "dpkg trigger usage (and related options)"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:711
+#: apt.conf.5.xml:710
msgid ""
"APT can call &dpkg; in such a way as to let it make aggressive use of "
"triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
@@ -4221,7 +4225,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:726
+#: apt.conf.5.xml:725
#, no-wrap
msgid ""
"DPkg::NoTriggers \"true\";\n"
@@ -4235,7 +4239,7 @@ msgstr ""
"DPkg::TriggersPending \"true\";"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:720
+#: apt.conf.5.xml:719
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 "
@@ -4249,7 +4253,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:733
+#: apt.conf.5.xml:732
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 "
@@ -4262,7 +4266,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:741
+#: apt.conf.5.xml:740
msgid ""
"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
"and \"<literal>no</literal>\". The default value is \"<literal>all</literal>"
@@ -4279,7 +4283,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:756
+#: apt.conf.5.xml:755
msgid ""
"If this option is set APT will call <command>dpkg --configure --pending</"
"command> to let &dpkg; handle all required configurations and triggers. This "
@@ -4290,7 +4294,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:763
+#: apt.conf.5.xml:762
msgid ""
"Useful for the <literal>smart</literal> configuration as a package which has "
"pending triggers is not considered as <literal>installed</literal>, and "
@@ -4300,7 +4304,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:776
+#: apt.conf.5.xml:775
#, no-wrap
msgid ""
"OrderList::Score {\n"
@@ -4318,7 +4322,7 @@ msgstr ""
"};"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:769
+#: apt.conf.5.xml:768
msgid ""
"Essential packages (and their dependencies) should be configured immediately "
"after unpacking. It is a good idea to do this quite early in the upgrade "
@@ -4332,12 +4336,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:789
+#: apt.conf.5.xml:788
msgid "Periodic and Archives options"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:790
+#: apt.conf.5.xml:789
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by the "
@@ -4346,13 +4350,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:798
+#: apt.conf.5.xml:797
#, fuzzy
msgid "Debug options"
msgstr "opcje"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:800
+#: apt.conf.5.xml:799
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -4363,7 +4367,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:811
+#: apt.conf.5.xml:810
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -4371,7 +4375,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:819
+#: apt.conf.5.xml:818
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s install</"
@@ -4379,7 +4383,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:828
+#: apt.conf.5.xml:827
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -4389,7 +4393,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:836
+#: apt.conf.5.xml:835
#, fuzzy
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
@@ -4399,59 +4403,59 @@ msgstr ""
"in CDROM IDs."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:846
+#: apt.conf.5.xml:845
msgid "A full list of debugging options to apt follows."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:855
+#: apt.conf.5.xml:854
msgid ""
"Print information related to accessing <literal>cdrom://</literal> sources."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:866
+#: apt.conf.5.xml:865
msgid "Print information related to downloading packages using FTP."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:877
+#: apt.conf.5.xml:876
msgid "Print information related to downloading packages using HTTP."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:888
+#: apt.conf.5.xml:887
msgid "Print information related to downloading packages using HTTPS."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:899
+#: apt.conf.5.xml:898
msgid ""
"Print information related to verifying cryptographic signatures using "
"<literal>gpg</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:910
+#: apt.conf.5.xml:909
msgid ""
"Output information about the process of accessing collections of packages "
"stored on CD-ROMs."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:920
+#: apt.conf.5.xml:919
msgid "Describes the process of resolving build-dependencies in &apt-get;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:930
+#: apt.conf.5.xml:929
msgid ""
"Output each cryptographic hash that is generated by the <literal>apt</"
"literal> libraries."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:940
+#: apt.conf.5.xml:939
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 "
@@ -4459,53 +4463,53 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:951
+#: apt.conf.5.xml:950
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><listitem><para>
-#: apt.conf.5.xml:963
+#: apt.conf.5.xml:962
msgid "Log when items are added to or removed from the global download queue."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:973
+#: apt.conf.5.xml:972
msgid ""
"Output status messages and errors related to verifying checksums and "
"cryptographic signatures of downloaded files."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:983
+#: apt.conf.5.xml:982
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><listitem><para>
-#: apt.conf.5.xml:995
+#: apt.conf.5.xml:994
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><listitem><para>
-#: apt.conf.5.xml:1006
+#: apt.conf.5.xml:1005
msgid ""
"Log all interactions with the sub-processes that actually perform downloads."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1017
+#: apt.conf.5.xml:1016
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><listitem><para>
-#: apt.conf.5.xml:1027
+#: apt.conf.5.xml:1026
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial auto-"
@@ -4515,7 +4519,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1041
+#: apt.conf.5.xml:1040
msgid ""
"Generate debug messages describing which packages are marked as keep/install/"
"remove while the ProblemResolver does his work. Each addition or deletion "
@@ -4533,46 +4537,46 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1062
+#: apt.conf.5.xml:1061
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><listitem><para>
-#: apt.conf.5.xml:1073
+#: apt.conf.5.xml:1072
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><listitem><para>
-#: apt.conf.5.xml:1084
+#: apt.conf.5.xml:1083
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><listitem><para>
-#: apt.conf.5.xml:1096
+#: apt.conf.5.xml:1095
msgid ""
"Output status messages tracing the steps performed when invoking &dpkg;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1107
+#: apt.conf.5.xml:1106
msgid "Output the priority of each package list on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1117
+#: apt.conf.5.xml:1116
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><listitem><para>
-#: apt.conf.5.xml:1128
+#: apt.conf.5.xml:1127
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 "
@@ -4580,20 +4584,20 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1140
+#: apt.conf.5.xml:1139
msgid ""
"Print information about the vendors read from <filename>/etc/apt/vendors."
"list</filename>."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1162 apt_preferences.5.xml:545 sources.list.5.xml:211
+#: apt.conf.5.xml:1161 apt_preferences.5.xml:545 sources.list.5.xml:211
#: apt-ftparchive.1.xml:596
msgid "Examples"
msgstr "Przykłady"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1163
+#: apt.conf.5.xml:1162
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
@@ -4601,7 +4605,7 @@ msgstr ""
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1175
+#: apt.conf.5.xml:1174
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
@@ -6099,13 +6103,13 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:92
msgid ""
-"<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)"
-"</literal> which expands to the Debian architecture (such as <literal>amd64</"
-"literal> or <literal>armel</literal>) used on the system. This permits "
-"architecture-independent <filename>sources.list</filename> files to be used. "
-"In general this is only of interest when specifying an exact path, "
-"<literal>APT</literal> will automatically generate a URI with the current "
-"architecture otherwise."
+"<literal>distribution</literal> may also contain a variable, <literal>"
+"$(ARCH)</literal> which expands to the Debian architecture (such as "
+"<literal>amd64</literal> or <literal>armel</literal>) used on the system. "
+"This permits architecture-independent <filename>sources.list</filename> "
+"files to be used. In general this is only of interest when specifying an "
+"exact path, <literal>APT</literal> will automatically generate a URI with "
+"the current architecture otherwise."
msgstr ""
"<literal>Dystrybucja</literal> może zawierać także zmienną <literal>$(ARCH)</"
"literal>, która zostanie rozwinięta do architektury Debiana (takiej jak "
@@ -7414,9 +7418,9 @@ msgstr "OPIS"
#: apt.8:31
msgid ""
"APT is a management system for software packages. For normal day to day "
-"package management there are several frontends available, such as B<aptitude>"
-"(8) for the command line or B<synaptic>(8) for the X Window System. Some "
-"options are only implemented in B<apt-get>(8) though."
+"package management there are several frontends available, such as "
+"B<aptitude>(8) for the command line or B<synaptic>(8) for the X Window "
+"System. Some options are only implemented in B<apt-get>(8) though."
msgstr ""
"APT jest systemem zarządzania pakietami oprogramowania. Jest kilka nakładek "
"przydatnych do codziennego zarządzania pakietami, takich jak B<aptitude>(8), "
@@ -7702,8 +7706,8 @@ msgstr ""
"Pierwszą rzeczą <footnote><p> Aby używać serwera proxy, należy najpierw "
"ustawić zmienną środowiskową http_proxy, proszę przeczytać sources.list(5)</"
"p></footnote>, którą należy zrobić przed użyciem <prgn>apt-get</prgn> jest "
-"pobranie listy pakietów (ze <em>źródeł</em> wymienionych w pliku sources.list"
-"(5)), tak żeby APT wiedział, jakie pakiety są dostępne. Robi się to za "
+"pobranie listy pakietów (ze <em>źródeł</em> wymienionych w pliku sources."
+"list(5)), tak żeby APT wiedział, jakie pakiety są dostępne. Robi się to za "
"pomocą polecenia <tt>apt-get update</tt>. Na przykład:"
#. type: <example></example>
diff --git a/doc/po/pt.po b/doc/po/pt.po
index 314b5771b..79d90d65b 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -7,7 +7,11 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.9.7.1\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
+<<<<<<< HEAD
"POT-Creation-Date: 2013-04-30 10:29+0300\n"
+=======
+"POT-Creation-Date: 2013-06-13 13:46+0300\n"
+>>>>>>> upstream/debian/sid
"PO-Revision-Date: 2012-09-03 01:53+0100\n"
"Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n"
"Language-Team: Portuguese <l10n@debianpt.org>\n"
@@ -809,9 +813,9 @@ msgid ""
"installation or upgrading. Each package is a package name, not a fully "
"qualified filename (for instance, in a Debian system, <package>apt-utils</"
"package> would be the argument provided, not <filename>apt-utils_&apt-"
-"product-version;_amd64.deb</filename>). All packages required by the package"
-"(s) specified for installation will also be retrieved and installed. The "
-"<filename>/etc/apt/sources.list</filename> file is used to locate the "
+"product-version;_amd64.deb</filename>). All packages required by the "
+"package(s) specified for installation will also be retrieved and installed. "
+"The <filename>/etc/apt/sources.list</filename> file is used to locate the "
"desired packages. If a hyphen is appended to the package name (with no "
"intervening space), the identified package will be removed if it is "
"installed. Similarly a plus sign can be used to designate a package to "
@@ -1566,14 +1570,14 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:518 apt-cache.8.xml:343 apt-key.8.xml:174 apt-mark.8.xml:125
-#: apt.conf.5.xml:1168 apt_preferences.5.xml:698
+#: apt.conf.5.xml:1167 apt_preferences.5.xml:698
msgid "Files"
msgstr "Ficheiros"
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131
#: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109
-#: apt.conf.5.xml:1174 apt_preferences.5.xml:705 sources.list.5.xml:252
+#: apt.conf.5.xml:1173 apt_preferences.5.xml:705 sources.list.5.xml:252
#: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63
#: apt-ftparchive.1.xml:607
msgid "See Also"
@@ -3275,14 +3279,14 @@ msgstr "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
#. type: Content of: <refentry><refsect1><para>
#: apt.conf.5.xml:101
msgid ""
-"In general the sample configuration file in <filename>&docdir;examples/apt."
-"conf</filename> &configureindex; is a good guide for how it should look."
+"In general the sample configuration file &configureindex; is a good guide "
+"for how it should look."
msgstr ""
-"Em geral o exemplo de ficheiro de configuração em <filename>&docdir;examples/"
-"apt.conf</filename> &configureindex; é um bom guia de como deve ficar."
+"Em geral o exemplo de ficheiro de configuração &configureindex; é um bom "
+"guia de como deve ficar."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:105
+#: apt.conf.5.xml:104
msgid ""
"Case is not significant in names of configuration items, so in the previous "
"example you could use <literal>dpkg::pre-install-pkgs</literal>."
@@ -3292,7 +3296,7 @@ msgstr ""
"pre-install-pkgs</literal>."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:108
+#: apt.conf.5.xml:107
msgid ""
"Names for the configuration items are optional if a list is defined as can "
"be seen in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. If "
@@ -3308,7 +3312,7 @@ msgstr ""
"opção."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:113
+#: apt.conf.5.xml:112
msgid ""
"Two special commands are defined: <literal>#include</literal> (which is "
"deprecated and not supported by alternative implementations) and "
@@ -3328,7 +3332,7 @@ msgstr ""
"acabar com um 'ponto e vírgula' (;) .)"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:123
+#: apt.conf.5.xml:122
msgid ""
"The <literal>#clear</literal> command is the only way to delete a list or a "
"complete scope. Reopening a scope (or using the syntax described below with "
@@ -3344,7 +3348,7 @@ msgstr ""
"sobrepostos, apenas limpos."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:131
+#: apt.conf.5.xml:130
msgid ""
"All of the APT tools take an -o option which allows an arbitrary "
"configuration directive to be specified on the command line. The syntax is a "
@@ -3363,7 +3367,7 @@ msgstr ""
"ser usada na linha de comandos.)"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:139
+#: apt.conf.5.xml:138
msgid ""
"Note that appending items to a list using <literal>::</literal> only works "
"for one item per line, and that you should not use it in combination with "
@@ -3393,12 +3397,12 @@ msgstr ""
"explicitamente delas."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:154
+#: apt.conf.5.xml:153
msgid "The APT Group"
msgstr "O Grupo APT"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:155
+#: apt.conf.5.xml:154
msgid ""
"This group of options controls general APT behavior as well as holding the "
"options for all of the tools."
@@ -3407,7 +3411,7 @@ msgstr ""
"as opções para todas as ferramentas."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:160
+#: apt.conf.5.xml:159
msgid ""
"System Architecture; sets the architecture to use when fetching files and "
"parsing package lists. The internal default is the architecture apt was "
@@ -3418,7 +3422,7 @@ msgstr ""
"qual o APT foi compilado."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:167
+#: apt.conf.5.xml:166
msgid ""
"All Architectures the system supports. For instance, CPUs implementing the "
"<literal>amd64</literal> (also called <literal>x86-64</literal>) "
@@ -3440,7 +3444,7 @@ msgstr ""
"<command>dpkg --add-architecture</command>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:180
+#: apt.conf.5.xml:179
msgid ""
"Default release to install packages from if more than one version is "
"available. Contains release name, codename or release version. Examples: "
@@ -3453,7 +3457,7 @@ msgstr ""
"'&testing-codename;', '4.0', '5.0*'. Veja também &apt-preferences;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:186
+#: apt.conf.5.xml:185
msgid ""
"Ignore held packages; this global option causes the problem resolver to "
"ignore held packages in its decision making."
@@ -3462,7 +3466,7 @@ msgstr ""
"os pacotes segurados sejam ignorados na sua decisão de marcação."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:191
+#: apt.conf.5.xml:190
msgid ""
"Defaults to on. When turned on the autoclean feature will remove any "
"packages which can no longer be downloaded from the cache. If turned off "
@@ -3476,7 +3480,7 @@ msgstr ""
"directo de os reinstalar."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:199
+#: apt.conf.5.xml:198
msgid ""
"Defaults to on, which will cause APT to install essential and important "
"packages as soon as possible in an install/upgrade operation, in order to "
@@ -3503,7 +3507,7 @@ msgstr ""
"de A não está mais satisfeita."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:211
+#: apt.conf.5.xml:210
msgid ""
"The immediate configuration marker is also applied in the potentially "
"problematic case of circular dependencies, since a dependency with the "
@@ -3532,7 +3536,7 @@ msgstr ""
"que pode ajudar a prevenir."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:224
+#: apt.conf.5.xml:223
msgid ""
"Before a big operation like <literal>dist-upgrade</literal> is run with this "
"option disabled you should try to explicitly <literal>install</literal> the "
@@ -3549,7 +3553,7 @@ msgstr ""
"eles possa trabalhar em melhorar ou corrigir o processo de actualização."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:235
+#: apt.conf.5.xml:234
msgid ""
"Never enable this option unless you <emphasis>really</emphasis> know what "
"you are doing. It permits APT to temporarily remove an essential package to "
@@ -3570,7 +3574,7 @@ msgstr ""
"command> ou nada de que esses pacotes dependam."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:247
+#: apt.conf.5.xml:246
msgid ""
"APT uses since version 0.7.26 a resizable memory mapped cache file to store "
"the available information. <literal>Cache-Start</literal> acts as a hint of "
@@ -3607,13 +3611,13 @@ msgstr ""
"da cache é desactivado."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:263
+#: apt.conf.5.xml:262
msgid "Defines which packages are considered essential build dependencies."
msgstr ""
"Define quais pacotes são considerados dependências essenciais de compilação."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:267
+#: apt.conf.5.xml:266
msgid ""
"The Get subsection controls the &apt-get; tool; please see its documentation "
"for more information about the options here."
@@ -3622,7 +3626,7 @@ msgstr ""
"documentação para mais informação acerca das opções daqui."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:272
+#: apt.conf.5.xml:271
msgid ""
"The Cache subsection controls the &apt-cache; tool; please see its "
"documentation for more information about the options here."
@@ -3631,7 +3635,7 @@ msgstr ""
"documentação para mais informação acerca das opções daqui."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:277
+#: apt.conf.5.xml:276
msgid ""
"The CDROM subsection controls the &apt-cdrom; tool; please see its "
"documentation for more information about the options here."
@@ -3640,12 +3644,12 @@ msgstr ""
"documentação para mais informação acerca das opções de aqui."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:283
+#: apt.conf.5.xml:282
msgid "The Acquire Group"
msgstr "O Grupo Acquire"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:284
+#: apt.conf.5.xml:283
msgid ""
"The <literal>Acquire</literal> group of options controls the download of "
"packages as well as the various \"acquire methods\" responsible for the "
@@ -3656,7 +3660,7 @@ msgstr ""
"descarga (veja também &sources-list;)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:291
+#: apt.conf.5.xml:290
msgid ""
"Security related option defaulting to true, as giving a Release file's "
"validation an expiration date prevents replay attacks over a long timescale, "
@@ -3678,7 +3682,7 @@ msgstr ""
"seguinte."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:304
+#: apt.conf.5.xml:303
msgid ""
"Maximum time (in seconds) after its creation (as indicated by the "
"<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3698,7 +3702,7 @@ msgstr ""
"nome da opção."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:316
+#: apt.conf.5.xml:315
msgid ""
"Minimum time (in seconds) after its creation (as indicated by the "
"<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3718,7 +3722,7 @@ msgstr ""
"arquivo ao nome da opção."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:328
+#: apt.conf.5.xml:327
msgid ""
"Try to download deltas called <literal>PDiffs</literal> for indexes (like "
"<filename>Packages</filename> files) instead of downloading whole ones. True "
@@ -3729,7 +3733,7 @@ msgstr ""
"por inteiro. Verdadeiro por predefinição."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:331
+#: apt.conf.5.xml:330
msgid ""
"Two sub-options to limit the use of PDiffs are also available: "
"<literal>FileLimit</literal> can be used to specify a maximum number of "
@@ -3747,7 +3751,7 @@ msgstr ""
"completo em vez das patches."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:341
+#: apt.conf.5.xml:340
msgid ""
"Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
"literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -3762,7 +3766,7 @@ msgstr ""
"aberta uma ligação por tipo de URI."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:349
+#: apt.conf.5.xml:348
msgid ""
"Number of retries to perform. If this is non-zero APT will retry failed "
"files the given number of times."
@@ -3771,7 +3775,7 @@ msgstr ""
"tentar, no número fornecido de vezes, obter ficheiros falhados."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:354
+#: apt.conf.5.xml:353
msgid ""
"Use symlinks for source archives. If set to true then source archives will "
"be symlinked when possible instead of copying. True is the default."
@@ -3781,7 +3785,7 @@ msgstr ""
"A predefinição é verdadeiro."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:359
+#: apt.conf.5.xml:358
msgid ""
"<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. "
"It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</"
@@ -3792,15 +3796,15 @@ msgid ""
"be used."
msgstr ""
"<literal>http::Proxy</literal> define o proxy http predefinido a usar para "
-"URIs de HTTP. Está no formato standard de <literal>http://[[user][:pass]@]"
-"host[:port]/</literal>. Também podem ser especificados proxies por máquina "
-"ao usar o formato <literal>http::Proxy::&lt;host&gt;</literal> com a palavra "
-"chave especial <literal>DIRECT</literal> que significa não usar proxies. Se "
-"nenhuma das definições acima for especificada, será usada a variável de "
-"ambiente <envar>http_proxy</envar>."
+"URIs de HTTP. Está no formato standard de <literal>http://[[user][:"
+"pass]@]host[:port]/</literal>. Também podem ser especificados proxies por "
+"máquina ao usar o formato <literal>http::Proxy::&lt;host&gt;</literal> com a "
+"palavra chave especial <literal>DIRECT</literal> que significa não usar "
+"proxies. Se nenhuma das definições acima for especificada, será usada a "
+"variável de ambiente <envar>http_proxy</envar>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:367
+#: apt.conf.5.xml:366
msgid ""
"Three settings are provided for cache control with HTTP/1.1 compliant proxy "
"caches. <literal>No-Cache</literal> tells the proxy not to use its cached "
@@ -3820,7 +3824,7 @@ msgstr ""
"(grandes) ficheiros .deb."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:377 apt.conf.5.xml:449
+#: apt.conf.5.xml:376 apt.conf.5.xml:448
msgid ""
"The option <literal>timeout</literal> sets the timeout timer used by the "
"method; this value applies to the connection as well as the data timeout."
@@ -3830,7 +3834,7 @@ msgstr ""
"dados."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:380
+#: apt.conf.5.xml:379
msgid ""
"The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
"enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e."
@@ -3849,7 +3853,7 @@ msgstr ""
"web e proxies que escolheram não respeitar a especificação HTTP/1.1."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:387
+#: apt.conf.5.xml:386
msgid ""
"<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
"follow redirects, which is enabled by default."
@@ -3858,7 +3862,7 @@ msgstr ""
"os redireccionamentos, o que está activo por predefinição."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:390
+#: apt.conf.5.xml:389
msgid ""
"The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
"literal> which accepts integer values in kilobytes. The default value is 0 "
@@ -3873,7 +3877,7 @@ msgstr ""
"de múltiplos servidores ao mesmo tempo.)"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:395
+#: apt.conf.5.xml:394
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 "
@@ -3885,7 +3889,7 @@ msgstr ""
"identificador conhecido."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:403
+#: apt.conf.5.xml:402
msgid ""
"The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
"<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
@@ -3902,7 +3906,7 @@ msgstr ""
"literal> ainda não é suportada."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:411
+#: apt.conf.5.xml:410
msgid ""
"<literal>CaInfo</literal> suboption specifies place of file that holds info "
"about trusted certificates. <literal>&lt;host&gt;::CaInfo</literal> is the "
@@ -3941,7 +3945,7 @@ msgstr ""
"host&gt;::SslForceVersion</literal> é a opção 'por máquina' correspondente."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:432
+#: apt.conf.5.xml:431
msgid ""
"<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs. "
"It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</"
@@ -3970,11 +3974,12 @@ msgstr ""
"servidor proxy ao que se ligar. Por favor veja &configureindex; para um "
"exemplo de como fazer isto. As variáveis de substituição que representam o "
"componente URI correspondente são <literal>$(PROXY_USER)</literal> <literal>"
-"$(PROXY_PASS)</literal> <literal>$(SITE_USER)</literal> <literal>$(SITE_PASS)"
-"</literal> <literal>$(SITE)</literal> e <literal>$(SITE_PORT)</literal>."
+"$(PROXY_PASS)</literal> <literal>$(SITE_USER)</literal> <literal>"
+"$(SITE_PASS)</literal> <literal>$(SITE)</literal> e <literal>$(SITE_PORT)</"
+"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:452
+#: apt.conf.5.xml:451
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, "
@@ -3990,7 +3995,7 @@ msgstr ""
"específica (veja a amostra de ficheiro de configuração para exemplos)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:459
+#: apt.conf.5.xml:458
msgid ""
"It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
"envar> environment variable to an HTTP URL - see the discussion of the http "
@@ -4004,7 +4009,7 @@ msgstr ""
"eficiência."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:464
+#: apt.conf.5.xml:463
msgid ""
"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -4019,13 +4024,13 @@ msgstr ""
"ligações IPv4. Note que a maioria dos servidores FTP não suporta RFC2428."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:478
+#: apt.conf.5.xml:477
#, no-wrap
msgid "/cdrom/::Mount \"foo\";"
msgstr "/cdrom/::Mount \"foo\";"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:473
+#: apt.conf.5.xml:472
msgid ""
"For URIs using the <literal>cdrom</literal> method, the only configurable "
"option is the mount point, <literal>cdrom::Mount</literal>, which must be "
@@ -4046,7 +4051,7 @@ msgstr ""
"barra final. Comandos para desmontar podem ser especificados usando o UMount."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:486
+#: apt.conf.5.xml:485
msgid ""
"For GPGV URIs the only configurable option is <literal>gpgv::Options</"
"literal>, which passes additional parameters to gpgv."
@@ -4055,13 +4060,13 @@ msgstr ""
"literal>, a qual passa parâmetros adicionais ao gpgv."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:497
+#: apt.conf.5.xml:496
#, no-wrap
msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
msgstr "Acquire::CompressionTypes::<replaceable>Extensão de Ficheiro</replaceable> \"<replaceable>Nome de método</replaceable>\";"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:492
+#: apt.conf.5.xml:491
msgid ""
"List of compression types which are understood by the acquire methods. "
"Files like <filename>Packages</filename> can be available in various "
@@ -4080,19 +4085,19 @@ msgstr ""
"alterado. A sintaxe para isto é: <placeholder type=\"synopsis\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:502
+#: apt.conf.5.xml:501
#, no-wrap
msgid "Acquire::CompressionTypes::Order:: \"gz\";"
msgstr "Acquire::CompressionTypes::Order:: \"gz\";"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:505
+#: apt.conf.5.xml:504
#, no-wrap
msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:498
+#: apt.conf.5.xml:497
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 "
@@ -4124,13 +4129,13 @@ msgstr ""
"automaticamente."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:511
#, no-wrap
msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:507
+#: apt.conf.5.xml:506
msgid ""
"Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></"
"literal> will be checked at run time. If this option has been set, the "
@@ -4156,7 +4161,7 @@ msgstr ""
"prefixar a lista com este tipo."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:517
+#: apt.conf.5.xml:516
msgid ""
"The special type <literal>uncompressed</literal> can be used to give "
"uncompressed files a preference, but note that most archives don't provide "
@@ -4168,7 +4173,7 @@ msgstr ""
"maioritariamente apenas para mirrors locais."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:524
+#: apt.conf.5.xml:523
msgid ""
"When downloading <literal>gzip</literal> compressed indexes (Packages, "
"Sources, or Translations), keep them gzip compressed locally instead of "
@@ -4181,7 +4186,7 @@ msgstr ""
"CPU quando constrói as caches de pacotes locais. Falso por predefinição."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:532
+#: apt.conf.5.xml:531
msgid ""
"The Languages subsection controls which <filename>Translation</filename> "
"files are downloaded and in which order APT tries to display the description-"
@@ -4201,13 +4206,13 @@ msgstr ""
"especialmenteraros."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:549
+#: apt.conf.5.xml:548
#, no-wrap
msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:537
+#: apt.conf.5.xml:536
msgid ""
"The default list includes \"environment\" and \"en\". "
"\"<literal>environment</literal>\" has a special meaning here: it will be "
@@ -4246,7 +4251,7 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:550
+#: apt.conf.5.xml:549
msgid ""
"Note: To prevent problems resulting from APT being executed in different "
"environments (e.g. by different users or by other programs) all Translation "
@@ -4260,22 +4265,22 @@ msgstr ""
"literal>\" implícito)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:559
+#: apt.conf.5.xml:558
msgid "When downloading, force to use only the IPv4 protocol."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:565
+#: apt.conf.5.xml:564
msgid "When downloading, force to use only the IPv6 protocol."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:572
+#: apt.conf.5.xml:571
msgid "Directories"
msgstr "Directórios"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:574
+#: apt.conf.5.xml:573
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
"local state information. <literal>lists</literal> is the directory to place "
@@ -4294,7 +4299,7 @@ msgstr ""
"items que não começam com <filename>/</filename> ou <filename>./</filename>."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:581
+#: apt.conf.5.xml:580
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -4316,7 +4321,7 @@ msgstr ""
"literal>"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:590
+#: apt.conf.5.xml:589
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
"<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4331,7 +4336,7 @@ msgstr ""
"ficheiro de configuração especificado por <envar>APT_CONFIG</envar>)."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:596
+#: apt.conf.5.xml:595
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 "
@@ -4342,7 +4347,7 @@ msgstr ""
"estar feito então é carregado o ficheiro de configuração principal."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:600
+#: apt.conf.5.xml:599
msgid ""
"Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
"Bin::Methods</literal> specifies the location of the method handlers and "
@@ -4360,7 +4365,7 @@ msgstr ""
"respectivos programas."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:608
+#: apt.conf.5.xml:607
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
"set, all paths in <literal>Dir::</literal> will be relative to "
@@ -4381,7 +4386,7 @@ msgstr ""
"procurado em <filename>/tmp/staging/var/lib/dpkg/status</filename>."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:621
+#: apt.conf.5.xml:620
msgid ""
"The <literal>Ignore-Files-Silently</literal> list can be used to specify "
"which files APT should silently ignore while parsing the files in the "
@@ -4399,12 +4404,12 @@ msgstr ""
"expressão regular."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:630
+#: apt.conf.5.xml:629
msgid "APT in DSelect"
msgstr "APT em DSelect"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:632
+#: apt.conf.5.xml:631
msgid ""
"When APT is used as a &dselect; method several configuration directives "
"control the default behavior. These are in the <literal>DSelect</literal> "
@@ -4415,7 +4420,7 @@ msgstr ""
"<literal>DSelect</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:637
+#: apt.conf.5.xml:636
msgid ""
"Cache Clean mode; this value may be one of <literal>always</literal>, "
"<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
@@ -4437,7 +4442,7 @@ msgstr ""
"pacotes."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:651
+#: apt.conf.5.xml:650
msgid ""
"The contents of this variable are passed to &apt-get; as command line "
"options when it is run for the install phase."
@@ -4446,7 +4451,7 @@ msgstr ""
"comandos quando é corrido para a fase de instalação."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:656
+#: apt.conf.5.xml:655
msgid ""
"The contents of this variable are passed to &apt-get; as command line "
"options when it is run for the update phase."
@@ -4455,7 +4460,7 @@ msgstr ""
"comandos quando é executado para a fase de actualização."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:661
+#: apt.conf.5.xml:660
msgid ""
"If true the [U]pdate operation in &dselect; will always prompt to continue. "
"The default is to prompt only on error."
@@ -4464,12 +4469,12 @@ msgstr ""
"continuar. A predefinição é avisar apenas em caso de erro."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:667
+#: apt.conf.5.xml:666
msgid "How APT calls &dpkg;"
msgstr "Como o APT chama o &dpkg;"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:668
+#: apt.conf.5.xml:667
msgid ""
"Several configuration directives control how APT invokes &dpkg;. These are "
"in the <literal>DPkg</literal> section."
@@ -4478,7 +4483,7 @@ msgstr ""
"&dpkg;. Estas estão na secção <literal>DPkg</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:673
+#: apt.conf.5.xml:672
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 "
@@ -4489,7 +4494,7 @@ msgstr ""
"um argumento único ao &dpkg;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:679
+#: apt.conf.5.xml:678
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 "
@@ -4502,7 +4507,7 @@ msgstr ""
"bin/sh</filename>, caso algum deles falhe, o APT irá abortar."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:686
+#: apt.conf.5.xml:685
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 "
@@ -4518,7 +4523,7 @@ msgstr ""
"instalar, um por cada linha na entrada standard."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:692
+#: apt.conf.5.xml:691
msgid ""
"Version 2 of this protocol dumps more information, including the protocol "
"version, the APT configuration space and the packages, files and versions "
@@ -4533,7 +4538,7 @@ msgstr ""
"dado ao <literal>Pre-Install-Pkgs</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:700
+#: apt.conf.5.xml:699
msgid ""
"APT chdirs to this directory before invoking &dpkg;, the default is "
"<filename>/</filename>."
@@ -4542,7 +4547,7 @@ msgstr ""
"predefinição é <filename>/</filename>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:705
+#: apt.conf.5.xml:704
msgid ""
"These options are passed to &dpkg-buildpackage; when compiling packages; the "
"default is to disable signing and produce all binaries."
@@ -4551,12 +4556,12 @@ msgstr ""
"predefinição é desactivar a assinatura e produzir todos os binários."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:710
+#: apt.conf.5.xml:709
msgid "dpkg trigger usage (and related options)"
msgstr "Utilização trigger do dpkg (e opções relacionadas)"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:711
+#: apt.conf.5.xml:710
msgid ""
"APT can call &dpkg; in such a way as to let it make aggressive use of "
"triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
@@ -4582,7 +4587,7 @@ msgstr ""
"100% enquanto na realidade está a configurar todos os pacotes."
#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:726
+#: apt.conf.5.xml:725
#, no-wrap
msgid ""
"DPkg::NoTriggers \"true\";\n"
@@ -4596,7 +4601,7 @@ msgstr ""
"DPkg::TriggersPending \"true\";"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:720
+#: apt.conf.5.xml:719
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 "
@@ -4620,7 +4625,7 @@ msgstr ""
"\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:733
+#: apt.conf.5.xml:732
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 "
@@ -4642,7 +4647,7 @@ msgstr ""
"chamadas unpack e remove."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:741
+#: apt.conf.5.xml:740
msgid ""
"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
"and \"<literal>no</literal>\". The default value is \"<literal>all</literal>"
@@ -4672,7 +4677,7 @@ msgstr ""
"arrancar."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:756
+#: apt.conf.5.xml:755
msgid ""
"If this option is set APT will call <command>dpkg --configure --pending</"
"command> to let &dpkg; handle all required configurations and triggers. This "
@@ -4690,7 +4695,7 @@ msgstr ""
"esta opção em todas excepto na última execução."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:763
+#: apt.conf.5.xml:762
msgid ""
"Useful for the <literal>smart</literal> configuration as a package which has "
"pending triggers is not considered as <literal>installed</literal>, and "
@@ -4706,7 +4711,7 @@ msgstr ""
"configurar este pacote."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:776
+#: apt.conf.5.xml:775
#, no-wrap
msgid ""
"OrderList::Score {\n"
@@ -4724,7 +4729,7 @@ msgstr ""
"};"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:769
+#: apt.conf.5.xml:768
msgid ""
"Essential packages (and their dependencies) should be configured immediately "
"after unpacking. It is a good idea to do this quite early in the upgrade "
@@ -4748,12 +4753,12 @@ msgstr ""
"predefinidos. <placeholder type=\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:789
+#: apt.conf.5.xml:788
msgid "Periodic and Archives options"
msgstr "Opções Periodic e Archives"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:790
+#: apt.conf.5.xml:789
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by the "
@@ -4766,12 +4771,12 @@ msgstr ""
"Veja o cabeçalho deste script para uma breve documentação das suas opções."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:798
+#: apt.conf.5.xml:797
msgid "Debug options"
msgstr "Opções de depuração"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:800
+#: apt.conf.5.xml:799
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -4788,7 +4793,7 @@ msgstr ""
"interesse para o utilizador normal, mas algumas podem ter:"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:811
+#: apt.conf.5.xml:810
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -4799,7 +4804,7 @@ msgstr ""
"remove, purge</literal>."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:819
+#: apt.conf.5.xml:818
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s install</"
@@ -4810,7 +4815,7 @@ msgstr ""
"<literal>apt-get -s install</literal>) como um utilizador não root."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:828
+#: apt.conf.5.xml:827
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -4822,7 +4827,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:836
+#: apt.conf.5.xml:835
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
"in CD-ROM IDs."
@@ -4831,12 +4836,12 @@ msgstr ""
"IDs de CD-ROM."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:846
+#: apt.conf.5.xml:845
msgid "A full list of debugging options to apt follows."
msgstr "Segue-se uma lista completa de opções de depuração para o apt."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:855
+#: apt.conf.5.xml:854
msgid ""
"Print information related to accessing <literal>cdrom://</literal> sources."
msgstr ""
@@ -4844,25 +4849,25 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:866
+#: apt.conf.5.xml:865
msgid "Print information related to downloading packages using FTP."
msgstr ""
"Escreve informação relacionada com o descarregamento de pacotes usando FTP."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:877
+#: apt.conf.5.xml:876
msgid "Print information related to downloading packages using HTTP."
msgstr ""
"Escreve informação relacionada com o descarregamento de pacotes usando HTTP."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:888
+#: apt.conf.5.xml:887
msgid "Print information related to downloading packages using HTTPS."
msgstr ""
"Escreve informação relacionada com o descarregamento de pacotes usando HTTPS."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:899
+#: apt.conf.5.xml:898
msgid ""
"Print information related to verifying cryptographic signatures using "
"<literal>gpg</literal>."
@@ -4871,7 +4876,7 @@ msgstr ""
"criptográficas usando <literal>gpg</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:910
+#: apt.conf.5.xml:909
msgid ""
"Output information about the process of accessing collections of packages "
"stored on CD-ROMs."
@@ -4880,13 +4885,13 @@ msgstr ""
"armazenados em CD-ROMs."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:920
+#: apt.conf.5.xml:919
msgid "Describes the process of resolving build-dependencies in &apt-get;."
msgstr ""
"Descreve os processos de resolver dependências de compilação no &apt-get;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:930
+#: apt.conf.5.xml:929
msgid ""
"Output each cryptographic hash that is generated by the <literal>apt</"
"literal> libraries."
@@ -4895,7 +4900,7 @@ msgstr ""
"<literal>apt</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:940
+#: apt.conf.5.xml:939
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 "
@@ -4906,7 +4911,7 @@ msgstr ""
"para um CD-ROM."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:951
+#: apt.conf.5.xml:950
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."
@@ -4916,14 +4921,14 @@ msgstr ""
"literal></quote> ao mesmo tempo."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:963
+#: apt.conf.5.xml:962
msgid "Log when items are added to or removed from the global download queue."
msgstr ""
"Regista no log quando os items são adicionados ou removidos da fila de "
"download global."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:973
+#: apt.conf.5.xml:972
msgid ""
"Output status messages and errors related to verifying checksums and "
"cryptographic signatures of downloaded files."
@@ -4932,7 +4937,7 @@ msgstr ""
"checksums e assinaturas criptográficas dos ficheiros descarregados."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:983
+#: apt.conf.5.xml:982
msgid ""
"Output information about downloading and applying package index list diffs, "
"and errors relating to package index list diffs."
@@ -4942,7 +4947,7 @@ msgstr ""
"pacote."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:995
+#: apt.conf.5.xml:994
msgid ""
"Output information related to patching apt package lists when downloading "
"index diffs instead of full indices."
@@ -4951,7 +4956,7 @@ msgstr ""
"do apt quando se descarrega diffs de índice em vez de índices completos."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1006
+#: apt.conf.5.xml:1005
msgid ""
"Log all interactions with the sub-processes that actually perform downloads."
msgstr ""
@@ -4959,7 +4964,7 @@ msgstr ""
"downloads."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1017
+#: apt.conf.5.xml:1016
msgid ""
"Log events related to the automatically-installed status of packages and to "
"the removal of unused packages."
@@ -4968,7 +4973,7 @@ msgstr ""
"de pacotes e com a remoção de pacotes não utilizados."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1027
+#: apt.conf.5.xml:1026
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial auto-"
@@ -4983,7 +4988,7 @@ msgstr ""
"literal>; veja <literal>Debug::pkgProblemResolver</literal> para isso."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1041
+#: apt.conf.5.xml:1040
msgid ""
"Generate debug messages describing which packages are marked as keep/install/"
"remove while the ProblemResolver does his work. Each addition or deletion "
@@ -5014,7 +5019,7 @@ msgstr ""
"pacote aparece."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1062
+#: apt.conf.5.xml:1061
msgid ""
"When invoking &dpkg;, output the precise command line with which it is being "
"invoked, with arguments separated by a single space character."
@@ -5024,7 +5029,7 @@ msgstr ""
"único."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1073
+#: apt.conf.5.xml:1072
msgid ""
"Output all the data received from &dpkg; on the status file descriptor and "
"any errors encountered while parsing it."
@@ -5033,7 +5038,7 @@ msgstr ""
"estado e quaisquer erros encontrados enquanto os analisa."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1084
+#: apt.conf.5.xml:1083
msgid ""
"Generate a trace of the algorithm that decides the order in which "
"<literal>apt</literal> should pass packages to &dpkg;."
@@ -5042,7 +5047,7 @@ msgstr ""
"literal> deve passar os pacotes ao &dpkg;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1096
+#: apt.conf.5.xml:1095
msgid ""
"Output status messages tracing the steps performed when invoking &dpkg;."
msgstr ""
@@ -5050,12 +5055,12 @@ msgstr ""
"&dpkg;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1107
+#: apt.conf.5.xml:1106
msgid "Output the priority of each package list on startup."
msgstr "Escreve a prioridade da cada lista de pacote no arranque."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1117
+#: apt.conf.5.xml:1116
msgid ""
"Trace the execution of the dependency resolver (this applies only to what "
"happens when a complex dependency problem is encountered)."
@@ -5064,7 +5069,7 @@ msgstr ""
"acontece quando é encontrado um problema de dependências complexo)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1128
+#: apt.conf.5.xml:1127
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 "
@@ -5075,7 +5080,7 @@ msgstr ""
"mesma que é descrita em <literal>Debug::pkgDepCache::Marker</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1140
+#: apt.conf.5.xml:1139
msgid ""
"Print information about the vendors read from <filename>/etc/apt/vendors."
"list</filename>."
@@ -5084,13 +5089,13 @@ msgstr ""
"vendors.list</filename>."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1162 apt_preferences.5.xml:545 sources.list.5.xml:211
+#: apt.conf.5.xml:1161 apt_preferences.5.xml:545 sources.list.5.xml:211
#: apt-ftparchive.1.xml:596
msgid "Examples"
msgstr "Exemplos"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1163
+#: apt.conf.5.xml:1162
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
@@ -5100,7 +5105,7 @@ msgstr ""
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1175
+#: apt.conf.5.xml:1174
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
@@ -6599,13 +6604,13 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:92
msgid ""
-"<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)"
-"</literal> which expands to the Debian architecture (such as <literal>amd64</"
-"literal> or <literal>armel</literal>) used on the system. This permits "
-"architecture-independent <filename>sources.list</filename> files to be used. "
-"In general this is only of interest when specifying an exact path, "
-"<literal>APT</literal> will automatically generate a URI with the current "
-"architecture otherwise."
+"<literal>distribution</literal> may also contain a variable, <literal>"
+"$(ARCH)</literal> which expands to the Debian architecture (such as "
+"<literal>amd64</literal> or <literal>armel</literal>) used on the system. "
+"This permits architecture-independent <filename>sources.list</filename> "
+"files to be used. In general this is only of interest when specifying an "
+"exact path, <literal>APT</literal> will automatically generate a URI with "
+"the current architecture otherwise."
msgstr ""
"<literal>distribution</literal> também pode conter uma variável. <literal>"
"$(ARCH)</literal> a qual se expande à arquitectura Debian (tal como "
@@ -8102,9 +8107,9 @@ msgstr "DESCRIÇÃO"
#: apt.8:31
msgid ""
"APT is a management system for software packages. For normal day to day "
-"package management there are several frontends available, such as B<aptitude>"
-"(8) for the command line or B<synaptic>(8) for the X Window System. Some "
-"options are only implemented in B<apt-get>(8) though."
+"package management there are several frontends available, such as "
+"B<aptitude>(8) for the command line or B<synaptic>(8) for the X Window "
+"System. Some options are only implemented in B<apt-get>(8) though."
msgstr ""
"APT é um sistema de gestão para pacotes de software. Para a gestão de "
"pacotes normal do dia-a-dia existem vários frontends disponíveis, como o "
@@ -8383,11 +8388,11 @@ msgid ""
"instance,"
msgstr ""
"O primeira <footnote><p>se você está a usar um servidor proxy http você tem "
-"que definir a variável de ambiente http_proxy primeiro, veja sources.list(5)"
-"</p></footnote> coisa que deve ser feita antes de usar <prgn>apt-get</prgn> "
-"é obter as listas de pacotes a partir das <em>Sources</em> para que ele "
-"saiba que pacotes estão disponíveis. Isto é feito com <tt>apt-get update</"
-"tt>. Por exemplo,"
+"que definir a variável de ambiente http_proxy primeiro, veja sources."
+"list(5)</p></footnote> coisa que deve ser feita antes de usar <prgn>apt-get</"
+"prgn> é obter as listas de pacotes a partir das <em>Sources</em> para que "
+"ele saiba que pacotes estão disponíveis. Isto é feito com <tt>apt-get "
+"update</tt>. Por exemplo,"
#. type: <example></example>
#: guide.sgml:116
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index d2f597a6a..a415d9528 100644
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -10,7 +10,11 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
+<<<<<<< HEAD
"POT-Creation-Date: 2013-04-30 10:29+0300\n"
+=======
+"POT-Creation-Date: 2013-06-13 13:46+0300\n"
+>>>>>>> upstream/debian/sid
"PO-Revision-Date: 2004-09-20 17:02+0000\n"
"Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
"Language-Team: <debian-l10n-portuguese@lists.debian.org>\n"
@@ -586,9 +590,9 @@ msgid ""
"installation or upgrading. Each package is a package name, not a fully "
"qualified filename (for instance, in a Debian system, <package>apt-utils</"
"package> would be the argument provided, not <filename>apt-utils_&apt-"
-"product-version;_amd64.deb</filename>). All packages required by the package"
-"(s) specified for installation will also be retrieved and installed. The "
-"<filename>/etc/apt/sources.list</filename> file is used to locate the "
+"product-version;_amd64.deb</filename>). All packages required by the "
+"package(s) specified for installation will also be retrieved and installed. "
+"The <filename>/etc/apt/sources.list</filename> file is used to locate the "
"desired packages. If a hyphen is appended to the package name (with no "
"intervening space), the identified package will be removed if it is "
"installed. Similarly a plus sign can be used to designate a package to "
@@ -1091,14 +1095,14 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:518 apt-cache.8.xml:343 apt-key.8.xml:174 apt-mark.8.xml:125
-#: apt.conf.5.xml:1168 apt_preferences.5.xml:698
+#: apt.conf.5.xml:1167 apt_preferences.5.xml:698
msgid "Files"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131
#: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109
-#: apt.conf.5.xml:1174 apt_preferences.5.xml:705 sources.list.5.xml:252
+#: apt.conf.5.xml:1173 apt_preferences.5.xml:705 sources.list.5.xml:252
#: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63
#: apt-ftparchive.1.xml:607
#, fuzzy
@@ -2340,19 +2344,19 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt.conf.5.xml:101
msgid ""
-"In general the sample configuration file in <filename>&docdir;examples/apt."
-"conf</filename> &configureindex; is a good guide for how it should look."
+"In general the sample configuration file &configureindex; is a good guide "
+"for how it should look."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:105
+#: apt.conf.5.xml:104
msgid ""
"Case is not significant in names of configuration items, so in the previous "
"example you could use <literal>dpkg::pre-install-pkgs</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:108
+#: apt.conf.5.xml:107
msgid ""
"Names for the configuration items are optional if a list is defined as can "
"be seen in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. If "
@@ -2362,7 +2366,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:113
+#: apt.conf.5.xml:112
msgid ""
"Two special commands are defined: <literal>#include</literal> (which is "
"deprecated and not supported by alternative implementations) and "
@@ -2374,7 +2378,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:123
+#: apt.conf.5.xml:122
msgid ""
"The <literal>#clear</literal> command is the only way to delete a list or a "
"complete scope. Reopening a scope (or using the syntax described below with "
@@ -2384,7 +2388,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:131
+#: apt.conf.5.xml:130
msgid ""
"All of the APT tools take an -o option which allows an arbitrary "
"configuration directive to be specified on the command line. The syntax is a "
@@ -2396,7 +2400,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:139
+#: apt.conf.5.xml:138
msgid ""
"Note that appending items to a list using <literal>::</literal> only works "
"for one item per line, and that you should not use it in combination with "
@@ -2413,19 +2417,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:154
+#: apt.conf.5.xml:153
msgid "The APT Group"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:155
+#: apt.conf.5.xml:154
msgid ""
"This group of options controls general APT behavior as well as holding the "
"options for all of the tools."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:160
+#: apt.conf.5.xml:159
msgid ""
"System Architecture; sets the architecture to use when fetching files and "
"parsing package lists. The internal default is the architecture apt was "
@@ -2433,7 +2437,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:167
+#: apt.conf.5.xml:166
msgid ""
"All Architectures the system supports. For instance, CPUs implementing the "
"<literal>amd64</literal> (also called <literal>x86-64</literal>) "
@@ -2446,7 +2450,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:180
+#: apt.conf.5.xml:179
msgid ""
"Default release to install packages from if more than one version is "
"available. Contains release name, codename or release version. Examples: "
@@ -2455,14 +2459,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:186
+#: apt.conf.5.xml:185
msgid ""
"Ignore held packages; this global option causes the problem resolver to "
"ignore held packages in its decision making."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:191
+#: apt.conf.5.xml:190
msgid ""
"Defaults to on. When turned on the autoclean feature will remove any "
"packages which can no longer be downloaded from the cache. If turned off "
@@ -2471,7 +2475,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:199
+#: apt.conf.5.xml:198
msgid ""
"Defaults to on, which will cause APT to install essential and important "
"packages as soon as possible in an install/upgrade operation, in order to "
@@ -2486,7 +2490,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:211
+#: apt.conf.5.xml:210
msgid ""
"The immediate configuration marker is also applied in the potentially "
"problematic case of circular dependencies, since a dependency with the "
@@ -2503,7 +2507,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:224
+#: apt.conf.5.xml:223
msgid ""
"Before a big operation like <literal>dist-upgrade</literal> is run with this "
"option disabled you should try to explicitly <literal>install</literal> the "
@@ -2514,7 +2518,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:235
+#: apt.conf.5.xml:234
msgid ""
"Never enable this option unless you <emphasis>really</emphasis> know what "
"you are doing. It permits APT to temporarily remove an essential package to "
@@ -2527,7 +2531,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:247
+#: apt.conf.5.xml:246
msgid ""
"APT uses since version 0.7.26 a resizable memory mapped cache file to store "
"the available information. <literal>Cache-Start</literal> acts as a hint of "
@@ -2547,38 +2551,38 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:263
+#: apt.conf.5.xml:262
msgid "Defines which packages are considered essential build dependencies."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:267
+#: apt.conf.5.xml:266
msgid ""
"The Get subsection controls the &apt-get; tool; please see its documentation "
"for more information about the options here."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:272
+#: apt.conf.5.xml:271
msgid ""
"The Cache subsection controls the &apt-cache; tool; please see its "
"documentation for more information about the options here."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:277
+#: apt.conf.5.xml:276
msgid ""
"The CDROM subsection controls the &apt-cdrom; tool; please see its "
"documentation for more information about the options here."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:283
+#: apt.conf.5.xml:282
msgid "The Acquire Group"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:284
+#: apt.conf.5.xml:283
msgid ""
"The <literal>Acquire</literal> group of options controls the download of "
"packages as well as the various \"acquire methods\" responsible for the "
@@ -2586,7 +2590,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:291
+#: apt.conf.5.xml:290
msgid ""
"Security related option defaulting to true, as giving a Release file's "
"validation an expiration date prevents replay attacks over a long timescale, "
@@ -2599,7 +2603,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:304
+#: apt.conf.5.xml:303
msgid ""
"Maximum time (in seconds) after its creation (as indicated by the "
"<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -2611,7 +2615,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:316
+#: apt.conf.5.xml:315
msgid ""
"Minimum time (in seconds) after its creation (as indicated by the "
"<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -2623,7 +2627,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:328
+#: apt.conf.5.xml:327
msgid ""
"Try to download deltas called <literal>PDiffs</literal> for indexes (like "
"<filename>Packages</filename> files) instead of downloading whole ones. True "
@@ -2631,7 +2635,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:331
+#: apt.conf.5.xml:330
msgid ""
"Two sub-options to limit the use of PDiffs are also available: "
"<literal>FileLimit</literal> can be used to specify a maximum number of "
@@ -2642,7 +2646,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:341
+#: apt.conf.5.xml:340
msgid ""
"Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
"literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -2652,21 +2656,21 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:349
+#: apt.conf.5.xml:348
msgid ""
"Number of retries to perform. If this is non-zero APT will retry failed "
"files the given number of times."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:354
+#: apt.conf.5.xml:353
msgid ""
"Use symlinks for source archives. If set to true then source archives will "
"be symlinked when possible instead of copying. True is the default."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:359
+#: apt.conf.5.xml:358
msgid ""
"<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. "
"It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</"
@@ -2678,7 +2682,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:367
+#: apt.conf.5.xml:366
msgid ""
"Three settings are provided for cache control with HTTP/1.1 compliant proxy "
"caches. <literal>No-Cache</literal> tells the proxy not to use its cached "
@@ -2690,14 +2694,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:377 apt.conf.5.xml:449
+#: apt.conf.5.xml:376 apt.conf.5.xml:448
msgid ""
"The option <literal>timeout</literal> sets the timeout timer used by the "
"method; this value applies to the connection as well as the data timeout."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:380
+#: apt.conf.5.xml:379
msgid ""
"The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
"enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e."
@@ -2709,14 +2713,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:387
+#: apt.conf.5.xml:386
msgid ""
"<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
"follow redirects, which is enabled by default."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:390
+#: apt.conf.5.xml:389
msgid ""
"The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
"literal> which accepts integer values in kilobytes. The default value is 0 "
@@ -2726,7 +2730,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:395
+#: apt.conf.5.xml:394
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 "
@@ -2734,7 +2738,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:403
+#: apt.conf.5.xml:402
msgid ""
"The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
"<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
@@ -2745,7 +2749,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:411
+#: apt.conf.5.xml:410
msgid ""
"<literal>CaInfo</literal> suboption specifies place of file that holds info "
"about trusted certificates. <literal>&lt;host&gt;::CaInfo</literal> is the "
@@ -2767,7 +2771,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:432
+#: apt.conf.5.xml:431
msgid ""
"<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs. "
"It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</"
@@ -2786,7 +2790,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:452
+#: apt.conf.5.xml:451
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, "
@@ -2796,7 +2800,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:459
+#: apt.conf.5.xml:458
msgid ""
"It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
"envar> environment variable to an HTTP URL - see the discussion of the http "
@@ -2805,7 +2809,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:464
+#: apt.conf.5.xml:463
msgid ""
"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -2815,13 +2819,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:478
+#: apt.conf.5.xml:477
#, no-wrap
msgid "/cdrom/::Mount \"foo\";"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:473
+#: apt.conf.5.xml:472
msgid ""
"For URIs using the <literal>cdrom</literal> method, the only configurable "
"option is the mount point, <literal>cdrom::Mount</literal>, which must be "
@@ -2834,20 +2838,20 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:486
+#: apt.conf.5.xml:485
msgid ""
"For GPGV URIs the only configurable option is <literal>gpgv::Options</"
"literal>, which passes additional parameters to gpgv."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:497
+#: apt.conf.5.xml:496
#, no-wrap
msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:492
+#: apt.conf.5.xml:491
msgid ""
"List of compression types which are understood by the acquire methods. "
"Files like <filename>Packages</filename> can be available in various "
@@ -2859,19 +2863,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:502
+#: apt.conf.5.xml:501
#, no-wrap
msgid "Acquire::CompressionTypes::Order:: \"gz\";"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:505
+#: apt.conf.5.xml:504
#, no-wrap
msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:498
+#: apt.conf.5.xml:497
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 "
@@ -2889,13 +2893,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:511
#, no-wrap
msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:507
+#: apt.conf.5.xml:506
msgid ""
"Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></"
"literal> will be checked at run time. If this option has been set, the "
@@ -2910,7 +2914,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:517
+#: apt.conf.5.xml:516
msgid ""
"The special type <literal>uncompressed</literal> can be used to give "
"uncompressed files a preference, but note that most archives don't provide "
@@ -2918,7 +2922,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:524
+#: apt.conf.5.xml:523
msgid ""
"When downloading <literal>gzip</literal> compressed indexes (Packages, "
"Sources, or Translations), keep them gzip compressed locally instead of "
@@ -2927,7 +2931,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:532
+#: apt.conf.5.xml:531
msgid ""
"The Languages subsection controls which <filename>Translation</filename> "
"files are downloaded and in which order APT tries to display the description-"
@@ -2939,13 +2943,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:549
+#: apt.conf.5.xml:548
#, no-wrap
msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:537
+#: apt.conf.5.xml:536
msgid ""
"The default list includes \"environment\" and \"en\". "
"\"<literal>environment</literal>\" has a special meaning here: it will be "
@@ -2967,7 +2971,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:550
+#: apt.conf.5.xml:549
msgid ""
"Note: To prevent problems resulting from APT being executed in different "
"environments (e.g. by different users or by other programs) all Translation "
@@ -2976,22 +2980,22 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:559
+#: apt.conf.5.xml:558
msgid "When downloading, force to use only the IPv4 protocol."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:565
+#: apt.conf.5.xml:564
msgid "When downloading, force to use only the IPv6 protocol."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:572
+#: apt.conf.5.xml:571
msgid "Directories"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:574
+#: apt.conf.5.xml:573
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
"local state information. <literal>lists</literal> is the directory to place "
@@ -3003,7 +3007,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:581
+#: apt.conf.5.xml:580
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -3016,7 +3020,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:590
+#: apt.conf.5.xml:589
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
"<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -3026,7 +3030,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:596
+#: apt.conf.5.xml:595
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 "
@@ -3034,7 +3038,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:600
+#: apt.conf.5.xml:599
msgid ""
"Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
"Bin::Methods</literal> specifies the location of the method handlers and "
@@ -3045,7 +3049,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:608
+#: apt.conf.5.xml:607
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
"set, all paths in <literal>Dir::</literal> will be relative to "
@@ -3058,7 +3062,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:621
+#: apt.conf.5.xml:620
msgid ""
"The <literal>Ignore-Files-Silently</literal> list can be used to specify "
"which files APT should silently ignore while parsing the files in the "
@@ -3069,12 +3073,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:630
+#: apt.conf.5.xml:629
msgid "APT in DSelect"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:632
+#: apt.conf.5.xml:631
msgid ""
"When APT is used as a &dselect; method several configuration directives "
"control the default behavior. These are in the <literal>DSelect</literal> "
@@ -3082,7 +3086,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:637
+#: apt.conf.5.xml:636
msgid ""
"Cache Clean mode; this value may be one of <literal>always</literal>, "
"<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
@@ -3095,40 +3099,40 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:651
+#: apt.conf.5.xml:650
msgid ""
"The contents of this variable are passed to &apt-get; as command line "
"options when it is run for the install phase."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:656
+#: apt.conf.5.xml:655
msgid ""
"The contents of this variable are passed to &apt-get; as command line "
"options when it is run for the update phase."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:661
+#: apt.conf.5.xml:660
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:667
+#: apt.conf.5.xml:666
msgid "How APT calls &dpkg;"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:668
+#: apt.conf.5.xml:667
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:673
+#: apt.conf.5.xml:672
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 "
@@ -3136,7 +3140,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:679
+#: apt.conf.5.xml:678
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 "
@@ -3145,7 +3149,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:686
+#: apt.conf.5.xml:685
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 "
@@ -3155,7 +3159,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:692
+#: apt.conf.5.xml:691
msgid ""
"Version 2 of this protocol dumps more information, including the protocol "
"version, the APT configuration space and the packages, files and versions "
@@ -3165,26 +3169,26 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:700
+#: apt.conf.5.xml:699
msgid ""
"APT chdirs to this directory before invoking &dpkg;, the default is "
"<filename>/</filename>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:705
+#: apt.conf.5.xml:704
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:710
+#: apt.conf.5.xml:709
msgid "dpkg trigger usage (and related options)"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:711
+#: apt.conf.5.xml:710
msgid ""
"APT can call &dpkg; in such a way as to let it make aggressive use of "
"triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
@@ -3199,7 +3203,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:726
+#: apt.conf.5.xml:725
#, no-wrap
msgid ""
"DPkg::NoTriggers \"true\";\n"
@@ -3209,7 +3213,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:720
+#: apt.conf.5.xml:719
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 "
@@ -3223,7 +3227,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:733
+#: apt.conf.5.xml:732
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 "
@@ -3236,7 +3240,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:741
+#: apt.conf.5.xml:740
msgid ""
"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
"and \"<literal>no</literal>\". The default value is \"<literal>all</literal>"
@@ -3253,7 +3257,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:756
+#: apt.conf.5.xml:755
msgid ""
"If this option is set APT will call <command>dpkg --configure --pending</"
"command> to let &dpkg; handle all required configurations and triggers. This "
@@ -3264,7 +3268,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:763
+#: apt.conf.5.xml:762
msgid ""
"Useful for the <literal>smart</literal> configuration as a package which has "
"pending triggers is not considered as <literal>installed</literal>, and "
@@ -3274,7 +3278,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:776
+#: apt.conf.5.xml:775
#, no-wrap
msgid ""
"OrderList::Score {\n"
@@ -3286,7 +3290,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:769
+#: apt.conf.5.xml:768
msgid ""
"Essential packages (and their dependencies) should be configured immediately "
"after unpacking. It is a good idea to do this quite early in the upgrade "
@@ -3300,12 +3304,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:789
+#: apt.conf.5.xml:788
msgid "Periodic and Archives options"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:790
+#: apt.conf.5.xml:789
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by the "
@@ -3314,12 +3318,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:798
+#: apt.conf.5.xml:797
msgid "Debug options"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:800
+#: apt.conf.5.xml:799
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -3330,7 +3334,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:811
+#: apt.conf.5.xml:810
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -3338,7 +3342,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:819
+#: apt.conf.5.xml:818
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s install</"
@@ -3346,7 +3350,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:828
+#: apt.conf.5.xml:827
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -3356,66 +3360,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:836
+#: apt.conf.5.xml:835
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
"in CD-ROM IDs."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:846
+#: apt.conf.5.xml:845
msgid "A full list of debugging options to apt follows."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:855
+#: apt.conf.5.xml:854
msgid ""
"Print information related to accessing <literal>cdrom://</literal> sources."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:866
+#: apt.conf.5.xml:865
msgid "Print information related to downloading packages using FTP."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:877
+#: apt.conf.5.xml:876
msgid "Print information related to downloading packages using HTTP."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:888
+#: apt.conf.5.xml:887
msgid "Print information related to downloading packages using HTTPS."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:899
+#: apt.conf.5.xml:898
msgid ""
"Print information related to verifying cryptographic signatures using "
"<literal>gpg</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:910
+#: apt.conf.5.xml:909
msgid ""
"Output information about the process of accessing collections of packages "
"stored on CD-ROMs."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:920
+#: apt.conf.5.xml:919
msgid "Describes the process of resolving build-dependencies in &apt-get;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:930
+#: apt.conf.5.xml:929
msgid ""
"Output each cryptographic hash that is generated by the <literal>apt</"
"literal> libraries."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:940
+#: apt.conf.5.xml:939
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 "
@@ -3423,53 +3427,53 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:951
+#: apt.conf.5.xml:950
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><listitem><para>
-#: apt.conf.5.xml:963
+#: apt.conf.5.xml:962
msgid "Log when items are added to or removed from the global download queue."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:973
+#: apt.conf.5.xml:972
msgid ""
"Output status messages and errors related to verifying checksums and "
"cryptographic signatures of downloaded files."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:983
+#: apt.conf.5.xml:982
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><listitem><para>
-#: apt.conf.5.xml:995
+#: apt.conf.5.xml:994
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><listitem><para>
-#: apt.conf.5.xml:1006
+#: apt.conf.5.xml:1005
msgid ""
"Log all interactions with the sub-processes that actually perform downloads."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1017
+#: apt.conf.5.xml:1016
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><listitem><para>
-#: apt.conf.5.xml:1027
+#: apt.conf.5.xml:1026
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial auto-"
@@ -3479,7 +3483,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1041
+#: apt.conf.5.xml:1040
msgid ""
"Generate debug messages describing which packages are marked as keep/install/"
"remove while the ProblemResolver does his work. Each addition or deletion "
@@ -3497,46 +3501,46 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1062
+#: apt.conf.5.xml:1061
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><listitem><para>
-#: apt.conf.5.xml:1073
+#: apt.conf.5.xml:1072
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><listitem><para>
-#: apt.conf.5.xml:1084
+#: apt.conf.5.xml:1083
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><listitem><para>
-#: apt.conf.5.xml:1096
+#: apt.conf.5.xml:1095
msgid ""
"Output status messages tracing the steps performed when invoking &dpkg;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1107
+#: apt.conf.5.xml:1106
msgid "Output the priority of each package list on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1117
+#: apt.conf.5.xml:1116
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><listitem><para>
-#: apt.conf.5.xml:1128
+#: apt.conf.5.xml:1127
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 "
@@ -3544,21 +3548,21 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1140
+#: apt.conf.5.xml:1139
msgid ""
"Print information about the vendors read from <filename>/etc/apt/vendors."
"list</filename>."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1162 apt_preferences.5.xml:545 sources.list.5.xml:211
+#: apt.conf.5.xml:1161 apt_preferences.5.xml:545 sources.list.5.xml:211
#: apt-ftparchive.1.xml:596
#, fuzzy
msgid "Examples"
msgstr "Exemplos"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1163
+#: apt.conf.5.xml:1162
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
@@ -3566,7 +3570,7 @@ msgstr ""
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1175
+#: apt.conf.5.xml:1174
#, fuzzy
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
@@ -4839,8 +4843,8 @@ msgid ""
"id=\"0\"/>"
msgstr ""
"Com um arquivo &sources-list; adequado e o arquivo de preferências do APT "
-"acima, quaisquer dos comandos a seguir farão com que o APT atualize para a"
-"(s) última(s) versão(ões) <literal>testing</literal>."
+"acima, quaisquer dos comandos a seguir farão com que o APT atualize para "
+"a(s) última(s) versão(ões) <literal>testing</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#: apt_preferences.5.xml:633
@@ -5060,13 +5064,13 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:92
msgid ""
-"<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)"
-"</literal> which expands to the Debian architecture (such as <literal>amd64</"
-"literal> or <literal>armel</literal>) used on the system. This permits "
-"architecture-independent <filename>sources.list</filename> files to be used. "
-"In general this is only of interest when specifying an exact path, "
-"<literal>APT</literal> will automatically generate a URI with the current "
-"architecture otherwise."
+"<literal>distribution</literal> may also contain a variable, <literal>"
+"$(ARCH)</literal> which expands to the Debian architecture (such as "
+"<literal>amd64</literal> or <literal>armel</literal>) used on the system. "
+"This permits architecture-independent <filename>sources.list</filename> "
+"files to be used. In general this is only of interest when specifying an "
+"exact path, <literal>APT</literal> will automatically generate a URI with "
+"the current architecture otherwise."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
@@ -6187,9 +6191,9 @@ msgstr ""
#: apt.8:31
msgid ""
"APT is a management system for software packages. For normal day to day "
-"package management there are several frontends available, such as B<aptitude>"
-"(8) for the command line or B<synaptic>(8) for the X Window System. Some "
-"options are only implemented in B<apt-get>(8) though."
+"package management there are several frontends available, such as "
+"B<aptitude>(8) for the command line or B<synaptic>(8) for the X Window "
+"System. Some options are only implemented in B<apt-get>(8) though."
msgstr ""
#. type: SH